rev 16546 - in trunk/packages/kdebase-workspace/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-01-06 18:11:16 +0000 (Wed, 06 Jan 2010)
New Revision: 16546

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/patches/90_work_with_hal_0.5.14_svn_r1062504.diff
Log:
Backport r1069849 in order to fix crash with hal 0.5.14 (yet another
attempt). Merged into patch 90_work_with_hal_0.5.14_svn_r1062504.diff
(Closes: #556468).

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2010-01-06 11:49:14 UTC (rev 16545)
+++ trunk/packages/kdebase-workspace/debian/changelog	2010-01-06 18:11:16 UTC (rev 16546)
@@ -1,3 +1,11 @@
+kdebase-workspace (4:4.3.4-4) UNRELEASED; urgency=low
+
+  * Backport r1069849 in order to fix crash with hal 0.5.14 (yet another
+    attempt). Merged into patch 90_work_with_hal_0.5.14_svn_r1062504.diff
+    (Closes: #556468).
+
+ -- Modestas Vainius <modax at debian.org>  Wed, 06 Jan 2010 18:17:04 +0200
+
 kdebase-workspace (4:4.3.4-3) unstable; urgency=high
 
   * Backport parts of r1035622/r1057980 to fix

Modified: trunk/packages/kdebase-workspace/debian/patches/90_work_with_hal_0.5.14_svn_r1062504.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/90_work_with_hal_0.5.14_svn_r1062504.diff	2010-01-06 11:49:14 UTC (rev 16545)
+++ trunk/packages/kdebase-workspace/debian/patches/90_work_with_hal_0.5.14_svn_r1062504.diff	2010-01-06 18:11:16 UTC (rev 16546)
@@ -1,5 +1,31 @@
---- a/libs/solid/control/powermanager.cpp
+Subject: Fix plasma-desktop segfauls with hal 0.5.14 (battery applet and brightness related)
+Origin: backport, http://websvn.kde.org/?view=revision&revision=1035622
+ http://websvn.kde.org/?view=revision&revision=1057980
+ http://websvn.kde.org/?view=revision&revision=1069849
+Bug: https://bugs.kde.org/show_bug.cgi?id=219333
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556468
+Forwarded: yes
+
+--- b/libs/solid/control/powermanager.cpp
 +++ b/libs/solid/control/powermanager.cpp
+@@ -155,7 +155,7 @@
+     if(device.isEmpty())
+     {
+         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
+-        if(controls.size() == 0)
++        if(controls.keys(Solid::Control::PowerManager::Screen).isEmpty())
+         {
+ #ifdef Q_WS_WIN
+             return false;
+@@ -185,7 +185,7 @@
+     if(device.isEmpty())
+     {
+         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
+-        if(controls.size() == 0)
++        if(controls.keys(Solid::Control::PowerManager::Screen).isEmpty())
+         {
+ #ifdef Q_WS_WIN
+             return false;
 @@ -196,7 +196,7 @@
          else
          {