Update HAL 0.5.14 patch wrt #296544 by Nate Weibley.

(Portage version: 2.2_rc59/cvs/Linux x86_64)

3 files changed, 27 insertions, 5 deletions

diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index 6a573d367c21..e13bc272da8e 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.51 2009/12/11 17:12:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.52 2009/12/16 14:55:51 ssuominen Exp $
+
+*solid-4.3.4-r2 (16 Dec 2009)
+
+  16 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -solid-4.3.4-r1.ebuild, +solid-4.3.4-r2.ebuild,
+  files/solid-4.3.4-hal.patch:
+  Update HAL 0.5.14 patch wrt #296544 by Nate Weibley.
 
   11 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -solid-4.3.4.ebuild:
   Drop no-longer required ebuild.
diff --git a/kde-base/solid/files/solid-4.3.4-hal.patch b/kde-base/solid/files/solid-4.3.4-hal.patch
index 1bc66eabf1e9..36fc78c22074 100644
--- a/kde-base/solid/files/solid-4.3.4-hal.patch
+++ b/kde-base/solid/files/solid-4.3.4-hal.patch
@@ -1,11 +1,26 @@
 http://bugs.gentoo.org/show_bug.cgi?id=295600
+http://bugs.gentoo.org/show_bug.cgi?id=296544
 
 http://websvn.kde.org/trunk/KDE/kdebase/workspace/solid/hal/halpower.cpp?r1=929945&r2=1035622&pathrev=1057980
 http://websvn.kde.org/trunk/KDE/kdebase/workspace/solid/hal/halpower.cpp?r1=1035622&r2=1057980&pathrev=1057980
+http://websvn.kde.org/trunk/KDE/kdebase/workspace/solid/hal/halpower.cpp?r1=1057980&r2=1062504&pathrev=1062504
+http://websvn.kde.org/trunk/KDE/kdebase/workspace/libs/solid/control/powermanager.cpp?r1=923760&r2=1062504&pathrev=1062504
 
+diff -ur kdebase-workspace-4.3.4.orig/libs/solid/control/powermanager.cpp kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp
+--- kdebase-workspace-4.3.4.orig/libs/solid/control/powermanager.cpp	2009-02-12 12:23:46.000000000 +0200
++++ kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp	2009-12-16 16:45:44.000000000 +0200
+@@ -196,7 +196,7 @@
+         else
+         {
+             return_SOLID_CALL(Ifaces::PowerManager *, globalPowerManager->managerBackend(),
+-                      false, brightness(controls.keys().at(0)));
++                      false, brightness(controls.keys(Solid::Control::PowerManager::Screen).at(0)));
+         }
+     }
+     else
 diff -ur kdebase-workspace-4.3.4.orig/solid/hal/halpower.cpp kdebase-workspace-4.3.4/solid/hal/halpower.cpp
 --- kdebase-workspace-4.3.4.orig/solid/hal/halpower.cpp	2009-02-26 11:12:20.000000000 +0200
-+++ kdebase-workspace-4.3.4/solid/hal/halpower.cpp	2009-12-07 17:28:24.000000000 +0200
++++ kdebase-workspace-4.3.4/solid/hal/halpower.cpp	2009-12-16 16:46:39.000000000 +0200
 @@ -361,13 +361,21 @@
  Solid::Control::PowerManager::BrightnessControlsList HalPower::brightnessControlsAvailable()
  {
@@ -43,7 +58,7 @@ diff -ur kdebase-workspace-4.3.4.orig/solid/hal/halpower.cpp kdebase-workspace-4
          QDBusInterface deviceInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device.LaptopPanel", QDBusConnection::systemBus());
 -        brightness = deviceInterface.call("GetBrightness").arguments().at(0).toDouble();
 -        if(deviceInterface.lastError().isValid())
-+        QDBusReply<double> brightnessReply = deviceInterface.call("GetBrightness");
++        QDBusReply<int> brightnessReply = deviceInterface.call("GetBrightness");
 +        if(!brightnessReply.isValid())
          {
 -            return 0;
@@ -71,7 +86,7 @@ diff -ur kdebase-workspace-4.3.4.orig/solid/hal/halpower.cpp kdebase-workspace-4
 -        brightness = deviceInterface.call("GetBrightness").arguments().at(0).toDouble();
 -        if(deviceInterface.lastError().isValid())
 +
-+        QDBusReply<double> brightnessReply = deviceInterface.call("GetBrightness");
++        QDBusReply<int> brightnessReply = deviceInterface.call("GetBrightness");
 +        if(!brightnessReply.isValid())
          {
 -            return 0;
diff --git a/kde-base/solid/solid-4.3.4-r1.ebuild b/kde-base/solid/solid-4.3.4-r2.ebuild
index df7021c15280..e1fc08451dfe 100644
--- a/kde-base/solid/solid-4.3.4-r1.ebuild
+++ b/kde-base/solid/solid-4.3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.3.4-r1.ebuild,v 1.1 2009/12/07 15:34:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.3.4-r2.ebuild,v 1.1 2009/12/16 14:55:51 ssuominen Exp $
 
 EAPI="2"