aboutsummaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorTim Dickson <dickson.tim@googlemail.com>2023-10-28 09:18:01 +0900
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-10-28 13:11:57 +0700
commit0ddc5133a4a5ee3879693f0c4b2e1181cd96a50f (patch)
tree9b8b496a1fa7a1d21a2225dc52d7a0c4e5fc55de /games
parentf3a9fab5804eb590135a97c420949ee26f6b2846 (diff)
games/0ad: Fix for newer fmt.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'games')
-rw-r--r--games/0ad/0ad.SlackBuild10
1 files changed, 8 insertions, 2 deletions
diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild
index 2350f00e5bfe..b6c52e7c6193 100644
--- a/games/0ad/0ad.SlackBuild
+++ b/games/0ad/0ad.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script for 0.A.D.
#
-# Copyright 2020-2022 Tim Dickson, Scotland
+# Copyright 2020-2023 Tim Dickson, Scotland
# Copyright 2016-2017 Reedych <reedych@ya.ru>
# Copyright 2010-2016 Erik W. Hanson, Minneapolis, MN, USA
# All rights reserved.
@@ -24,12 +24,14 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#build 3 adds patches for fmt >=v10
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=0ad
VERSION=${VERSION:-0.0.26}
RELEASE=${RELEASE:-alpha}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
TMP=${TMP:-/tmp/SBo}
@@ -91,6 +93,10 @@ export SDL2_CONFIG="/usr/bin/sdl2-config"
mkdir -p cargoh
export CARGO_HOME="$TMP/$PRGNAM-$VERSION-$RELEASE/cargoh"
+#add patches for fmt>9.1.0 ie. 10.1.1
+sed -i 's/, header.GetType()/, static_cast<int>(header.GetType())/g' source/network/NetMessage.cpp
+sed -i 's/, arrayType/, static_cast<int>(arrayType)/g' source/simulation2/serialization/BinarySerializer.cpp
+
# Fix boost names, include paths and remove isystem. commented stuff is fixed upstream already
sed -i 's|-mt||g' build/premake/extern_libs5.lua || exit 1
#sed -i 's|/usr/local/include|/usr/include|' build/premake/{extern_libs5.lua,premake5.lua} || exit 1