Date: Tuesday, July 27, 2010 @ 05:09:31 Author: andrea Revision: 86186
moved to [testing] Modified: kdebase-workspace/trunk/PKGBUILD kdebase-workspace/trunk/kdebase-workspace.install Deleted: kdebase-workspace/trunk/screensaver-sleep.patch ---------------------------+ PKGBUILD | 37 ++++++++++++++++++------------------- kdebase-workspace.install | 16 +++++++++++++--- screensaver-sleep.patch | 12 ------------ 3 files changed, 31 insertions(+), 34 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-07-27 09:09:26 UTC (rev 86185) +++ PKGBUILD 2010-07-27 09:09:31 UTC (rev 86186) @@ -1,8 +1,9 @@ # $Id: PKGBUILD 59826 2009-11-28 01:40:21Z andrea $ -# Maintainer: Pierre Schmitz <[email protected]> +# Maintainer: Andrea Scarpino <[email protected]> +# Contributor: Pierre Schmitz <[email protected]> pkgname=kdebase-workspace -pkgver=4.4.5 +pkgver=4.4.95 pkgrel=1 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') @@ -13,36 +14,34 @@ # not detected by namcap because libgl depends on it # but nvidia providing libgl does not depend on libxdamage depends=('polkit-kde' 'kdepimlibs' 'kdepim-runtime' 'kdebase-runtime' 'qimageblitz' - 'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' - 'libxdamage' 'xorg-utils' 'libxrandr') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 'kdebindings-python' - 'kdebindings-ruby' 'boost') -replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde') -conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde') -install='kdebase-workspace.install' + 'libxxf86misc' 'libxcomposite' 'lm_sensors' 'libxklavier' 'libxdamage' + 'xorg-utils' 'libxrandr' 'libraw1394' 'libqalculate') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 'kdebindings-python' 'docbook-xsl' 'boost') +# 'kdebindings-ruby') +replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') +conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') +install="${pkgname}.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/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"; 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch' 'screensaver-sleep.patch') -sha1sums=('d0defe431a760503f8fbb9ee2413b666b3c84cd7' + 'fixpath.patch' 'terminate-server.patch') +sha1sums=('2f38dfa0d925147af8f60c0d00eda54513c405ab' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd676932e89f201d1f381615651761af1badb88be') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') build() { cd ${srcdir}/${pkgname}-${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 - patch -p1 -i ${srcdir}/screensaver-sleep.patch || return 1 # FS#19426 + patch -p0 -i ${srcdir}/kdm-zsh-profile.patch + patch -p0 -i ${srcdir}/fixpath.patch + patch -p0 -i ${srcdir}/terminate-server.patch cd ${srcdir} mkdir build @@ -55,7 +54,7 @@ -DWITH_Googlegadgets=OFF \ -DWITH_QEdje=OFF \ -DWITH_PolkitQt=OFF - make || return 1 + make } package() { Modified: kdebase-workspace.install =================================================================== --- kdebase-workspace.install 2010-07-27 09:09:26 UTC (rev 86185) +++ kdebase-workspace.install 2010-07-27 09:09:31 UTC (rev 86186) @@ -1,11 +1,21 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + groupadd -g 135 kdm &>/dev/null + useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &>/dev/null } post_upgrade() { - post_install + getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null + getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_remove() { - post_install + if getent passwd kdm >/dev/null 2>&1; then + userdel kdm + fi + if getent group kdm >/dev/null 2>&1; then + groupdel kdm + fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } Deleted: screensaver-sleep.patch =================================================================== --- screensaver-sleep.patch 2010-07-27 09:09:26 UTC (rev 86185) +++ screensaver-sleep.patch 2010-07-27 09:09:31 UTC (rev 86186) @@ -1,12 +0,0 @@ ---- kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp.orig 2010-04-29 21:54:40.000000000 +0200 -+++ kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp 2010-05-09 17:06:54.000000000 +0200 -@@ -571,7 +571,7 @@ - - void PowerDevilDaemon::buttonPressed(int but) - { -- if (!checkIfCurrentSessionActive() || d->screenSaverIface->GetActive()) { -+ if (!checkIfCurrentSessionActive()) { - return; - } - -
