[warmux] 01/03: Fix FTBFS with GCC 6. (Closes: #811616)

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository warmux.

commit 8301b97f3e66b17f4a8bff4f28906714cb8213dd
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Jul 1 17:46:26 2016 +0200

    Fix FTBFS with GCC 6. (Closes: #811616)
---
 debian/changelog                        |  1 +
 debian/patches/10_fix_build_gcc60.patch | 11 +++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 230aa26..f2a5052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 warmux (1:11.04.1+repack2-2) UNRELEASED; urgency=medium
 
   * Drop Debian menu entry.
+  * Fix FTBFS with GCC 6. (Closes: #811616)
 
  -- Felix Geyer <fgeyer at debian.org>  Fri, 04 Sep 2015 17:23:23 +0200
 
diff --git a/debian/patches/10_fix_build_gcc60.patch b/debian/patches/10_fix_build_gcc60.patch
new file mode 100644
index 0000000..9760eab
--- /dev/null
+++ b/debian/patches/10_fix_build_gcc60.patch
@@ -0,0 +1,11 @@
+--- a/src/interface/weapon_menu.cpp
++++ b/src/interface/weapon_menu.cpp
+@@ -391,7 +391,7 @@
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+   if (!show)
+-    return false;
++    return 0;
+   const std::vector<PolygonItem *>& items = poly->GetItem();
+   WeaponMenuItem * tmp;
+   Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
diff --git a/debian/patches/series b/debian/patches/series
index 149b115..e900212 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 07_fix_build_gcc47.patch
 08_fix_dirlisting.patch
 09_translation_fixes_de.patch
+10_fix_build_gcc60.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/warmux.git