diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2012-01-16 20:04:45 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2012-01-16 20:04:45 +0000 |
| commit | e1339e83b1c96ae1a90da8b76dfa49e07d582db6 (patch) | |
| tree | e77cb4ad1c6c5ac9aeb83c7f86c209a57cd5a504 /app-admin | |
| parent | add more tests (diff) | |
| download | gentoo-2-e1339e83b1c96ae1a90da8b76dfa49e07d582db6.tar.gz gentoo-2-e1339e83b1c96ae1a90da8b76dfa49e07d582db6.tar.bz2 gentoo-2-e1339e83b1c96ae1a90da8b76dfa49e07d582db6.zip | |
Fix bug #398823. Thanks to nvinson for the report and patch.
(Portage version: 2.1.10.41/cvs/Linux i686)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/conky/ChangeLog | 10 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.8.1-r6.ebuild (renamed from app-admin/conky/conky-1.8.1-r5.ebuild) | 7 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.8.1-battery-time.patch | 11 |
3 files changed, 23 insertions, 5 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 46d9480b8c21..071403b814bb 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/conky -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.169 2011/11/16 19:50:34 billie Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.170 2012/01/16 20:04:45 billie Exp $ + +*conky-1.8.1-r6 (16 Jan 2012) + + 16 Jan 2012; Daniel Pielmeier <billie@gentoo.org> -conky-1.8.1-r5.ebuild, + +conky-1.8.1-r6.ebuild, +files/conky-1.8.1-battery-time.patch: + Fix bug #398823. Thanks to nvinson for the report and patch. *conky-1.8.1-r5 (16 Nov 2011) diff --git a/app-admin/conky/conky-1.8.1-r5.ebuild b/app-admin/conky/conky-1.8.1-r6.ebuild index 7e1669d20e71..c629496b8a41 100644 --- a/app-admin/conky/conky-1.8.1-r5.ebuild +++ b/app-admin/conky/conky-1.8.1-r6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r5.ebuild,v 1.1 2011/11/16 19:50:34 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r6.ebuild,v 1.1 2012/01/16 20:04:45 billie Exp $ EAPI=2 @@ -59,7 +59,8 @@ src_prepare() { "${FILESDIR}/${P}-acpitemp.patch" \ "${FILESDIR}/${P}-curl-headers.patch" \ "${FILESDIR}/${P}-maxinterfaces.patch" \ - "${FILESDIR}/${P}-utf8-scroll.patch" + "${FILESDIR}/${P}-utf8-scroll.patch" \ + "${FILESDIR}/${P}-battery-time.patch" eautoreconf } diff --git a/app-admin/conky/files/conky-1.8.1-battery-time.patch b/app-admin/conky/files/conky-1.8.1-battery-time.patch new file mode 100644 index 000000000000..66e37958a075 --- /dev/null +++ b/app-admin/conky/files/conky-1.8.1-battery-time.patch @@ -0,0 +1,11 @@ +--- a/src/linux.c.old 2012-01-12 08:18:58.525502553 -0500 ++++ b/src/linux.c 2012-01-12 08:19:29.786069277 -0500 +@@ -1671,6 +1671,8 @@ void get_battery_stuff(char *buffer, uns + the tradition! */ + else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0) + sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate); ++ else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0) ++ sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate); + else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0) + sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity); + else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0) |