summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base/kdelibs')
-rw-r--r--kde-base/kdelibs/ChangeLog6
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch19
-rw-r--r--kde-base/kdelibs/kdelibs-4.2.3.ebuild3
3 files changed, 26 insertions, 2 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index c0b0f0a2cf11..1f588e5485c8 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdelibs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.588 2009/05/07 11:43:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.589 2009/05/07 22:15:18 alexxy Exp $
+
+ 07 May 2009; Alexey Shvetsov <alexxy@gentoo.org> kdelibs-4.2.3.ebuild,
+ +files/kdelibs-4.2.3-halbattery_backport_fix.patch:
+ Add halbattary patch b.k.o bug 187600
07 May 2009; Tomas Chvatal <scarabeus@gentoo.org> kdelibs-4.2.3.ebuild,
-files/sanbox-error.patch:
diff --git a/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch b/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch
new file mode 100644
index 000000000000..d9d0e2519cf0
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch
@@ -0,0 +1,19 @@
+--- trunk/KDE/kdelibs/solid/solid/backends/hal/halbattery.cpp 2009/03/31 03:29:32 947130
++++ trunk/KDE/kdelibs/solid/solid/backends/hal/halbattery.cpp 2009/03/31 03:58:04 947131
+@@ -112,12 +112,14 @@
+ {
+ emit chargePercentChanged(chargePercent(), m_device->udi());
+ }
+- else if (changes.contains("battery.rechargeable.is_charging")
++
++ if (changes.contains("battery.rechargeable.is_charging")
+ || changes.contains("battery.rechargeable.is_discharging"))
+ {
+ emit chargeStateChanged(chargeState(), m_device->udi());
+ }
+- else if ( changes.contains( "battery.present" ) )
++
++ if ( changes.contains( "battery.present" ) )
+ {
+ emit plugStateChanged(isPlugged(), m_device->udi());
+ }
diff --git a/kde-base/kdelibs/kdelibs-4.2.3.ebuild b/kde-base/kdelibs/kdelibs-4.2.3.ebuild
index 59db2808db54..e43e69c7a6a3 100644
--- a/kde-base/kdelibs/kdelibs-4.2.3.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.3.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/kdelibs/kdelibs-4.2.3.ebuild,v 1.3 2009/05/07 11:43:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.3.ebuild,v 1.4 2009/05/07 22:15:18 alexxy Exp $
EAPI="2"
@@ -117,6 +117,7 @@ PATCHES=(
"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
"${FILESDIR}/dist/23_solid_no_double_build.patch"
"${FILESDIR}/${PN}-${SLOT}-fixx11h.h.patch"
+ "${FILESDIR}/${P}-halbattery_backport_fix.patch"
)
src_prepare() {