[packages/warmux] - fix building with gcc6 - rel 9

[baggins]

commit 3de67ca07c8de7d1554f114fa33d07dbe7b590e2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Jul 14 09:44:30 2017 +0900

    - fix building with gcc6
    - rel 9

 gcc6.patch  | 11 +++++++++++
 warmux.spec |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/warmux.spec b/warmux.spec
index bf3174f..57a8a44 100644
--- a/warmux.spec
+++ b/warmux.spec
@@ -3,7 +3,7 @@ Summary(de.UTF-8):	Ein kostenloser Team17 Worms-Klon
 Summary(pl.UTF-8):	Wolnodostępny klon Worms z Team17
 Name:		warmux
 Version:	11.04.1
-Release:	8
+Release:	9
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	http://download.gna.org/warmux/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@ Patch0:		desktop.patch
 Patch1:		optflags.patch
 Patch2:		%{name}-libpng15.patch
 Patch3:		%{name}-gcc47.patch
+Patch4:		gcc6.patch
 URL:		http://www.warmux.org/
 BuildRequires:	SDL-devel >= 1.2.6
 BuildRequires:	SDL_gfx-devel >= 2.0.13
@@ -58,6 +59,7 @@ warmux data files
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # disable building unsupported locales
 %{__sed} -i -e 's|cpf||g;s|ua||g' po/LINGUAS
diff --git a/gcc6.patch b/gcc6.patch
new file mode 100644
index 0000000..2964cc8
--- /dev/null
+++ b/gcc6.patch
@@ -0,0 +1,11 @@
+--- warmux-11.04/src/interface/weapon_menu.cpp~	2011-04-29 04:03:06.000000000 +0900
++++ warmux-11.04/src/interface/weapon_menu.cpp	2017-07-14 09:13:34.104952051 +0900
+@@ -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);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/warmux.git/commitdiff/3de67ca07c8de7d1554f114fa33d07dbe7b590e2