Fix broken build function

3 files changed, 41 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a8ebda30b55..92ca463ccdd9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Aug 18 09:52:11 UTC 2016
+# Tue Jan  8 22:12:40 UTC 2019
 pkgbase = kulic
 	pkgdesc = 2d shooting game
 	pkgver = 1.1
-	pkgrel = 4
+	pkgrel = 5
 	url = http://hippo.nipax.cz/download.cz.php?id=59
 	arch = i686
 	arch = x86_64
@@ -11,7 +11,9 @@ pkgbase = kulic
 	depends = allegro4
 	depends = libjpeg
 	source = http://hippo.nipax.cz/src/kulic-1.1.tar.gz
+	source = allegro_aliases.patch
 	md5sums = 16aff4bded3ae1c6712ca71d4d429730
+	md5sums = 9671a62c0cab0b0b2e5106f80b43a921
 
 pkgname = kulic
 
diff --git a/PKGBUILD b/PKGBUILD
index ba1ed186aab6..6f3fe4d9608f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,41 @@
 
 pkgname=kulic
 pkgver=1.1
-pkgrel=4
+pkgrel=5
 pkgdesc="2d shooting game"
 url='http://hippo.nipax.cz/download.cz.php?id=59'
 arch=('i686' 'x86_64')
 license=('GPL-2')
 depends=('allegro4' 'libjpeg')
-source=("http://hippo.nipax.cz/src/${pkgname}-${pkgver}.tar.gz")
-md5sums=('16aff4bded3ae1c6712ca71d4d429730')
+source=("http://hippo.nipax.cz/src/${pkgname}-${pkgver}.tar.gz" "allegro_aliases.patch")
+md5sums=('16aff4bded3ae1c6712ca71d4d429730'
+         '9671a62c0cab0b0b2e5106f80b43a921')
+
+prepare() {
+  cd $srcdir/${pkgname}-${pkgver}
+  patch -p0 -i $srcdir/allegro_aliases.patch
+  mv configure.in configure.ac
+}
 
 build() {
-cd $srcdir/${pkgname}-${pkgver}
-# some patching needed here
-#sed -i 's/iostream.h/iostream/' src/*.c*
-ln -sf /usr/share/automake-1.15/depcomp depcomp
-./configure --prefix=/usr
-make
+  cd $srcdir/${pkgname}-${pkgver}
+  aclocal
+  automake --add-missing
+  autoconf
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
-cd $srcdir/${pkgname}-${pkgver}
-make DESTDIR="$pkgdir/" install
-mv $pkgdir/usr/bin/kulic $pkgdir/usr/share/kulic
-( echo "#!/bin/bash
+  cd $srcdir/${pkgname}-${pkgver}
+  make DESTDIR="$pkgdir/" install
+  mv $pkgdir/usr/bin/kulic $pkgdir/usr/share/kulic
+  ( echo "#!/bin/bash
 cd /usr/share/kulic
-./kulic" ) > $pkgdir/usr/bin/kulic
-chmod 755 $pkgdir/usr/bin/kulic
-cd misc
-install -D -m644 kulic.6 $pkgdir/usr/share/man/man6/kulic.6
-install -D -m644 kulic.xpm $pkgdir/usr/share/pixmaps/kulic.xpm
-install -D -m644 kulic.desktop $pkgdir/usr/share/applications/kulic.desktop
+padsp ./kulic" ) > $pkgdir/usr/bin/kulic
+  chmod 755 $pkgdir/usr/bin/kulic
+  cd misc
+  install -D -m644 kulic.6 $pkgdir/usr/share/man/man6/kulic.6
+  install -D -m644 kulic.xpm $pkgdir/usr/share/pixmaps/kulic.xpm
+  install -D -m644 kulic.desktop $pkgdir/usr/share/applications/kulic.desktop
 }
diff --git a/allegro_aliases.patch b/allegro_aliases.patch
new file mode 100644
index 000000000000..50f3404e47fe
--- /dev/null
+++ b/allegro_aliases.patch
@@ -0,0 +1,11 @@
+--- acinclude.m4.old	2009-12-21 23:20:06.000000000 +0100
++++ acinclude.m4	2019-01-08 22:28:36.983940138 +0100
+@@ -42,7 +42,7 @@
+   if test "$ALLEGRO_CONFIG" = "no" ; then
+     no_allegro=yes
+   else
+-    allegro_CFLAGS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --cflags`
++    allegro_CFLAGS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --cflags`" -DALLEGRO_NO_FIX_ALIASES"
+     allegro_LIBS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --libs`
+     ALLEGRO_CONFIG_major_version=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --version | \
+            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`