games/warmux: Patch for gcc >= 6.x.

Disable fribidi (incompatible with the newer version)

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
Matteo Bernardini 2018-06-27 23:26:00 +02:00 committed by Robby Workman
parent 88fdc0d2e3
commit 7f5ba8ef3b
2 changed files with 15 additions and 1 deletions

View file

@ -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);

View file

@ -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