Hello community, here is the log from the commit of package projectM for openSUSE:Factory checked in at 2016-05-31 12:09:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/projectM (Old) and /work/SRC/openSUSE:Factory/.projectM.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "projectM" Changes: -------- --- /work/SRC/openSUSE:Factory/projectM/projectM.changes 2014-12-16 14:50:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.projectM.new/projectM.changes 2016-05-31 12:09:14.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 23 19:30:03 UTC 2016 - antoine.belv...@laposte.net + +- Fix build with GCC6: + * Add projectM-2.1.0-fix-isnan-gcc6.patch + +------------------------------------------------------------------- New: ---- projectM-2.1.0-fix-isnan-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ projectM.spec ++++++ --- /var/tmp/diff_new_pack.BxhRi0/_old 2016-05-31 12:09:15.000000000 +0200 +++ /var/tmp/diff_new_pack.BxhRi0/_new 2016-05-31 12:09:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package projectM # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Url: http://projectm.sourceforge.net Source0: %{name}-%{version}.tar.bz2 Source1: FindGLEW.cmake +# PATCH-FIX-UPSTREAM projectM-2.1.0-fix-isnan-gcc6.patch -- fix build with GCC6 (patch from upstream development branch) +Patch0: projectM-2.1.0-fix-isnan-gcc6.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: ftgl-devel @@ -89,6 +91,7 @@ %prep %setup -q +%patch0 -p1 rm -r src/WinLibs # legal issues, see bnc#738417, we don't need that whole tree ++++++ projectM-2.1.0-fix-isnan-gcc6.patch ++++++ >From 92226e25192a69839b9ae3b66ea7173732c639b3 Mon Sep 17 00:00:00 2001 From: Hodorgasm <nsane...@gmail.com> Date: Thu, 12 May 2016 19:25:46 -0400 Subject: [PATCH] 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)' --- src/libprojectM/Common.hpp | 2 +- src/libprojectM/MilkdropPresetFactory/Parser.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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 #ifdef LINUX #include <cstdlib> -#define projectM_isnan isnan +#define projectM_isnan std::isnan #endif 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; -- 2.8.2
