Tue Aug 2 04:35:55 UTC 2011

2 files changed, 57 insertions, 6 deletions

diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 38ce61979..2fa563d4c 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 47908 2011-05-26 01:20:52Z svenstaro $
+# $Id: PKGBUILD 52636 2011-07-26 15:57:38Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=spring
 pkgver=0.82.7.1
-pkgrel=4
+pkgrel=6
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64')
 url="http://springrts.com/"
 license=('GPL')
 depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis')
-makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python' 'java-environment')
-optdepends=('python: python-based bots'
+makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2')
+optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
 source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
-        gcc46.patch)
+        gcc46.patch
+        awk-java.patch)
 md5sums=('378cf0b18a5dd5b840964e5945778503'
-         'e9586b611db1ed04fe4f0c5982fda7d2')
+         'e9586b611db1ed04fe4f0c5982fda7d2'
+         'cd94edf21e49ff6ff7d256442ed9aa3c')
 
 build() {
   bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
@@ -27,6 +29,7 @@ build() {
   sed -i '1i\
 	  #include <list>' rts/lib/lobby/Connection.h
   patch -Np1 < $srcdir/gcc46.patch
+  patch -Np1 < $srcdir/awk-java.patch
   cmake	. \
     -DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATADIR=share/spring
diff --git a/community/spring/awk-java.patch b/community/spring/awk-java.patch
new file mode 100644
index 000000000..36c932924
--- /dev/null
+++ b/community/spring/awk-java.patch
@@ -0,0 +1,48 @@
+diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk
+--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk	2011-07-26 17:29:16.623158278 +0200
++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk	2011-07-26 17:33:00.872921328 +0200
+@@ -341,7 +341,7 @@
+ }
+ 
+ # beginn of struct S*Command
+-/^\struct S.*Command( \{)?/ {
++/^struct S.*Command( \{)?/ {
+ 
+ 	isInsideCmdStruct = 1;
+ 	ind_cmdMember = 0;
+diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk
+--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk	2011-07-26 17:29:16.623158278 +0200
++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk	2011-07-26 17:32:51.009745026 +0200
+@@ -473,7 +473,7 @@
+ }
+ 
+ # beginn of struct S*Event
+-/^\struct S.*Event( \{)?/ {
++/^struct S.*Event( \{)?/ {
+ 
+ 	isInsideEvtStruct = 1;
+ 	ind_evtMember = 0;
+diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk
+--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk	2011-07-26 17:29:16.626491558 +0200
++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk	2011-07-26 17:30:25.695391913 +0200
+@@ -387,7 +387,7 @@
+ }
+ 
+ # beginn of struct S*Command
+-/^\struct S.*Command( \{)?/ {
++/^struct S.*Command( \{)?/ {
+ 
+ 	isInsideCmdStruct = 1;
+ 	ind_cmdMember = 0;
+diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk
+--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk	2011-07-26 17:29:16.626491558 +0200
++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk	2011-07-26 17:30:13.942245701 +0200
+@@ -366,7 +366,7 @@
+ }
+ 
+ # beginn of struct S*Event
+-/^\struct S.*Event( \{)?/ {
++/^struct S.*Event( \{)?/ {
+ 
+ 	isInsideEvtStruct = 1;
+ 	ind_evtMember = 0;