Stopped compiling ezquake because the resulting binary is broke. Fixed launcher bash arg issue, added icon

1 files changed, 19 insertions, 38 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d30ff7b6a913..7e7182114941 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,67 +2,48 @@
 
 pkgname=ezquake
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="One of the most Popular QuakeWorld clients for Linux/BSD/OSX/Win32. You need the retail pak files to play."
 url="http://ezquake.sourceforge.net/"
 license=('GPL')
 depends=('libgl' 'libxxf86dga')
-makedepends=('unzip' 'wget')
+makedepends=('unzip')
 conflicts=('fuhquake')
 provides=('fuhquake')
 arch=('i686' 'x86_64')
 install=ezquake.install
-source=('ezquake.launcher' 'ezquake.install' 'ezquake.desktop' \
-"http://downloads.sourceforge.net/sourceforge/ezquake/ezquake_linux-x86_$pkgver.tar.gz" \
-"http://downloads.sourceforge.net/sourceforge/ezquake/ezquake_source_$pkgver.zip")
+source=("http://downloads.sourceforge.net/sourceforge/ezquake/ezquake_linux-x86_${pkgver}.tar.gz" \
+'ezquake.launcher' 'ezquake.desktop' 'ezquake.ico')
 noextract=("ezquake_linux-x86_$pkgver.tar.gz")
-md5sums=('a61707a154bc97723f9a4fad65327df3'
-         'b56e6329253ffdccdab303f80771c347'
+md5sums=('25cad2fa8f695b18b2e6cab313a7a8be'
+         'bad99b7adc7c238f1df2fc4973c00ae6'
          '75cfa823bf495fe4cdb755c6b5546f2a'
-         '25cad2fa8f695b18b2e6cab313a7a8be'
-         '966922142bb577d7dd1a0512e3a1ff7a')
+         'b3fd62bf6f56f139257544cab74ba71e')
+
+if [ $CARCH = 'x86_64' ]; then
+    source[0] = "http://downloads.sourceforge.net/sourceforge/ezquake/ezquake_linux-x86_64_${pkgver}.tar.gz"
+    md5sums[0] = 'db2e5f97152fe11b026a2814f0f30f12'
+    noextract=("ezquake_linux-x86_64_$pkgver.tar.gz")
+fi
 
 build() {
-    cd $startdir/src
+    cd $srcdir
 
-    # Make Directories
+    # Make Destination Directories
     install -d $pkgdir/opt/quake
 
     # Unpack ezQuake
-    bsdtar -x -o -C $pkgdir/opt/quake -f $srcdir/ezquake_linux-x86_$pkgver.tar.gz
-
-    # Remove Binaries
-    rm $pkgdir/opt/quake/ezquake{-gl.glx,.svga,.x11}
-
-    # Download Extra Libraries needed to compile
-    if [ "$CARCH" = "i686" ]; then
-        cd $srcdir/src/libs/linux-x86/
-        ./download.sh
-    else
-        cd $srcdir/src/libs/linux-x86_64/
-        ./download.sh
-    fi
-
-    # Change to Source Code Directory
-    cd $srcdir/src/
-
-    # Compile Source Code
-    make glx || return 1
-
-    # Install Binaries
-    if [ "$CARCH" = "i686" ]; then
-        install -D -m755 -t $pkgdir/opt/quake/ \
-            $srcdir/src/release-x86/ezquake-gl.glx
+    if [ $CARCH = 'x86_64' ]; then
+        bsdtar -x -o -C $pkgdir/opt/quake -f $srcdir/ezquake_linux-x86_64_$pkgver.tar.gz
     else
-        install -D -m755 -t $pkgdir/opt/quake/ \
-            $srcdir/src/release-x86_64/ezquake-gl.glx
+        bsdtar -x -o -C $pkgdir/opt/quake -f $srcdir/ezquake_linux-x86_$pkgver.tar.gz
     fi
 
     # Make id1 Directory for pak0.pak and pak1.pak files
     install -d $pkgdir/opt/quake/id1/
 
     # Install Icon
-    install -D -m644 $srcdir/src/ezquake.ico \
+    install -D -m644 $srcdir/ezquake.ico \
         $pkgdir/usr/share/pixmaps/ezquake.ico
 
     # Install Launcher