[arch-commits] Commit in xbill/trunk (03_fix_ftbfs_binutils_gold.diff PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, February 4, 2012 @ 08:10:35
  Author: andyrtr
Revision: 148615

upgpkg: xbill 2.1-8

libXaw3D rebuild 

Added:
  xbill/trunk/03_fix_ftbfs_binutils_gold.diff
Modified:
  xbill/trunk/PKGBUILD

---------------------------------+
 03_fix_ftbfs_binutils_gold.diff |   15 +++++++++++++++
 PKGBUILD                        |   13 +++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

Added: 03_fix_ftbfs_binutils_gold.diff
===================================================================
--- 03_fix_ftbfs_binutils_gold.diff	                        (rev 0)
+++ 03_fix_ftbfs_binutils_gold.diff	2012-02-04 13:10:35 UTC (rev 148615)
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with binutils-gold
+Author: Vincent Legout <vincent at legout.info>
+Bug-Debian: http://bugs.debian.org/556690
+Last-Update: 2009-12-08
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -21,7 +21,7 @@
+ VPATH = @srcdir@
+ 
+ ALL_CFLAGS =	$(CFLAGS) $(CPPFLAGS) -I$(srcdir)
+-ALL_LDFLAGS =	$(CFLAGS) $(LDFLAGS)
++ALL_LDFLAGS =	$(CFLAGS) $(LDFLAGS) -lXpm
+ IMAGE_DEFINES=-DIMAGES=\"${datadir}/xbill\"
+ SCORE_DEFINES=-DSCOREFILE=\"${localstatedir}/xbill.scores\"
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-04 12:57:33 UTC (rev 148614)
+++ PKGBUILD	2012-02-04 13:10:35 UTC (rev 148615)
@@ -3,19 +3,24 @@
 
 pkgname=xbill
 pkgver=2.1
-pkgrel=7
+pkgrel=8
 pkgdesc="A game that tests your reflexes as you seek and destroy all forms of Bill"
 arch=('i686' 'x86_64')
 url="http://www.xbill.org/"
 license=('GPL')
-depends=('xaw3d')
+depends=('xaw3d>=1.6')
 makedepends=('libxaw')
 install=xbill.install
-source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('585e4866b15255a24203db9959407b2f')
+source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz
+        03_fix_ftbfs_binutils_gold.diff)
+md5sums=('585e4866b15255a24203db9959407b2f'
+         'e260a6cd4f9af003d249961cb60e2d01')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # taken from Debian
+  patch -Np1 -i ${srcdir}/03_fix_ftbfs_binutils_gold.diff
+  autoconf -v -f
   ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var/games \
     --disable-motif  --enable-athena --disable-gtk
   make