[arch-commits] Commit in xfce4-battery-plugin/trunk (PKGBUILD compile_x86_64.diff)

[andyrtr at archlinux.org]

    Date: Tuesday, January 4, 2011 @ 15:09:27
  Author: andyrtr
Revision: 104733

upgpkg: xfce4-battery-plugin 1.0.0-1
new upstream release - part of Xfce 4.8pre3 release candidate

Modified:
  xfce4-battery-plugin/trunk/PKGBUILD
Deleted:
  xfce4-battery-plugin/trunk/compile_x86_64.diff

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-04 19:58:37 UTC (rev 104732)
+++ PKGBUILD	2011-01-04 20:09:27 UTC (rev 104733)
@@ -3,27 +3,32 @@
 # Contributor: Aurelien Foret <orelien at chez.com>
 
 pkgname=xfce4-battery-plugin
-pkgver=0.5.1
-pkgrel=2
+pkgver=1.0.0
+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=('pkgconfig' 'perlxml')
+depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme')
+makedepends=('intltool')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	compile_x86_64.diff)
-md5sums=('d8a666d85bb3c1dd007b547de4dd7037' 'd9a927bca032e9b10a04046c154243a1')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('2696307f34f6b9630fcaaea102004e78')
 
 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
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
+  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
+}

Deleted: compile_x86_64.diff
===================================================================
--- compile_x86_64.diff	2011-01-04 19:58:37 UTC (rev 104732)
+++ compile_x86_64.diff	2011-01-04 20:09:27 UTC (rev 104733)
@@ -1,13 +0,0 @@
---- 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"
-