[SCM] projectm/master: fix-gcc6-build.patch: Fix FTBFS with GCC 6 (Closes: #811831)

[mak at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b9cc53f5a01f2d4a9b1d53db285849d08a482d5b
Author: Matthias Klumpp <mak at debian.org>
Date:   Thu Jul 28 23:09:50 2016 +0200

    fix-gcc6-build.patch: Fix FTBFS with GCC 6 (Closes: #811831)

diff --git a/debian/patches/01_fix-gcc6-build.patch b/debian/patches/01_fix-gcc6-build.patch
new file mode 100644
index 0000000..788adde
--- /dev/null
+++ b/debian/patches/01_fix-gcc6-build.patch
@@ -0,0 +1,68 @@
+commit 92226e25192a69839b9ae3b66ea7173732c639b3
+Author: Hodorgasm <nsane457 at gmail.com>
+Date:   Thu May 12 19:25:46 2016 -0400
+
+    GCC-6 only makes 'isnan' available in 'std' namespace, and iostream classes are no longer implicitly convertible to void* so use the equivalent '(fs.fail())' instead of '(fs == NULL)'
+
+diff --git a/src/libprojectM/Common.hpp b/src/libprojectM/Common.hpp
+index 25ecafa..366802a 100755
+--- a/src/libprojectM/Common.hpp
++++ b/src/libprojectM/Common.hpp
+@@ -63,7 +63,7 @@ extern FILE *fmemopen(void *buf, size_t len, const char *pMode);
+ 
+ #ifdef LINUX
+ #include <cstdlib>
+-#define projectM_isnan isnan
++#define projectM_isnan std::isnan
+ #endif
+ 
+ #ifdef EMSCRIPTEN
+diff --git a/src/libprojectM/MilkdropPresetFactory/Parser.cpp b/src/libprojectM/MilkdropPresetFactory/Parser.cpp
+index fb14e6f..8dde420 100755
+--- a/src/libprojectM/MilkdropPresetFactory/Parser.cpp
++++ b/src/libprojectM/MilkdropPresetFactory/Parser.cpp
+@@ -1406,7 +1406,7 @@ PerFrameEqn * Parser::parse_implicit_per_frame_eqn(std::istream &  fs, char * pa
+   PerFrameEqn * per_frame_eqn;
+   GenExpr * gen_expr;
+ 
+-  if (fs == NULL)
++  if (fs.fail())
+     return NULL;
+   if (param_string == NULL)
+     return NULL;
+@@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_eqn(std::istream &  fs, MilkdropPreset *
+ 
+   if (preset == NULL)
+     return NULL;
+-  if (fs == NULL)
++  if (fs.fail())
+     return NULL;
+ 
+   if ((token = parseToken(fs, name)) != tEq)
+@@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token, std::istream &  fs, MilkdropPreset * p
+   /* Null argument checks */
+   if (preset == NULL)
+     return PROJECTM_FAILURE;
+-  if (fs == NULL)
++  if (fs.fail())
+     return PROJECTM_FAILURE;
+   if (token == NULL)
+     return PROJECTM_FAILURE;
+@@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std::istream &  fs, MilkdropPreset * preset
+ 
+   if (token == NULL)
+     return PROJECTM_FAILURE;
+-  if (fs == NULL)
++  if (fs.fail())
+     return PROJECTM_FAILURE;
+   if (preset == NULL)
+     return PROJECTM_FAILURE;
+@@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, std::istream &  fs, MilkdropPreset * prese
+   if (token == NULL)
+ 
+     return PROJECTM_FAILURE;
+-  if (fs == NULL)
++  if (fs.fail())
+     return PROJECTM_FAILURE;
+   if (preset == NULL)
+     return PROJECTM_FAILURE;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fd5e533
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix-gcc6-build.patch

-- 
projectm packaging