From 30778e822d6ef153cd8936acaa45deeeb8f5374a Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Tue, 31 Dec 2019 15:55:40 +0100
Subject: 20191231.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 games/0ad/0ad.SlackBuild | 20 +++++++++++++-------
 games/0ad/0ad.info       |  8 ++++----
 2 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'games/0ad')

diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild
index 524b16e406..18b7983b5d 100644
--- a/games/0ad/0ad.SlackBuild
+++ b/games/0ad/0ad.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=0ad
-VERSION=${VERSION:-0.0.21}
+VERSION=${VERSION:-0.0.23}
 RELEASE=${RELEASE:-alpha}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -71,26 +71,32 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+unset CPPFLAGS
+
 export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS -fpermissive"
-# and yes, it's really necessary to set CPPFLAGS like this :(
-export CPPFLAGS="$SLKCFLAGS -fpermissive"
+export CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1"
 export LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}"
+export SDL2_CONFIG="/usr/bin/sdl2-config"
 
-# Fix boost names
-sed -i 's/-mt//g' build/premake/extern_libs4.lua
+# Fix boost names, include paths and remove isystem
+sed -i 's|-mt||g' build/premake/extern_libs5.lua
+sed -i 's|/usr/local/include|/usr/include|' build/premake/{extern_libs5.lua,premake5.lua}
+sed -i 's|-isystem |-I|' build/premake/premake5/{src/tools/gcc.lua,tests/tools/test_gcc.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 \
+  --without-pch \
   --bindir=/usr/games \
   --datadir=/usr/share/games/0ad \
   --libdir=/usr/lib${LIBDIRSUFFIX}/0ad \
   --${ATLAS:-disable}-atlas
 
-make CONFIG=Release -C build/workspaces/gcc
+sed -i 's|-isystem |-I|g' build/workspaces/gcc/*.make
+
+verbose=1 make CONFIG=Release -C build/workspaces/gcc
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/0ad
 cp binaries/system/*.so* $PKG/usr/lib${LIBDIRSUFFIX}/0ad
diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info
index 97bc6ce2ac..6acd4190da 100644
--- a/games/0ad/0ad.info
+++ b/games/0ad/0ad.info
@@ -1,10 +1,10 @@
 PRGNAM="0ad"
-VERSION="0.0.21"
+VERSION="0.0.23"
 HOMEPAGE="https://play0ad.com/"
-DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.21-alpha-unix-build.tar.xz"
-MD5SUM="095eade8c9b3deaf25d0d7fa423ff860"
+DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.23-alpha-unix-build.tar.xz"
+MD5SUM="062efa3857b9ad08243487968adafb7b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="0ad-data OpenAL enet gloox miniupnpc SDL2"
+REQUIRES="0ad-data OpenAL enet gloox libsodium miniupnpc SDL2"
 MAINTAINER="Reedych"
 EMAIL="reedych@ya.ru"
-- 
cgit v1.2.3