[arch-commits] Commit in xfce4-systemload-plugin/repos (2 files)

[andyrtr at archlinux.org]

    Date: Thursday, May 14, 2009 @ 13:24:35
  Author: andyrtr
Revision: 39290

fix svn conflicts

Modified:
  xfce4-systemload-plugin/repos/extra-i686/	(properties)
  xfce4-systemload-plugin/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)


Property changes on: xfce4-systemload-plugin/repos/extra-i686
___________________________________________________________________
Deleted: svnmerge-integrated
   - /xfce4-systemload-plugin/trunk:1

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-14 17:22:26 UTC (rev 39289)
+++ extra-i686/PKGBUILD	2009-05-14 17:24:35 UTC (rev 39290)
@@ -4,20 +4,23 @@
 
 pkgname=xfce4-systemload-plugin
 pkgver=0.4.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A system load plugin for the Xfce4 panel"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel')
-makedepends=('pkgconfig')
+depends=('xfce4-panel>=4.6.1')
+makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
-source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('cc5777bb1621704927513eb8eef5f07c')
+source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+	missing_tooltip.diff )
+md5sums=('cc5777bb1621704927513eb8eef5f07c'
+         'c66c1af1519e1618553bdaea3ae89e89')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i $srcdir/missing_tooltip.diff || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
     --localstatedir=/var --disable-static
   make || return 1