Fixes battery metter always showing 100 percent charge, patch thanks to Robert Meyer <r.meyer@net-wizard.org> bug #389581

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 95 insertions, 13 deletions

diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog
index e4b5a6e64269..76694dd3a761 100644
--- a/lxde-base/lxpanel/ChangeLog
+++ b/lxde-base/lxpanel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxpanel
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.35 2011/10/09 16:44:30 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.36 2012/01/01 13:39:25 vostorga Exp $
+
+*lxpanel-0.5.8-r1 (01 Jan 2012)
+
+  01 Jan 2012; Victor Ostorga +lxpanel-0.5.8-r1.ebuild,
+  +files/lxpanel-0.5.8-battery-meter.patch:
+  Fixes battery metter always showing 100 percent charge, patch thanks to
+  Robert Meyer <r.meyer@net-wizard.org> bug #389581
 
   09 Oct 2011; Markus Meier <maekke@gentoo.org> lxpanel-0.5.8.ebuild:
   arm stable, bug #385189
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index 945b92a655ef..0161c2eb333b 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX lxpanel-0.5.1-sandbox.patch 833 RMD160 83957b8e65104c12c2220027faf24d846fe4b3b9 SHA1 24f5f2c737e56f5bc457fa49426c5115e9d15498 SHA256 1df1574a0faf8d02465f7673f7967b14b2d0bd33f8ac9c5769888ef6c4272489
 AUX lxpanel-0.5.6-broken-apps.patch 567 RMD160 628f01083f7c06476394447aacdc6fa542359bab SHA1 23ae82f23458596e1bb356cf897e5310cb05c080 SHA256 0b914f680f2dbaafb3a4966a9795e3d154839cb910eca9f58bdf18d41901eb25
 AUX lxpanel-0.5.6-symbol-alarm.patch 1461 RMD160 5ed09d071a349b7554400ea73d16f6aacdc4ad8d SHA1 6b111b32eb1ae9ee869df8ff0ac4c23b8ccbfbb8 SHA256 afafb59ea3e537147ff4d81feb5ec2a3a18eaa628f992c5a44321fa29b85e6af
 AUX lxpanel-0.5.7-requisition.patch 1003 RMD160 88d9b762099ed3cbebdf6ce9277720a70ea96ab2 SHA1 4ec1715f8fa00bcae92157ba2fb500f3852cb3e6 SHA256 cc25d00f4d9efc6be1ddb2adfb8f13dff37547632db5563528e68a78e3c2d36f
 AUX lxpanel-0.5.7-tooltip-netstatus.patch 1084 RMD160 323191b9177b50ff44ab61b91d0704afd0e798bb SHA1 511e3291cb60970864af10da87f65df12abf2174 SHA256 df6bbcdac99fa9a79b7329ec51b07ca3cccb05cf128d4d98ed8f65f57541a93f
+AUX lxpanel-0.5.8-battery-meter.patch 939 RMD160 eaf55c514a433b8a62f27837b6d68f4523c3b9cd SHA1 34cc4fd3ee4ac867c463d97d3b703493224ba14d SHA256 c65b77e37b682b32a713904ff03b66e074c4d5ae701449e68310e075c3e2d4c3
 DIST lxpanel-0.5.6.tar.gz 1074786 RMD160 5e5ebdd185d06fe0d1965ec2ed12ffecf0984b7e SHA1 fc5483e6016ac52c38b38274cca7661f2aa828ab SHA256 9c04839e2d23feec8b107a1d76899aca645416862b4b6ca01f8db743944348e1
 DIST lxpanel-0.5.7.tar.gz 1166355 RMD160 489dc9515ab0f6bac5136a0c4c93fbcb26f48e97 SHA1 276168fb4560899e83a6a340448c961d63333717 SHA256 89d1b55b207e61b7b7433cb51302bdbee644fb78b5b57892d67cb19072f548a1
 DIST lxpanel-0.5.8.tar.gz 1166241 RMD160 34e3cc6fb9de1c0590f6ec281750061c1098dc1a SHA1 a9d6bd9d15a3588fb959aa32880ad888c58359f7 SHA256 6a3579d6f384c03a33a03e4d32016428c84eb0f2bc421704f724fe2cc015cddd
 EBUILD lxpanel-0.5.6.ebuild 1552 RMD160 cf840c62da5defd98dc1351c4b64b155671de0de SHA1 9b9e3f01b902e84dfbcbb1d347b693fbad4858e7 SHA256 ca22d268d0bc7a9acfdd0a1302f2e54cd6000d5b08baa9ad825318251e478fec
 EBUILD lxpanel-0.5.7-r1.ebuild 1565 RMD160 a334922b4f3b0da28da4cf0ca1127e21e43792f5 SHA1 d17a2b45bce97069347a49160d5334e322f3bfcb SHA256 1e33c7068ac25935404a0fc5a1ad06af050e5fbcb5320ea2e327b102ce625c86
