[arch-commits] Commit in xfce4-battery-plugin/trunk (3 files)

[Evangelos Foutras]

    Date: Sunday, February 26, 2012 @ 16:56:36
  Author: foutrelis
Revision: 151508

upgpkg: xfce4-battery-plugin 1.0.0-3

Fix FS#27438: Remaining time not shown on some systems; style clean up.

Added:
  xfce4-battery-plugin/trunk/show-time-when-on-battery.patch
Modified:
  xfce4-battery-plugin/trunk/PKGBUILD
  xfce4-battery-plugin/trunk/xfce4-battery-plugin.install

---------------------------------+
 PKGBUILD                        |   35 ++++++++++++++++++++++-------------
 show-time-when-on-battery.patch |   21 +++++++++++++++++++++
 xfce4-battery-plugin.install    |    6 ++++--
 3 files changed, 47 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-26 21:47:29 UTC (rev 151507)
+++ PKGBUILD	2012-02-26 21:56:36 UTC (rev 151508)
@@ -4,31 +4,40 @@
 
 pkgname=xfce4-battery-plugin
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A battery monitor plugin for the Xfce panel"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2696307f34f6b9630fcaaea102004e78')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2
+        show-time-when-on-battery.patch)
+sha256sums=('c28bb580e6b932c017b5bc6b2e75de8c3557e08d9606c7a70134aa035f8a121f'
+            '7cabd72a462406295e438a2aae89c09af9f759b5c257f7ecd19ae02c81250575')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+
+  # Fix FS#27438: Remaining time not shown on some systems
+  patch -Np1 -i "$srcdir/show-time-when-on-battery.patch"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:

Added: show-time-when-on-battery.patch
===================================================================
--- show-time-when-on-battery.patch	                        (rev 0)
+++ show-time-when-on-battery.patch	2012-02-26 21:56:36 UTC (rev 151508)
@@ -0,0 +1,21 @@
+From f4a68f05e838291d1ddcb60f7c719873bfd57d27 Mon Sep 17 00:00:00 2001
+From: flo <florian.a.jung at web.de>
+Date: Fri, 18 Feb 2011 17:21:12 +0000
+Subject: Show time when on battery power (bug #3736).
+
+---
+diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c
+index 87339b7..838a760 100644
+--- a/panel-plugin/libacpi.c
++++ b/panel-plugin/libacpi.c
+@@ -787,7 +787,7 @@ int read_acpi_state_sysfs(int battery)
+ 			acpistate->rcapacity = read_sysfs_int(buf);
+ 			acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100;
+ 		}
+-		if (strcmp(name,"current_now") == 0)
++		if ((strcmp(name,"current_now") == 0) || (strcmp(name,"power_now") == 0))
+ 		{
+ 			sprintf(buf,"%s/%s",batteries[battery], name);
+ 			acpistate->prate = read_sysfs_int(buf);
+--
+cgit v0.9.0.2

Modified: xfce4-battery-plugin.install
===================================================================
--- xfce4-battery-plugin.install	2012-02-26 21:47:29 UTC (rev 151507)
+++ xfce4-battery-plugin.install	2012-02-26 21:56:36 UTC (rev 151508)
@@ -3,9 +3,11 @@
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et: