[arch-commits] Commit in kdebase-workspace/trunk (2 files)

[Andrea Scarpino]

    Date: Monday, April 19, 2010 @ 14:28:54
  Author: andrea
Revision: 78134

Fix powerdevil suspend twice bug (FS#19176)

Added:
  kdebase-workspace/trunk/fix-powerdevil-suspend.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |    9 ++++++---
 fix-powerdevil-suspend.patch |   13 +++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-19 13:15:16 UTC (rev 78133)
+++ PKGBUILD	2010-04-19 18:28:54 UTC (rev 78134)
@@ -3,7 +3,7 @@
 
 pkgname=kdebase-workspace
 pkgver=4.4.2
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -27,7 +27,8 @@
 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'
-        'kdebase-workspace-4.3.5-CVE-2010-0436.diff')
+        'kdebase-workspace-4.3.5-CVE-2010-0436.diff'
+	'fix-powerdevil-suspend.patch')
 md5sums=('6251e5d0060bd1529f90b9eaf5f84230'
          '721e97031b62aee8914e8617e86f9235'
          '363a36b63f84bac79959cfbefdb8309e'
@@ -36,7 +37,8 @@
          '367a3538f54db71f108b34cfa31088ac'
          '47a1f12673f66e62e2463efd7037a26a'
          '814350c52c135d6f7bdada1e29223d38'
-         '68c1dfe76e80812e5e049bb599b3374e')
+         '68c1dfe76e80812e5e049bb599b3374e'
+	 '3e50fd1dd00c724e7b28599492a37054')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -46,6 +48,7 @@
 
 	# fixed in 4.4.3
 	patch -p0 -i ${srcdir}/kdebase-workspace-4.3.5-CVE-2010-0436.diff || return 1
+	patch -p5 -i ${srcdir}/fix-powerdevil-suspend.patch || return 1
 
 	cd ${srcdir}
 	mkdir build

Added: fix-powerdevil-suspend.patch
===================================================================
--- fix-powerdevil-suspend.patch	                        (rev 0)
+++ fix-powerdevil-suspend.patch	2010-04-19 18:28:54 UTC (rev 78134)
@@ -0,0 +1,13 @@
+--- branches/KDE/4.4/kdebase/workspace/powerdevil/daemon/PowerDevilDaemon.cpp	2010/04/15 18:15:29	1115242
++++ branches/KDE/4.4/kdebase/workspace/powerdevil/daemon/PowerDevilDaemon.cpp	2010/04/15 18:18:39	1115243
+@@ -985,10 +985,6 @@
+ void PowerDevilDaemon::emitNotification(const QString &evid, const QString &message,
+                                         const char *slot, const QString &iconname)
+ {
+-    if (slot) {
+-        QTimer::singleShot(0, this, slot);
+-    }
+-
+     if (!slot) {
+         KNotification::event(evid, message, KIcon(iconname).pixmap(20, 20),
+                              0, KNotification::CloseOnTimeout, d->applicationData);