Wed Nov 23 23:15:26 UTC 2011

3 files changed, 55 insertions, 51 deletions

diff --git a/community/btanks/PKGBUILD b/community/btanks/PKGBUILD
index 1cb857a22..530c3bd98 100644
--- a/community/btanks/PKGBUILD
+++ b/community/btanks/PKGBUILD
@@ -1,40 +1,47 @@
+# $Id: PKGBUILD 59272 2011-11-22 09:39:15Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_ com>
+
 pkgname=btanks
 pkgver=0.9.8083
-pkgrel=1
+pkgrel=3
 pkgdesc="Fast 2d tank arcade game with multiplayer and split-screen modes."
 arch=('i686' 'x86_64')
 url="http://btanks.sourceforge.net"
 license=('GPL')
-depends=('expat' 'libgl' 'libsigc++2.0' 'libvorbis' 'lua' 'openal' 'sdl' 'sdl_image' 'smpeg' 'btanks-data')
-makedepends=('scons' 'chrpath')
+depends=('expat' 'libgl' 'libsigc++2.0' 'libvorbis' 'lua' 'openal' 'sdl' 'sdl_image'
+	 'smpeg' "btanks-data=$pkgver")
+makedepends=('scons' 'chrpath' 'mesa')
 source=(http://downloads.sourceforge.net/btanks/btanks-$pkgver.tar.bz2
 	btanks_desktop
 	btanks_script
-	bted_script)
+	bted_script
+	gcc-4.6.patch)
 install=btanks.install
 md5sums=('49cb95c0eec47d3436c4fdf65e7c9d12'
          'a2ddeb1e79dff8d3fd702984c8d3aab5'
          '07657cfa71b1de1d008cc5e3ade9749b'
-         '91a61c0f581ea27281bdaecb7a3cd58b')
+         '91a61c0f581ea27281bdaecb7a3cd58b'
+         '173f0ffe46bb1bab2c8aa240fe5331f3')
 
 build() {
-  # Compile with scons
   cd $srcdir/$pkgname-$pkgver
-  scons || return 1
+  patch -p1 <$srcdir/gcc-4.6.patch
+  python2 engine/sl08/sl08.py >engine/sl08/sl08.h
+  scons
 
   mkdir -p $pkgdir/usr/share/btanks
-  cp *.so btanks bted $pkgdir/usr/share/btanks/ || return 1
+  cp *.so btanks bted $pkgdir/usr/share/btanks/
 
   # Install script
-  install -D -m755 $srcdir/bted_script $pkgdir/usr/bin/bted && \
-  install -D -m755 $srcdir/btanks_script $pkgdir/usr/bin/btanks || return 1
+  install -D -m755 $srcdir/bted_script $pkgdir/usr/bin/bted
+  install -D -m755 $srcdir/btanks_script $pkgdir/usr/bin/btanks
 
   # Install desktop file
-  install -D -m644 $srcdir/btanks_desktop $pkgdir/usr/share/applications/btanks.desktop || return 1
+  install -D -m644 $srcdir/btanks_desktop $pkgdir/usr/share/applications/btanks.desktop
 
   # Install icon
-  install -D -m644 $srcdir/$pkgname-$pkgver/data/tiles/icon.png $pkgdir/usr/share/pixmaps/btanks.png || return 1
+  install -D -m644 $srcdir/$pkgname-$pkgver/data/tiles/icon.png $pkgdir/usr/share/pixmaps/btanks.png
 
   # Make settings saveable
   touch $pkgdir/usr/share/btanks/bt.xml
@@ -45,18 +52,18 @@ build() {
   cd $pkgdir/usr/share/btanks
   mkdir -p $pkgdir/usr/bin $pkgdir/usr/lib/btanks
 
-  mv btanks $pkgdir/usr/bin/btanks-bin && \
-  mv bted $pkgdir/usr/bin/bted-bin && \
-  mv *.so $pkgdir/usr/lib/btanks/ || return 1
+  mv btanks $pkgdir/usr/bin/btanks-bin
+  mv bted $pkgdir/usr/bin/bted-bin
+  mv *.so $pkgdir/usr/lib/btanks/
 
-  ln -s /usr/bin/btanks-bin ./btanks && \
-  ln -s /usr/bin/bted-bin ./bted || return 1
+  ln -s /usr/bin/btanks-bin ./btanks
+  ln -s /usr/bin/bted-bin ./bted
 
   ls -1 $pkgdir/usr/lib/btanks/ | while read A; do
-    ln -s /usr/lib/btanks/$A ./$A || return 1
+    ln -s /usr/lib/btanks/$A ./$A
   done
 
-  chrpath -d $pkgdir/usr/bin/bted-bin && \
-  chrpath -d $pkgdir/usr/bin/btanks-bin && \
+  chrpath -d $pkgdir/usr/bin/bted-bin
+  chrpath -d $pkgdir/usr/bin/btanks-bin
   chrpath -d $pkgdir/usr/lib/btanks/*.so
 }
diff --git a/community/btanks/btanks.install b/community/btanks/btanks.install
index b05ede359..f9ac8fce7 100644
--- a/community/btanks/btanks.install
+++ b/community/btanks/btanks.install
@@ -1,36 +1,7 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
 post_install() {
-  /bin/echo "In order to be able to change game preferences, you must be in the 'games' group."
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
+  echo "In order to be able to change game preferences, you must be in the 'games' group."
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  /bin/echo "In order to be able to change game preferences, you must be in the 'games' group."
+  echo "In order to be able to change game preferences, you must be in the 'games' group."
 }
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/btanks/gcc-4.6.patch b/community/btanks/gcc-4.6.patch
new file mode 100644
index 000000000..d371abd53
--- /dev/null
+++ b/community/btanks/gcc-4.6.patch
@@ -0,0 +1,26 @@
+From: Ansgar Burchardt <ansgar@debian.org>
+Bug-Debian: http://bugs.debian.org/624916
+Subject: Fix FTBFS with gcc-4.6
+
+--- btanks-0.9.8083.orig/engine/sl08/sl08.py
++++ btanks-0.9.8083/engine/sl08/sl08.py
+@@ -152,8 +152,8 @@ class Generator(object):
+ 			typedef base_signalXXX %s signal_type; 
+ 			typedef return_type (object_type::*func_t) %s; 
+ 
+-			inline slotXXX () : object(NULL), func(NULL) {}
+-			inline slotXXX(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
++			inline slotXXX () : object(0), func(0) {}
++			inline slotXXX(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+ 			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
+@@ -187,7 +187,7 @@ class Generator(object):
+ 			typedef base_signalXXX %s signal_type; 
+ 			typedef void (object_type::*func_t) %s ;
+ 
+-			inline slotXXX () : object(NULL), func(NULL) {}
++			inline slotXXX () : object(0), func(0) {}
+ 			inline slotXXX (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+ 			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }