summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2018-06-27 23:26:00 +0200
committer Matteo Bernardini2021-02-20 20:34:25 +0100
commit8bd329b09fad63feb88682fa728037cb4fd25f85 (patch)
tree1d546c5e8edc1606ce0680283208f19e73012594
parent77c0b44bbfd192ed8977df6dcfe55d5defeab350 (diff)
downloadslackbuilds-warmux.tar.gz
games/warmux: Patch for gcc >= 6.x.warmux
Disable fribidi (incompatible with the newer version) Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--games/warmux/patches/return-null.patch11
-rw-r--r--games/warmux/warmux.SlackBuild5
2 files changed, 15 insertions, 1 deletions
diff --git a/games/warmux/patches/return-null.patch b/games/warmux/patches/return-null.patch
new file mode 100644
index 0000000000..851dfcbd16
--- /dev/null
+++ b/games/warmux/patches/return-null.patch
@@ -0,0 +1,11 @@
+--- src/interface/weapon_menu.cpp.orig 2016-05-09 15:22:36.895266463 +0200
++++ src/interface/weapon_menu.cpp 2016-05-09 15:21:38.518476191 +0200
+@@ -391,7 +391,7 @@
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+ if (!show)
+- return false;
++ return NULL;
+ const std::vector<PolygonItem *>& items = poly->GetItem();
+ WeaponMenuItem * tmp;
+ Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
diff --git a/games/warmux/warmux.SlackBuild b/games/warmux/warmux.SlackBuild
index 20cd3cd3a5..1c6d7ff6c7 100644
--- a/games/warmux/warmux.SlackBuild
+++ b/games/warmux/warmux.SlackBuild
@@ -80,6 +80,9 @@ patch -p1 < $CWD/patches/include-zlib.patch
sed -i "s|SDLNet_Read32(buffer)|SDLNet_Read32(const_cast<char*>(buffer))|" \
lib/warmux/action/action.cpp
+# Fix for gcc-6.x
+patch -p0 < $CWD/patches/return-null.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -90,7 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--program-prefix="" \
--program-suffix="" \
- --enable-fribidi \
+ --disable-fribidi \
--enable-servers \
--build=$ARCH-slackware-linux