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

[Eric Bélanger]

    Date: Saturday, April 21, 2012 @ 01:17:32
  Author: eric
Revision: 156574

upgpkg: xfce4-battery-plugin 1.0.1-1

Upstream update, Remove libxfcegui4 and hicolor-icon-theme depends, Remove old patch

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

---------------------------------+
 PKGBUILD                        |   18 ++++++------------
 show-time-when-on-battery.patch |   21 ---------------------
 2 files changed, 6 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-21 04:42:41 UTC (rev 156573)
+++ PKGBUILD	2012-04-21 05:17:32 UTC (rev 156574)
@@ -3,28 +3,22 @@
 # Contributor: Aurelien Foret <orelien at chez.com>
 
 pkgname=xfce4-battery-plugin
-pkgver=1.0.0
-pkgrel=3
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="A battery monitor plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme')
+depends=('xfce4-panel')
 makedepends=('intltool')
 options=('!libtool')
 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')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('28c20a9cfa4461e5411b428aecad4a3c2f49eab69bb9a208b6ebb151c8bf212f')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # Fix FS#27438: Remaining time not shown on some systems
-  patch -Np1 -i "$srcdir/show-time-when-on-battery.patch"
-
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \

Deleted: show-time-when-on-battery.patch
===================================================================
--- show-time-when-on-battery.patch	2012-04-21 04:42:41 UTC (rev 156573)
+++ show-time-when-on-battery.patch	2012-04-21 05:17:32 UTC (rev 156574)
@@ -1,21 +0,0 @@
-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