diff -dub git/PKGBUILD new/PKGBUILD --- git/PKGBUILD 2010-01-25 12:49:11.000000000 +0100 +++ new/PKGBUILD 2010-01-25 14:37:19.000000000 +0100 @@ -1,9 +1,38 @@ # $Id: PKGBUILD 63747 2010-01-18 12:43:04Z pierre $ # Maintainer: Pierre Schmitz +# Contributor: Kurt J. Bosch -pkgname=kdebase-workspace +pkgbase=kdebase-workspace +pkgname=( + kde-meta-kdebase-workspace + kdebase-workspace-base + kdebase-workspace-policykit-kde + kdebase-workspace-cursors + kdebase-workspace-kcheckpass + kdebase-workspace-kcminit + kdebase-workspace-kcontrol + kdebase-workspace-kdm + kdebase-workspace-khotkeys + kdebase-workspace-klipper + kdebase-workspace-kmenuedit + kdebase-workspace-krunner + kdebase-workspace-kscreensaver + kdebase-workspace-ksmserver + kdebase-workspace-ksplash + kdebase-workspace-kstartupconfig + kdebase-workspace-ksysguard + kdebase-workspace-ksystraycmd + kdebase-workspace-kwin + kdebase-workspace-kwrited + kdebase-workspace-libs + kdebase-workspace-plasma + kdebase-workspace-powerdevil + kdebase-workspace-solid + kdebase-workspace-systemsettings + kdebase-workspace-wallpapers +) pkgver=4.3.4 -pkgrel=2 +pkgrel=2.4 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -12,19 +41,12 @@ # note on libxdamage: # not detected by namcap because libgl depends on it # but nvidia providing libgl does not depend on libxdamage -depends=('kdelibs-experimental' 'kdepimlibs' 'kdebase-runtime' 'libxxf86misc' 'libxcomposite' +depends=('kdebase-workspace-libs' 'kdebase-runtime') +makedepends=('kdelibs-experimental' 'kdepimlibs' 'kdebase-runtime' 'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'qimageblitz' 'polkit-qt' 'libxft' 'libxdamage' - 'xorg-utils') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 'kdebindings-python') -replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde') -conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde') -optdepends=('kdebindings-python: plasma scriptengine for Python') + 'xorg-utils' 'pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 'kdebindings-python') install='kdebase-workspace.install' -backup=('usr/share/config/kdm/kdmrc' - 'etc/pam.d/kde' - 'etc/pam.d/kde-np' - 'etc/pam.d/kscreensaver') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'fixpath.patch' 'terminate-server.patch' 'libpng-1.4.patch') @@ -39,7 +61,7 @@ '87693be733f80edb1923dd4757263d2b') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgbase}-${pkgver} patch -p0 -i ${srcdir}/kdm-zsh-profile.patch || return 1 patch -p0 -i ${srcdir}/fixpath.patch || return 1 patch -p0 -i ${srcdir}/terminate-server.patch || return 1 @@ -49,7 +71,7 @@ cd ${srcdir} mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \ @@ -60,15 +82,271 @@ make || return 1 } -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install +package_kde-meta-kdebase-workspace() { + pkgdesc="Meta package for the KDE desktop" + depends=( + kdebase-workspace-base + kdebase-workspace-policykit-kde + kdebase-workspace-cursors + kdebase-workspace-kcheckpass + kdebase-workspace-kcminit + kdebase-workspace-kcontrol + kdebase-workspace-kdm + kdebase-workspace-khotkeys + kdebase-workspace-klipper + kdebase-workspace-kmenuedit + kdebase-workspace-krunner + kdebase-workspace-kscreensaver + kdebase-workspace-ksmserver + kdebase-workspace-ksplash + kdebase-workspace-kstartupconfig + kdebase-workspace-ksysguard + kdebase-workspace-ksystraycmd + kdebase-workspace-kwin + kdebase-workspace-kwrited + kdebase-workspace-libs + kdebase-workspace-plasma + kdebase-workspace-powerdevil + kdebase-workspace-solid + kdebase-workspace-systemsettings + kdebase-workspace-wallpapers + ) + provides=( "kdebase-workspace=${pkgver}" ) + conflicts=('kdebase-workspace' ) + replaces=( 'kdebase-workspace' ) +} - install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm +package_kdebase-workspace-base() { + pkgdesc="Basic files of the KDE desktop" + backup=('etc/pam.d/kde' + 'etc/pam.d/kde-np') + depends=('sh') + replaces=( 'kde-common') + conflicts=('kde-common') + cd ${srcdir}/build + make DESTDIR=${pkgdir} install/local + install -d -m755 ${pkgdir}/etc/kde/{env,shutdown} +} + +package_kdebase-workspace-cursors() { + pkgdesc="Cursors for KDE" + depends=() + cd ${srcdir}/build/cursors + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-kcheckpass() { + pkgdesc="KDE password checker" + depends=('kdebase-workspace-libs' 'kdebase-runtime' 'pam' ) + cd ${srcdir}/build/kcheckpass + make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np - install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver +} + +package_kdebase-workspace-kcminit() { + pkgdesc="Initialization for KDE Control Modules" + cd ${srcdir}/build/kcminit + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-kcontrol() { + pkgdesc="KDE Control Center" + depends=('kdebase-workspace-libs' 'qimageblitz' 'hicolor-icon-theme' 'libxklavier') + cd ${srcdir}/build/kcontrol + make DESTDIR=${pkgdir} install + cd ${srcdir}/build/doc/kcontrol + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-kdm() { + pkgdesc="KDE Display Manager" + depends=('kdebase-workspace-libs' 'qimageblitz') + backup=('usr/share/config/kdm/kdmrc') + replaces=( 'kdmtheme') + conflicts=('kdmtheme') + cd ${srcdir}/build/kdm + make DESTDIR=${pkgdir} install + cd ${srcdir}/build/doc/kdm + make DESTDIR=${pkgdir} install + install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm install -d -m755 ${pkgdir}/etc/X11/sessions/ ln -sf /usr/share/apps/kdm/sessions/kde{,-safe}.desktop ${pkgdir}/etc/X11/sessions/ - install -d -m755 ${pkgdir}/etc/kde/{env,shutdown} +} + +package_kdebase-workspace-khotkeys() { + pkgdesc="KDE hotkeys daemon" + cd ${srcdir}/build/khotkeys + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-klipper() { + pkgdesc="KDE and X clipboard management applet" + cd ${srcdir}/build/klipper + make DESTDIR=${pkgdir} install + cd ${srcdir}/build/doc/klipper + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-kmenuedit() { + pkgdesc="KDE Menu Editior" + cd ${srcdir}/build/kmenuedit + make DESTDIR=${pkgdir} install + cd ${srcdir}/build/doc/kmenuedit + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-krunner() { + pkgdesc="KDE Command Runner" + depends=('kdebase-workspace-libs' 'kdebase-runtime' 'libxss' 'libxxf86misc') + cd ${srcdir}/build/krunner + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-kscreensaver() { + pkgdesc="KDE screensaver framework" + backup=('etc/pam.d/kscreensaver') + cd ${srcdir}/build/kscreensaver + make DESTDIR=${pkgdir} install + install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver +} + +package_kdebase-workspace-ksmserver() { + pkgdesc="KDE session manager" + depends=('kdebase-workspace-libs' 'kdebase-runtime' 'qimageblitz') + cd ${srcdir}/build/ksmserver + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-ksplash() { + pkgdesc="KDE splashscreen framework" + cd ${srcdir}/build/ksplash + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-kstartupconfig() { + pkgdesc="Utility to launch applications with special window properties" + cd ${srcdir}/build/kstartupconfig + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-ksysguard() { + pkgdesc="System Monitor" + depends=('kdebase-workspace-libs' 'lm_sensors') + cd ${srcdir}/build/ksysguard + make DESTDIR=${pkgdir} install + cd ${srcdir}/build/doc/ksysguard + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-ksystraycmd() { + pkgdesc="Utility for embedding applications given as argument into the system tray" + cd ${srcdir}/build/ksystraycmd + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-kwin() { + pkgdesc="KDE Window Manager" + depends=('kdebase-workspace-libs' 'kdebase-runtime' 'libxcomposite' 'libxdamage') + cd ${srcdir}/build/kwin + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-kwrited() { + pkgdesc="KDE daemon listening for wall and write messages" + cd ${srcdir}/build/kwrited + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-libs() { + pkgdesc="Libraries for the KDE desktop" + depends=('kdelibs-experimental' 'libxft' 'xorg-utils') + cd ${srcdir}/build/libs + make DESTDIR=${pkgdir} install + cd ${srcdir}/build/cmake + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-plasma() { + pkgdesc="KDE desktop" + depends=('kdebase-workspace-libs' 'kdebase-runtime' 'kdepimlibs' 'libxss') + optdepends=('kdebindings-python: plasma scriptengine for Python') + cd ${srcdir}/build/plasma + make DESTDIR=${pkgdir} install + cd ${srcdir}/build/doc/plasma + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-policykit-kde() { + pkgdesc="PolicyKit integration for KDE" + depends=('kdebase-workspace-libs' 'kdebase-runtime' 'polkit-qt') + replaces=( 'policykit-kde') + conflicts=('policykit-kde') + cd ${srcdir}/build/PolicyKit-kde + make DESTDIR=${pkgdir} install + cd ${srcdir}/build/doc/PolicyKit-kde + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-powerdevil() { + pkgdesc="Power Manager" + depends=('kdebase-workspace-libs' 'kdebase-runtime' 'libxss') + replaces=( 'guidance-power-manager') + conflicts=('guidance-power-manager') + cd ${srcdir}/build/powerdevil + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-solid() { + pkgdesc="KDE hardware library" + cd ${srcdir}/build/solid + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-systemsettings() { + pkgdesc="System settings utility" + depends=('kdebase-workspace-libs') + optdepends=('kdebase-workspace-kcontrol: kcontrol modules') + cd ${srcdir}/build/systemsettings + make DESTDIR=${pkgdir} install + cd ${srcdir}/build/doc/systemsettings + make DESTDIR=${pkgdir} install +} + +package_kdebase-workspace-wallpapers() { + pkgdesc="Wallpapers for the KDE desktop" + depends=() + cd ${srcdir}/build/wallpapers + make DESTDIR=${pkgdir} install +} +