make Solid::Control::PowerManager::brightness check if a control for the screen is available wrt upstream #219333.

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

3 files changed, 75 insertions, 2 deletions

diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index 19eaf6931316..a739427b2b94 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.55 2009/12/27 15:26:24 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.56 2010/01/10 09:36:49 ssuominen Exp $
+
+*solid-4.3.4-r3 (10 Jan 2010)
+
+  10 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +solid-4.3.4-r3.ebuild, +files/solid-4.3.4-hal-2.patch:
+  make Solid::Control::PowerManager::brightness check if a control for the
+  screen is available wrt upstream #219333.
 
   23 Dec 2009; Jonathan Callen <abcd@gentoo.org>
   +files/solid-4.3.1-darwin-compile-powermanager.patch,
diff --git a/kde-base/solid/files/solid-4.3.4-hal-2.patch b/kde-base/solid/files/solid-4.3.4-hal-2.patch
new file mode 100644
index 000000000000..d9e3b28a3810
--- /dev/null
+++ b/kde-base/solid/files/solid-4.3.4-hal-2.patch
@@ -0,0 +1,23 @@
+http://websvn.kde.org/trunk/KDE/kdebase/workspace/libs/solid/control/powermanager.cpp?r1=1062504&r2=1069849&pathrev=1069849
+https://bugs.kde.org/show_bug.cgi?id=219333#c23
+
+--- libs/solid/control/powermanager.cpp
++++ 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;
diff --git a/kde-base/solid/solid-4.3.4-r3.ebuild b/kde-base/solid/solid-4.3.4-r3.ebuild
new file mode 100644
index 000000000000..92e5a9a93409
--- /dev/null
+++ b/kde-base/solid/solid-4.3.4-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/01/10 09:36:49 ssuominen Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+CPPUNIT_REQUIRED="test"
+inherit kde4-meta
+
+DESCRIPTION="Solid: the KDE hardware library"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bluetooth debug networkmanager wicd"
+
+# solid/CMakeLists.txt has an add_subdirectory statement that depends on
+# networkmanager-0.7, referring to a non-existant directory, restricted to =0.6*
+# for now.
+DEPEND="
+	bluetooth? ( net-wireless/bluez )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	wicd? ( net-misc/wicd )
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+	libs/solid/
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-darwin-compile-powermanager.patch
+	"${FILESDIR}/${P}-hal.patch"
+	"${FILESDIR}/${P}-hal-2.patch"
+)
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with bluetooth BlueZ)
+		$(cmake-utils_use_with networkmanager NetworkManager)
+		$(cmake-utils_use_build wicd)
+	"
+
+	kde4-meta_src_configure
+}