[arch-commits] Commit in conky/trunk (PKGBUILD current-power.patch)

[Gaetan Bisson]

    Date: Monday, December 6, 2010 @ 16:41:49
  Author: bisson
Revision: 102220

fix FS#21984

Added:
  conky/trunk/current-power.patch
Modified:
  conky/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   12 +++++++++---
 current-power.patch |   12 ++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-06 21:15:06 UTC (rev 102219)
+++ PKGBUILD	2010-12-06 21:41:49 UTC (rev 102220)
@@ -5,7 +5,7 @@
 
 pkgname=conky
 pkgver=1.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc='An advanced, highly configurable system monitor for X based on torsmo'
 arch=('i686' 'x86_64')
 url='http://conky.sourceforge.net/'
@@ -14,11 +14,17 @@
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2')
 makedepends=('pkg-config')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        'current-power.patch')
 
+sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f'
+          '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b')
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 < ../current-power.patch # See FS#21984
+
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \

Added: current-power.patch
===================================================================
--- current-power.patch	                        (rev 0)
+++ current-power.patch	2010-12-06 21:41:49 UTC (rev 102220)
@@ -0,0 +1,12 @@
+diff -aur old/src/linux.c new/src/linux.c
+--- old/src/linux.c	2010-10-05 23:29:36.000000000 +0200
++++ new/src/linux.c	2010-12-06 22:18:59.346667183 +0100
+@@ -1671,6 +1671,8 @@
+  			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)