[scorched3d] 27/39: Add gcc-6-ftbfs.patch and fix FTBFS with GCC-6.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository scorched3d.

commit 963a495089deaefa22665d53ae9ca5c1c8a14c6e
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jul 16 00:37:50 2016 +0200

    Add gcc-6-ftbfs.patch and fix FTBFS with GCC-6.
    
    Closes: #811647
    Thanks: Martin Michlmayr for the report.
---
 debian/patches/gcc-6-ftbfs.patch | 21 +++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/gcc-6-ftbfs.patch b/debian/patches/gcc-6-ftbfs.patch
new file mode 100644
index 0000000..353f73f
--- /dev/null
+++ b/debian/patches/gcc-6-ftbfs.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 16 Jul 2016 00:37:22 +0200
+Subject: gcc-6 ftbfs
+
+---
+ src/common/weapons/AccessoryStore.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/weapons/AccessoryStore.cpp b/src/common/weapons/AccessoryStore.cpp
+index 07ec065..5424101 100644
+--- a/src/common/weapons/AccessoryStore.cpp
++++ b/src/common/weapons/AccessoryStore.cpp
+@@ -156,7 +156,7 @@ AccessoryPart *AccessoryStore::createAccessoryPart(
+ 	Accessory *parent, XMLNode *currentNode)
+ {
+ 	XMLNode *typeNode = 0;
+-	if (!currentNode->getNamedParameter("type", typeNode)) return false;
++	if (!currentNode->getNamedParameter("type", typeNode)) return 0;
+ 
+ 	AccessoryPart *accessoryPart = 
+ 		AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this);
diff --git a/debian/patches/series b/debian/patches/series
index 84b7bc6..ad4a67f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0006-fix-freetype-includes.patch
 0007-spelling.patch
 wx3.0-compat.patch
+gcc-6-ftbfs.patch

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