+EBUILD lxpanel-0.5.8-r1.ebuild 1516 RMD160 899de1dd99b816515236b60a068046955d0f47a8 SHA1 e64812158381764be93f4e0dd744b0e455b02fd5 SHA256 da73a1a75c95e7b5efc7c3873852d6d576cc7013c33dee4b4394f026a1e308d0
 EBUILD lxpanel-0.5.8.ebuild 1461 RMD160 9a6811b82f420ed2057732be0695aa49159050aa SHA1 4cd3216215cfa13be19195ca127059c982bdf720 SHA256 15aeab352b8fc3ebea29d7302d0fc5deb2ab11ab3412fbc4253c9e81b1e7a0e7
-MISC ChangeLog 4942 RMD160 0cc7966517e82a6eff5bd0d00f9a357cc09d6315 SHA1 54fc2d1c92c80d954d48d248d123a1dc35fa862f SHA256 34280e8867a5b85c49ca54399d607ede608089cd82746a6b8dcb44732f2cfd1f
+MISC ChangeLog 5204 RMD160 9e06b99574f9eb964ffc4ae7c97050aee50a260c SHA1 e79f04aa75c670121d72fb887c6effee57d6db13 SHA256 06b48b8858ed0afac022aa0a6b650fd462e20d52ca2f3cb306e1f32d1984c39d
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk6Rz7UACgkQkKaRLQcq0GK8NwCgsd4gENrRlyUOQn8aZJUICccv
-gRMAn3mYUzRIQ80LqkkHuR3O4ZnrjHXf
-=84dw
------END PGP SIGNATURE-----
diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.8-battery-meter.patch b/lxde-base/lxpanel/files/lxpanel-0.5.8-battery-meter.patch
new file mode 100644
index 000000000000..99ae7bc6dbf6
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.5.8-battery-meter.patch
@@ -0,0 +1,27 @@
+--- src/plugins/batt/batt_sys.c.orig	2011-12-19 15:10:52.690113669 +0100
++++ src/plugins/batt/batt_sys.c	2011-12-19 15:14:36.154315765 +0100
+@@ -217,10 +217,24 @@
+ 	    b->remaining_capacity = b->remaining_energy;
+ 	}
+     }
++    // Start ideapad patch
++    if (b->remaining_capacity != -1 && b->last_capacity == -1) {
++	if (b->voltage != -1) {
++	    b->remaining_energy = b->remaining_capacity * b->voltage / 1000;
++	    b->present_rate = b->present_rate * 1000 / b->voltage;
++	} else {
++	    b->remaining_capacity = b->remaining_energy;
++	}
++    }
++    // end ideapad patch
+     if (b->last_capacity < MIN_CAPACITY)
+ 	b->percentage = 0;
+     else
++	if (b->last_capacity_unit != -1) {
+ 	b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit;
++	} else {
++	    b->percentage = ((float) b->remaining_capacity *100.0) / (float) b->last_capacity;
++	}
+ 	    
+     if (b->percentage > 100)
+ 	b->percentage = 100;
diff --git a/lxde-base/lxpanel/lxpanel-0.5.8-r1.ebuild b/lxde-base/lxpanel/lxpanel-0.5.8-r1.ebuild
new file mode 100644
index 000000000000..6bd20e35d832
--- /dev/null
+++ b/lxde-base/lxpanel/lxpanel-0.5.8-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.8-r1.ebuild,v 1.1 2012/01/01 13:39:25 vostorga Exp $
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="Lightweight X11 desktop panel for LXDE"
+HOMEPAGE="http://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="+alsa"
+RESTRICT="test"  # bug 249598
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libXmu
+	x11-libs/libXpm
+	lxde-base/lxmenu-data
+	lxde-base/menu-cache
+	alsa? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch
+	epatch "${FILESDIR}"/${PN}-0.5.6-broken-apps.patch
+	epatch "${FILESDIR}"/${P}-battery-meter.patch
+	eautoreconf
+}
+
+src_configure() {
+	local plugins=all
+	[[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
+
+	econf $(use_enable alsa) --with-x --with-plugins=${plugins}
+	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README
+
+	# Get rid of the .la files.
+	find "${D}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	elog "If you have problems with broken icons shown in the main panel,"
+	elog "you will have to configure panel settings via its menu."
+	elog "This will not be an issue with first time installations."
+}