Date: Saturday, April 21, 2012 @ 01:17:50 Author: eric Revision: 156575
archrelease: copy trunk to extra-i686, extra-x86_64 Added: xfce4-battery-plugin/repos/extra-i686/PKGBUILD (from rev 156574, xfce4-battery-plugin/trunk/PKGBUILD) xfce4-battery-plugin/repos/extra-i686/xfce4-battery-plugin.install (from rev 156574, xfce4-battery-plugin/trunk/xfce4-battery-plugin.install) xfce4-battery-plugin/repos/extra-x86_64/PKGBUILD (from rev 156574, xfce4-battery-plugin/trunk/PKGBUILD) xfce4-battery-plugin/repos/extra-x86_64/xfce4-battery-plugin.install (from rev 156574, xfce4-battery-plugin/trunk/xfce4-battery-plugin.install) Deleted: xfce4-battery-plugin/repos/extra-i686/PKGBUILD xfce4-battery-plugin/repos/extra-i686/show-time-when-on-battery.patch xfce4-battery-plugin/repos/extra-i686/xfce4-battery-plugin.install xfce4-battery-plugin/repos/extra-x86_64/PKGBUILD xfce4-battery-plugin/repos/extra-x86_64/show-time-when-on-battery.patch xfce4-battery-plugin/repos/extra-x86_64/xfce4-battery-plugin.install ----------------------------------------------+ extra-i686/PKGBUILD | 80 +++++++++++-------------- extra-i686/show-time-when-on-battery.patch | 21 ------ extra-i686/xfce4-battery-plugin.install | 26 ++++---- extra-x86_64/PKGBUILD | 80 +++++++++++-------------- extra-x86_64/show-time-when-on-battery.patch | 21 ------ extra-x86_64/xfce4-battery-plugin.install | 26 ++++---- 6 files changed, 100 insertions(+), 154 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-04-21 05:17:32 UTC (rev 156574) +++ extra-i686/PKGBUILD 2012-04-21 05:17:50 UTC (rev 156575) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: aurelien <aurel...@archlinux.org> -# Contributor: Aurelien Foret <orel...@chez.com> - -pkgname=xfce4-battery-plugin -pkgver=1.0.0 -pkgrel=3 -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') -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') - -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" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: Copied: xfce4-battery-plugin/repos/extra-i686/PKGBUILD (from rev 156574, xfce4-battery-plugin/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-04-21 05:17:50 UTC (rev 156575) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: aurelien <aurel...@archlinux.org> +# Contributor: Aurelien Foret <orel...@chez.com> + +pkgname=xfce4-battery-plugin +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') +makedepends=('intltool') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha256sums=('28c20a9cfa4461e5411b428aecad4a3c2f49eab69bb9a208b6ebb151c8bf212f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Deleted: extra-i686/show-time-when-on-battery.patch =================================================================== --- extra-i686/show-time-when-on-battery.patch 2012-04-21 05:17:32 UTC (rev 156574) +++ extra-i686/show-time-when-on-battery.patch 2012-04-21 05:17:50 UTC (rev 156575) @@ -1,21 +0,0 @@ -From f4a68f05e838291d1ddcb60f7c719873bfd57d27 Mon Sep 17 00:00:00 2001 -From: flo <florian.a.j...@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 Deleted: extra-i686/xfce4-battery-plugin.install =================================================================== --- extra-i686/xfce4-battery-plugin.install 2012-04-21 05:17:32 UTC (rev 156574) +++ extra-i686/xfce4-battery-plugin.install 2012-04-21 05:17:50 UTC (rev 156575) @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: Copied: xfce4-battery-plugin/repos/extra-i686/xfce4-battery-plugin.install (from rev 156574, xfce4-battery-plugin/trunk/xfce4-battery-plugin.install) =================================================================== --- extra-i686/xfce4-battery-plugin.install (rev 0) +++ extra-i686/xfce4-battery-plugin.install 2012-04-21 05:17:50 UTC (rev 156575) @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-04-21 05:17:32 UTC (rev 156574) +++ extra-x86_64/PKGBUILD 2012-04-21 05:17:50 UTC (rev 156575) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: aurelien <aurel...@archlinux.org> -# Contributor: Aurelien Foret <orel...@chez.com> - -pkgname=xfce4-battery-plugin -pkgver=1.0.0 -pkgrel=3 -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') -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') - -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" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: Copied: xfce4-battery-plugin/repos/extra-x86_64/PKGBUILD (from rev 156574, xfce4-battery-plugin/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-04-21 05:17:50 UTC (rev 156575) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: aurelien <aurel...@archlinux.org> +# Contributor: Aurelien Foret <orel...@chez.com> + +pkgname=xfce4-battery-plugin +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') +makedepends=('intltool') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha256sums=('28c20a9cfa4461e5411b428aecad4a3c2f49eab69bb9a208b6ebb151c8bf212f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Deleted: extra-x86_64/show-time-when-on-battery.patch =================================================================== --- extra-x86_64/show-time-when-on-battery.patch 2012-04-21 05:17:32 UTC (rev 156574) +++ extra-x86_64/show-time-when-on-battery.patch 2012-04-21 05:17:50 UTC (rev 156575) @@ -1,21 +0,0 @@ -From f4a68f05e838291d1ddcb60f7c719873bfd57d27 Mon Sep 17 00:00:00 2001 -From: flo <florian.a.j...@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 Deleted: extra-x86_64/xfce4-battery-plugin.install =================================================================== --- extra-x86_64/xfce4-battery-plugin.install 2012-04-21 05:17:32 UTC (rev 156574) +++ extra-x86_64/xfce4-battery-plugin.install 2012-04-21 05:17:50 UTC (rev 156575) @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: Copied: xfce4-battery-plugin/repos/extra-x86_64/xfce4-battery-plugin.install (from rev 156574, xfce4-battery-plugin/trunk/xfce4-battery-plugin.install) =================================================================== --- extra-x86_64/xfce4-battery-plugin.install (rev 0) +++ extra-x86_64/xfce4-battery-plugin.install 2012-04-21 05:17:50 UTC (rev 156575) @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: