update quake3 mirrors; patch botlib on ioquake3

4 files changed, 21 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0fea0f8408b..5e5891940107 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ioquake3
 	pkgdesc = The de-facto OSS Quake 3 distribution. You need the retail/demo .pk3 files to play.
 	pkgver = 1.36
-	pkgrel = 1
+	pkgrel = 2
 	url = http://ioquake3.org/
 	install = quake3.install
 	arch = i686
@@ -16,18 +16,18 @@ pkgbase = ioquake3
 	conflicts = quake3-svn
 	conflicts = ioquake3-svn
 	replaces = quake3
-	source = quake3.install
 	source = quake3.desktop
 	source = quake3.launcher
 	source = quake3ded.launcher
 	source = http://www.ioquake3.org/files/1.36/ioquake3-1.36.tar.bz2
-	source = ftp://ftp.musicbrainz.org/.1/gentoo/distfiles/linuxq3apoint-1.32b-3.x86.run
-	md5sums = a4363cd27cba4027bd309bee6e48aaf2
+	source = http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run
+	source = botlib.patch::http://bugzilla-attachments.icculus.org/attachment.cgi?id=2196
 	md5sums = 9eca51e2b3ee3e0100944cba436a2a4c
-	md5sums = 37dbc85b482ee5c5b5063a31482bd083
-	md5sums = 37dbc85b482ee5c5b5063a31482bd083
+	md5sums = ea5d99df80b41269523b34229fdf854d
+	md5sums = ea5d99df80b41269523b34229fdf854d
 	md5sums = f938379a4a519ae32f6ffaacaf866cde
 	md5sums = c71fdddccb20e8fc393d846e9c61d685
+	md5sums = 4485f84a4a9bc9a25f2737ee1744febd
 
 pkgname = ioquake3
 
diff --git a/PKGBUILD b/PKGBUILD
index 73e4cc9ed5d2..25333d2d6064 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ioquake3
 pkgver=1.36
-pkgrel=1
+pkgrel=2
 pkgdesc="The de-facto OSS Quake 3 distribution. You need the retail/demo .pk3 files to play."
 url="http://ioquake3.org/"
 license='GPL'
@@ -13,15 +13,16 @@ conflicts=('quake3' 'quake3-icculus-svn' 'quake3-svn' 'ioquake3-svn')
 provides=('quake3')
 replaces=('quake3')
 install=quake3.install
-source=('quake3.install' 'quake3.desktop' 'quake3.launcher' 'quake3ded.launcher' \
+source=('quake3.desktop' 'quake3.launcher' 'quake3ded.launcher' \
 "http://www.ioquake3.org/files/${pkgver}/${pkgname}-${pkgver}.tar.bz2" \
-'ftp://ftp.musicbrainz.org/.1/gentoo/distfiles/linuxq3apoint-1.32b-3.x86.run')
-md5sums=('a4363cd27cba4027bd309bee6e48aaf2'
-         '9eca51e2b3ee3e0100944cba436a2a4c'
-         '37dbc85b482ee5c5b5063a31482bd083'
-         '37dbc85b482ee5c5b5063a31482bd083'
+'http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run' \
+'botlib.patch::http://bugzilla-attachments.icculus.org/attachment.cgi?id=2196')
+md5sums=('9eca51e2b3ee3e0100944cba436a2a4c'
+         'ea5d99df80b41269523b34229fdf854d'
+         'ea5d99df80b41269523b34229fdf854d'
          'f938379a4a519ae32f6ffaacaf866cde'
-         'c71fdddccb20e8fc393d846e9c61d685')
+         'c71fdddccb20e8fc393d846e9c61d685'
+         '4485f84a4a9bc9a25f2737ee1744febd')
 
 build() {
     cd $srcdir/$pkgname-$pkgver/
@@ -29,11 +30,14 @@ build() {
     # Modify Makefile to correct install path
     /bin/sed -i "s:/usr/local/games/quake3:$pkgdir/opt/quake3:" Makefile
 
+    # Patch botlib so bots work on 64bit
+    patch -p1 < $srcdir/botlib.patch || return 1
+
     # Compile ioQuake3
     make || return 1
 
     # Install Files
-    make copyfiles || return 1 
+    make copyfiles || return 1
 
     # Extract Patch Files
     cd $srcdir
diff --git a/quake3.launcher b/quake3.launcher
index 02e1c093bec7..c9b092bea99c 100644
--- a/quake3.launcher
+++ b/quake3.launcher
@@ -1,6 +1,5 @@
 #!/bin/bash
 
 cd "/opt/quake3"
-./IOQ3_BINARY $*
-exit $?
+exec ./IOQ3_BINARY $*
 
diff --git a/quake3ded.launcher b/quake3ded.launcher
index 02e1c093bec7..c9b092bea99c 100644
--- a/quake3ded.launcher
+++ b/quake3ded.launcher
@@ -1,6 +1,5 @@
 #!/bin/bash
 
 cd "/opt/quake3"
-./IOQ3_BINARY $*
-exit $?
+exec ./IOQ3_BINARY $*