diff options
| author |   Matteo Bernardini | 2020-01-18 10:16:11 +0100 |
|---|---|---|
| committer | Matteo Bernardini | 2020-01-18 10:16:11 +0100 |
| commit | 54d3863f4487caf692625d6d85d083f03915b05a (patch) | |
| tree | 6e6ba1d4f953177ef295937086863b69130b4ba4 /games/warmux | |
| parent | e7c5997b9311a3ac31e986a3d4f525c9af840c89 (diff) | |
| download | slackbuilds-current-20200118.1.tar.gz | |
20200118.1 global branch merge.current-20200118.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'games/warmux')
| -rw-r--r-- | games/warmux/patches/return-null.patch | 11 | ||||
| -rw-r--r-- | games/warmux/warmux.SlackBuild | 5 |
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 |