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

[andyrtr at archlinux.org]

    Date: Tuesday, November 4, 2008 @ 11:33:10
  Author: andyrtr
Revision: 18357

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

........
  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
........
  r17735 | eric | 2008-11-01 02:36:03 +0000 (Sa, 01 Nov 2008) | 2 lines
  
  upgpkg: xfce4-battery-plugin 0.5.1-1
      added perlxml makedepends
........
  r18356 | andyrtr | 2008-11-04 16:32:04 +0000 (Di, 04 Nov 2008) | 2 lines
  
  upgpkg: xfce4-battery-plugin 0.5.1-2
      remove unneeded lines to make it work again
........

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

---------------------+
 PKGBUILD            |   19 +++++++------------
 compile_x86_64.diff |   13 +++++++++++++
 2 files changed, 20 insertions(+), 12 deletions(-)


Property changes on: xfce4-battery-plugin/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xfce4-battery-plugin/trunk:1-17555
   + /xfce4-battery-plugin/trunk:1-18356

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-04 16:32:04 UTC (rev 18356)
+++ extra-i686/PKGBUILD	2008-11-04 16:33:10 UTC (rev 18357)
@@ -4,29 +4,24 @@
 
 pkgname=xfce4-battery-plugin
 pkgver=0.5.1
-pkgrel=1
+pkgrel=2
 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=('pkgconfig')
+makedepends=('pkgconfig' 'perlxml')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d8a666d85bb3c1dd007b547de4dd7037')
+source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+	compile_x86_64.diff)
+md5sums=('d8a666d85bb3c1dd007b547de4dd7037' 'd9a927bca032e9b10a04046c154243a1')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
- # 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
-/proc.acpi.info
-d10
-w
-q
-EOC
+  # fix http://bugzilla.xfce.org/show_bug.cgi?id=4359
+  patch -Np1 -i ${srcdir}/compile_x86_64.diff || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --disable-static
   make || return 1

Copied: xfce4-battery-plugin/repos/extra-i686/compile_x86_64.diff (from rev 18356, xfce4-battery-plugin/trunk/compile_x86_64.diff)
===================================================================
--- extra-i686/compile_x86_64.diff	                        (rev 0)
+++ extra-i686/compile_x86_64.diff	2008-11-04 16:33:10 UTC (rev 18357)
@@ -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"
+