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

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 78 insertions, 3 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/Manifest b/kde-base/solid/Manifest
index 8c95770764a6..283d65b31c66 100644
--- a/kde-base/solid/Manifest
+++ b/kde-base/solid/Manifest
@@ -1,8 +1,10 @@
 AUX solid-4.3.1-darwin-compile-powermanager.patch 2367 RMD160 0a6f3627c42e63c46b4000ff2cc6e500a2098d47 SHA1 40ad2b2300fa7646306b2576b0669424ed8af70c SHA256 659e624f42d30306edb87b7256986ca2129fef2620d7ce1bf32b29a6ae67c69c
+AUX solid-4.3.4-hal-2.patch 895 RMD160 767cc3bebac57cf392b237187d5197480a42a2c7 SHA1 80ac51c2eb32624ceb60a9d2b085212f717f1160 SHA256 c18abf19cd38ea8a430e246ecaa61ad1b24f57987a9884d16e25c5d70937a5bf
 AUX solid-4.3.4-hal.patch 7095 RMD160 8aac264d4273813296bd10bfa86ce75f10b328a2 SHA1 ff7f241072ffe466ce07c01fc0b18e6ab0119b73 SHA256 7a4a1ebd441514a96b3427411ef2e6f7046d77b31761490bbc507cde25e7573b
 DIST kdebase-workspace-4.3.3.tar.bz2 62496238 RMD160 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa SHA1 2839e913cecef8ead0685bd50e9515ccd8bc0a9d SHA256 b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b
 DIST kdebase-workspace-4.3.4.tar.bz2 62517195 RMD160 665b49b9dd03408ef9ec50e7bd5eb50b993d6138 SHA1 5b43447139d22247d5bc2deee8e3a944447f0bbf SHA256 ea12e04eb402f1257b483b541df5d77b885407bd02992bcb496ccd3335b203c3
 EBUILD solid-4.3.3.ebuild 1163 RMD160 e869c8f1d38f7480e8f4930bcf94877f5ba33dd2 SHA1 9458ca7c8bae2b00fdd9ac3e7351700ad7d9a7da SHA256 0f59d9f4d4d38d6abc17dd0bd2788e590de2ab222a8afddae13efcf4a9c28073
 EBUILD solid-4.3.4-r2.ebuild 1097 RMD160 ea1e74e96469d92c054fa37856fefb5148549758 SHA1 fbcd7f6c7b9480659836139e3de82d1cd5a719d2 SHA256 84fdccda715a65cd64e07c338f8b58f553c3dfec353503eff13feba1e48b2623
-MISC ChangeLog 6807 RMD160 27a2880b866f89e832b206fe14a24bd1d2a46051 SHA1 594723d5bae96fec63552e656d6d71b0b749503c SHA256 008f3d1fa55a6f902f0f9e85de60a4f222af653bc51607dcc05649e390662e01
+EBUILD solid-4.3.4-r3.ebuild 1131 RMD160 7c04b9ca8c41d706141bc9dd3e583d077605e3bb SHA1 1474f5670d58b3478004834f6d90298e35fafac6 SHA256 7521076548b3068ce2beab920b9fae10049e4fbcff0db396c84e74bac6d26d3f
+MISC ChangeLog 7072 RMD160 8b4c9dcdfcb5cb0a6f4124e6140cde5cb432ae85 SHA1 b59d8dc838a49e578fafe4c776c13d7487eea6ca SHA256 78ba2bac16ccc353a38646982647ba600d3375303981fd6ca8bc1a90b95db606
 MISC metadata.xml 243 RMD160 04fc0be8d2565b1a1b4e4d42041a9d9ec98cf76d SHA1 7f5c2d00f44a48f3d4b96cb9c6af36a31ea401d2 SHA256 04f8169f3dc4ab49f95e390f9202644647d58a5af1af3128a72155d42765c8c3
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
+}