[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD screensaver-sleep.patch)

[Ronald van Haren]

    Date: Wednesday, May 12, 2010 @ 09:58:01
  Author: ronald
Revision: 80117

upgpkg: kdebase-workspace 4.4.3-2
fix sleep on laptop lid close FS#19426

Added:
  kdebase-workspace/trunk/screensaver-sleep.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    8 +++++---
 screensaver-sleep.patch |   12 ++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-12 13:34:28 UTC (rev 80116)
+++ PKGBUILD	2010-05-12 13:58:01 UTC (rev 80117)
@@ -3,7 +3,7 @@
 
 pkgname=kdebase-workspace
 pkgver=4.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -26,7 +26,7 @@
         'etc/pam.d/kscreensaver')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch')
+        'fixpath.patch' 'terminate-server.patch' 'screensaver-sleep.patch')
 sha1sums=('efd427dfe8b7beebdfe162006689871c61991336'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -34,13 +34,15 @@
           '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+          'd676932e89f201d1f381615651761af1badb88be')
 
 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      
 
 	cd ${srcdir}
 	mkdir build

Added: screensaver-sleep.patch
===================================================================
--- screensaver-sleep.patch	                        (rev 0)
+++ screensaver-sleep.patch	2010-05-12 13:58:01 UTC (rev 80117)
@@ -0,0 +1,12 @@
+--- 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;
+     }
+ 
+