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

[andyrtr at archlinux.org]

    Date: Thursday, October 30, 2008 @ 21:15:45
  Author: andyrtr
Revision: 17558

Merged revisions 356,17555,17557 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xfce4-battery-plugin/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fr, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r17555 | andyrtr | 2008-10-31 00:59:45 +0000 (Fr, 31 Okt 2008) | 1 line
  
  upgpkg: xfce4-battery-plugin 0.5.1-1
........
  r17557 | andyrtr | 2008-10-31 01:14:27 +0000 (Fr, 31 Okt 2008) | 2 lines
  
  upgpkg: xfce4-battery-plugin 0.5.1-1
      add a compile fix
........

Added:
  xfce4-battery-plugin/repos/extra-x86_64/compile_x86_64.diff
    (from rev 17557, xfce4-battery-plugin/trunk/compile_x86_64.diff)
Modified:
  xfce4-battery-plugin/repos/extra-x86_64/	(properties)
  xfce4-battery-plugin/repos/extra-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |   14 +++++++++-----
 compile_x86_64.diff |   13 +++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)


Property changes on: xfce4-battery-plugin/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xfce4-battery-plugin/trunk:1
   + /xfce4-battery-plugin/trunk:1-17557

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-31 01:14:27 UTC (rev 17557)
+++ extra-x86_64/PKGBUILD	2008-10-31 01:15:45 UTC (rev 17558)
@@ -3,8 +3,8 @@
 # Contributor: Aurelien Foret <orelien at chez.com>
 
 pkgname=xfce4-battery-plugin
-pkgver=0.5.0
-pkgrel=5
+pkgver=0.5.1
+pkgrel=1
 pkgdesc="A battery monitor plugin for the Xfce panel"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -14,11 +14,15 @@
 makedepends=('pkgconfig')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('c1d923bb90b79087ca7044bcc24bab5a')
+source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+	compile_x86_64.diff)
+md5sums=('d8a666d85bb3c1dd007b547de4dd7037'
+         'd9a927bca032e9b10a04046c154243a1')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  # fix http://bugzilla.xfce.org/show_bug.cgi?id=4359
+  patch -Np1 -i ${srcdir}/compile_x86_64.diff || return 1
  # the purpose of this code is to check if there is an acpi system installed at all
  # but since the code also exits when no /proc/acpi/battery directory is there we are safe
   ex panel-plugin/libacpi.c << EOC > /dev/null 2>&1
@@ -27,7 +31,7 @@
 w
 q
 EOC
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --disable-static
   make || return 1
   make DESTDIR=${startdir}/pkg install

Copied: xfce4-battery-plugin/repos/extra-x86_64/compile_x86_64.diff (from rev 17557, xfce4-battery-plugin/trunk/compile_x86_64.diff)
===================================================================
--- extra-x86_64/compile_x86_64.diff	                        (rev 0)
+++ extra-x86_64/compile_x86_64.diff	2008-10-31 01:15:45 UTC (rev 17558)
@@ -0,0 +1,13 @@
+--- xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h.orig	2008-03-18 20:10:58.000000000 +0100
++++ xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h	2008-03-18 20:14:45.000000000 +0100
+@@ -17,8 +17,8 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/apm_bios.h>
+ #include <sys/types.h>
++#include <linux/apm_bios.h>
+ 
+ #define APM_PROC   "/proc/apm"
+ #define APM_DEVICE "/dev/apm_bios"
+