From f8134211479859883bab5c83d10272184adf2083 Mon Sep 17 00:00:00 2001
From: Симон Болоканов
Date: Sun, 21 Dec 2014 16:14:33 +0200
Subject: games/0ad: Updated for version 0.0.17.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 games/0ad/0ad.SlackBuild           | 18 ++++++++++++++----
 games/0ad/0ad.info                 |  8 ++++----
 games/0ad/README                   |  2 ++
 games/0ad/disable-root-check.patch | 16 ++++++++++++++++
 4 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 games/0ad/disable-root-check.patch

(limited to 'games')

diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild
index 7034882db2..5c316e259e 100644
--- a/games/0ad/0ad.SlackBuild
+++ b/games/0ad/0ad.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=0ad
-VERSION=${VERSION:-0.0.13}
+VERSION=${VERSION:-0.0.17}
 RELEASE=${RELEASE:-alpha}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -78,21 +78,29 @@ export LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}"
 # Fix boost names
 sed -i 's/-mt//g' build/premake/extern_libs4.lua
 
+# build/workspaces/update-workspaces.sh
+#   have a root check, let's disable it.
+patch -p1 < $CWD/disable-root-check.patch
+
 build/workspaces/update-workspaces.sh \
   --bindir=/usr/games \
   --datadir=/usr/share/games/0ad \
   --libdir=/usr/lib${LIBDIRSUFFIX}/0ad \
   --${ATLAS:-disable}-atlas
 
-  # --with-system-enet		enet in repo is too old
-  # --with-system-mozjs185	js in repo is too old
+  # --with-system-mozjs24 - js in repo is too old
 
 make CONFIG=Release -C build/workspaces/gcc
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/0ad
-cp binaries/system/*so* $PKG/usr/lib${LIBDIRSUFFIX}/0ad
+cp binaries/system/*.so* $PKG/usr/lib${LIBDIRSUFFIX}/0ad
 chmod 0755 $PKG/usr/lib${LIBDIRSUFFIX}/0ad/*
 
+# install additional data - l10n, etc.
+mkdir -p $PKG/usr/share/games
+cp -r binaries/data $PKG/usr/share/games/0ad
+chmod 0755 $PKG/usr/share/games/0ad
+
 install -Dm 0755 binaries/system/pyrogenesis $PKG/usr/games/pyrogenesis
 
 [ -e binaries/system/ActorEditor ] && \
@@ -111,6 +119,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE.txt README.txt license_dbghelp.txt license_gpl-2.0.txt license_lgpl-2.1.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
+cp binaries/system/readme.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION/README-options.txt
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info
index 14b0cb4ab7..a487ed6b29 100644
--- a/games/0ad/0ad.info
+++ b/games/0ad/0ad.info
@@ -1,10 +1,10 @@
 PRGNAM="0ad"
-VERSION="0.0.13"
+VERSION="0.0.17"
 HOMEPAGE="http://www.wildfiregames.com/0ad/"
-DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.13-alpha-unix-build.tar.xz"
-MD5SUM="3075c982c4af41a3586b6b6ef637d2c4"
+DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.17-alpha-unix-build.tar.xz"
+MD5SUM="c59990a355060e01174919ae444ad7c2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="0ad-data OpenAL"
+REQUIRES="0ad-data OpenAL enet gloox"
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
diff --git a/games/0ad/README b/games/0ad/README
index 1f7344ab01..622e0e3d1d 100644
--- a/games/0ad/README
+++ b/games/0ad/README
@@ -1,5 +1,7 @@
 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
 real-time strategy (RTS) game of ancient warfare.
 
+Optional: SDL2
+
 To include the Atlas editor, which requires wxPython:
     ATLAS=enable ./0ad.SlackBuild
diff --git a/games/0ad/disable-root-check.patch b/games/0ad/disable-root-check.patch
new file mode 100644
index 0000000000..e019c0f84e
--- /dev/null
+++ b/games/0ad/disable-root-check.patch
@@ -0,0 +1,16 @@
+--- a/build/workspaces/update-workspaces.sh
++++ b/build/workspaces/update-workspaces.sh
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ 
+-if [ "$(id -u)" = "0" ]; then
+-   echo "Running as root will mess up file permissions. Aborting ..." 1>&2
+-   exit 1
+-fi
++#if [ "$(id -u)" = "0" ]; then
++#   echo "Running as root will mess up file permissions. Aborting ..." 1>&2
++#   exit 1
++#fi
+ 
+ die()
+ {
-- 
cgit v1.2.3