diff --git a/0013-Use-NULL-instead-of-0.patch b/0013-Use-NULL-instead-of-0.patch new file mode 100644 index 0000000..79a4c8d --- /dev/null +++ b/0013-Use-NULL-instead-of-0.patch @@ -0,0 +1,34 @@ +From 920601828a12a4802b8f5d4cb77ef913793c6b17 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Tue, 7 Feb 2017 23:49:32 +0100 +Subject: [PATCH 13/13] Use NULL instead of '\0' + +--- + src/3ds/SoStream.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/3ds/SoStream.cpp b/src/3ds/SoStream.cpp +index 1b5f96d..7f07a27 100644 +--- a/src/3ds/SoStream.cpp ++++ b/src/3ds/SoStream.cpp +@@ -176,7 +176,7 @@ do { \ + if (!gotNum) { setBadBit(); return FALSE; } \ + \ + char *ce; \ +- s = '\0'; \ ++ s = NULL; \ + _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \ + \ + if (ce != s) \ +@@ -273,7 +273,7 @@ do { \ + gotAll: \ + \ + char *ce; \ +- s = '\0'; \ ++ s = NULL; \ + double tempVal = _convertFunc_(buf, &ce); \ + \ + if (ce != s) \ +-- +2.9.3 + diff --git a/Coin3.spec b/Coin3.spec index 41866c3..dfe398e 100644 --- a/Coin3.spec +++ b/Coin3.spec @@ -1,5 +1,5 @@ # -# Copyright (c) 2010-2016 Ralf Corsepius, Ulm, Germany. +# Copyright (c) 2010-2017 Ralf Corsepius, Ulm, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,7 +13,7 @@ Summary: High-level 3D visualization library Name: Coin3 Version: 3.1.3 -Release: 18%{?dist} +Release: 19%{?dist} # https://bitbucket.org/Coin3D/coin/wiki/Home tells BSD, # but the tarball is GPLv2 @@ -41,6 +41,7 @@ Patch9: 0009-Convert-to-utf-8.patch Patch10: 0010-GCC-4.8.0-fixes.patch Patch11: 0011-Fix-SoCamera-manpage.patch Patch12: 0012-memhandler-initialization.patch +Patch13: 0013-Use-NULL-instead-of-0.patch BuildRequires: libGLU-devel BuildRequires: libXext-devel @@ -91,14 +92,7 @@ Development package for Coin3 %patch10 -p1 %patch11 -p1 %patch12 -p1 - -%if (0%{?fedora} > 20) && (0%{?fedora} < 24) -# freetype header chaos: -# Fedora <= 20 headers in /usr/include/freetype2/freetype -# Fedora 21,22,23 headers in /usr/include/freetype2 -# Fedora >= 24 headers in /usr/include/freetype2/freetype -sed -i -e 's,freetype/,,' src/glue/freetype.{h,cpp} -%endif +%patch13 -p1 # Update doxygen configuration doxygen -u docs/coin.doxygen.in @@ -217,6 +211,10 @@ fi %ghost %{_libdir}/pkgconfig/Coin.pc %changelog +* Wed Feb 08 2017 Ralf Corsépius - 3.1.3-19 +- Add 0013-Use-NULL-instead-of-0.patch (Fix F26FTBFS, GCC-7.0). +- Drop fedora < 24. + * Mon Sep 05 2016 Ralf Corsépius - 3.1.3-18 - BR: /usr/bin/perl (Fix F25FTBFS).