[SCM] projectm/master: Refresh patch

[mak at users.alioth.debian.org]

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

    Refresh patch

diff --git a/debian/patches/01_fix-gcc6-build.patch b/debian/patches/01_fix-gcc6-build.patch
index 788adde..b702ea5 100644
--- a/debian/patches/01_fix-gcc6-build.patch
+++ b/debian/patches/01_fix-gcc6-build.patch
@@ -4,24 +4,21 @@ 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);
+@@ -63,8 +63,7 @@
  
  #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
+ #ifdef WIN32
 --- 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
+@@ -1406,7 +1406,7 @@
    PerFrameEqn * per_frame_eqn;
    GenExpr * gen_expr;
  
@@ -30,7 +27,7 @@ index fb14e6f..8dde420 100755
      return NULL;
    if (param_string == NULL)
      return NULL;
-@@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_eqn(std::istream &  fs, MilkdropPreset *
+@@ -1561,7 +1561,7 @@
  
    if (preset == NULL)
      return NULL;
@@ -39,7 +36,7 @@ index fb14e6f..8dde420 100755
      return NULL;
  
    if ((token = parseToken(fs, name)) != tEq)
-@@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token, std::istream &  fs, MilkdropPreset * p
+@@ -1875,7 +1875,7 @@
    /* Null argument checks */
    if (preset == NULL)
      return PROJECTM_FAILURE;
@@ -48,7 +45,7 @@ index fb14e6f..8dde420 100755
      return PROJECTM_FAILURE;
    if (token == NULL)
      return PROJECTM_FAILURE;
-@@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std::istream &  fs, MilkdropPreset * preset
+@@ -2166,7 +2166,7 @@
  
    if (token == NULL)
      return PROJECTM_FAILURE;
@@ -57,7 +54,7 @@ index fb14e6f..8dde420 100755
      return PROJECTM_FAILURE;
    if (preset == NULL)
      return PROJECTM_FAILURE;
-@@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, std::istream &  fs, MilkdropPreset * prese
+@@ -2348,7 +2348,7 @@
    if (token == NULL)
  
      return PROJECTM_FAILURE;

-- 
projectm packaging