Update

5 files changed, 36 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dfa91a20b09b..e5ca100e6282 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 # Generated by mksrcinfo v8
-# Sun Jan 27 21:19:46 UTC 2019
+# Wed Jan 30 21:33:40 UTC 2019
 pkgbase = openlierox
 	pkgdesc = An extremely addictive realtime worms shoot-em-up backed by an active gamers community
-	pkgver = 0.57_beta2
-	pkgrel = 2
+	pkgver = 0.58_rc5
+	pkgrel = 1
 	url = http://openlierox.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = gendesk
+	makedepends = cmake
 	depends = sdl
 	depends = sdl_mixer
 	depends = sdl_image
@@ -16,14 +17,12 @@ pkgbase = openlierox
 	depends = gd
 	depends = zlib
 	depends = libxml2
-	source = http://downloads.sourceforge.net/sourceforge/openlierox/OpenLieroX_0.57_beta2.src.tar.bz2
-	source = compilesh.patch
-	source = cbytestream.patch
+	source = http://downloads.sourceforge.net/sourceforge/openlierox/OpenLieroX_0.58_rc5.src.tar.bz2
 	source = options.cfg
-	md5sums = 6985e35d7d1cd7520ccba387c459f333
-	md5sums = 414db95d3acac00dca935deba6cc7488
-	md5sums = 485670d8cdfeef69199ed481acbbe1b3
+	source = OpenLieroX.png
+	md5sums = 9899f4c7e11eb02abe5bebfbdef80dcb
 	md5sums = 04d00deb6521b3fbcdba6e9546ae67cf
+	md5sums = f2aec85a3ad86a6cf7d1362f31b38e51
 
 pkgname = openlierox
 
diff --git a/OpenLieroX.png b/OpenLieroX.png
new file mode 100644
index 000000000000..1b1d35302556
--- /dev/null
+++ b/OpenLieroX.png
diff --git a/PKGBUILD b/PKGBUILD
index db78794acb65..8936da1eb7db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,46 @@
 # Maintainer: Jose Riha <jose 1711 gmail com>
 # Contributor: Dominika Solarz <dominikasolarz@gmail.com>
 pkgname=openlierox
-pkgver=0.57_beta2
-pkgrel=2
+pkgver=0.58_rc5
+pkgrel=1
 pkgdesc="An extremely addictive realtime worms shoot-em-up backed by an active gamers community"
 arch=(i686 x86_64)
 license=("GPL")
 url="http://openlierox.sourceforge.net/"
 depends=("sdl" "sdl_mixer" "sdl_image" "hawknl" "gd" "zlib" "libxml2")
-makedepends=("gendesk")
+makedepends=("gendesk" "cmake")
 source=("http://downloads.sourceforge.net/sourceforge/openlierox/OpenLieroX_${pkgver}.src.tar.bz2"
-        "compilesh.patch"
-	"cbytestream.patch"
-        "options.cfg")
-md5sums=('6985e35d7d1cd7520ccba387c459f333'
-         '414db95d3acac00dca935deba6cc7488'
-         '485670d8cdfeef69199ed481acbbe1b3'
-         '04d00deb6521b3fbcdba6e9546ae67cf')
+        "options.cfg"
+        "OpenLieroX.png")
+md5sums=('9899f4c7e11eb02abe5bebfbdef80dcb'
+         '04d00deb6521b3fbcdba6e9546ae67cf'
+         'f2aec85a3ad86a6cf7d1362f31b38e51')
 
 prepare() {
-cd $srcdir/OpenLieroX
-patch -p0 -i $srcdir/compilesh.patch 
-patch -p0 --binary -i $srcdir/cbytestream.patch
-gendesk -f -n --pkgname OpenLieroX --pkgdesc "${pkgdesc}" --exec "openlierox" --categories "Games"
+  cd $srcdir/OpenLieroX
+  gendesk -f -n --pkgname OpenLieroX --pkgdesc "${pkgdesc}" --exec "openlierox" --categories "Games"
 }
 
 build() {
-cd $srcdir/OpenLieroX
-./compile.sh
+  cd $srcdir/OpenLieroX
+  if [ -d bd ]
+  then
+    rm -rf bd
+  fi
+
+  mkdir bd && cd bd
+  cmake -DSYSTEM_DATA_DIR=/usr/share ..
+  make
 }
 
 package() {
-cd $srcdir/OpenLieroX
-install -Dm755 bin/openlierox $pkgdir/usr/bin/openlierox
-chmod -R 644 share/gamedir
-install -dm755 $pkgdir/usr/share/OpenLieroX
-cp -r share/gamedir/* $pkgdir/usr/share/OpenLieroX/
-install -Dm644 OpenLieroX.desktop "${pkgdir}/usr/share/applications/OpenLieroX.desktop"
-install -Dm644 share/OpenLieroX.png "${pkgdir}/usr/share/pixmaps/OpenLieroX.png"
-install -Dm644 ${srcdir}/options.cfg "${pkgdir}/usr/share/OpenLieroX/cfg/options.cfg"
+  cd $srcdir/OpenLieroX
+  install -Dm755 bd/bin/openlierox $pkgdir/usr/bin/openlierox
+  install -dm755 $pkgdir/usr/share/OpenLieroX
+  cp -r share/gamedir/* $pkgdir/usr/share/OpenLieroX/
+  find "${pkgdir}/usr/share/OpenLieroX"  -type d -print0 | xargs -0 -- chmod 755
+  find "${pkgdir}/usr/share/OpenLieroX" -type f -print0 | xargs -0 -- chmod 644
+  install -Dm644 OpenLieroX.desktop "${pkgdir}/usr/share/applications/OpenLieroX.desktop"
+  install -Dm644 "${srcdir}/OpenLieroX.png" "${pkgdir}/usr/share/pixmaps/OpenLieroX.png"
+  install -Dm644 ${srcdir}/options.cfg "${pkgdir}/usr/share/OpenLieroX/cfg/options.cfg"
 }
diff --git a/cbytestream.patch b/cbytestream.patch
deleted file mode 100644
index a3a376e0505e..000000000000
--- a/cbytestream.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/CBytestream.cpp.orig	2019-01-26 20:45:40.086373395 +0100

-+++ src/common/CBytestream.cpp	2019-01-26 20:45:59.482914532 +0100

-@@ -314,7 +314,7 @@

- char *CBytestream::readString(char *str, size_t maxlen)

- {

- 	if (!str)

--		return false;

-+		return "false";

- 

- 	// Validate that there is some terminating character

- 	bool valid = false;

diff --git a/compilesh.patch b/compilesh.patch
deleted file mode 100644
index 3733a1d09d01..000000000000
--- a/compilesh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- compile.sh.orig	2019-01-26 20:39:36.455394693 +0100
-+++ compile.sh	2019-01-26 20:39:55.385269142 +0100
-@@ -105,7 +105,7 @@
- if $COMPILER src/*.cpp src/client/*.cpp src/common/*.cpp src/server/*.cpp \
- 	$HAWKNL_GCC_PARAM \
- 	-I include -I /usr/include/libxml2 -I /usr/include/hawknl \
--	-I /usr/local/include/libxml2 -I /usr/local/include/hawknl \
-+	-I /usr/local/include/libxml2 -I /usr/local/include/hawknl -I /usr/include/SDL \
- 	-lSDL -lSDL_image -lSDL_gfx -lSDL_mixer -lz -lgd -lxml2 \
- 	-DSYSTEM_DATA_DIR="\"$SYSTEM_DATA_DIR\"" \
- 	-DDEBUG="$DEBUG" \