[pkgsrc/trunk]: pkgsrc gcc6 build fix

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/70df754ee0d8
branches:  trunk
changeset: 349808:70df754ee0d8
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Jul 16 03:49:56 2016 +0000

description:
gcc6 build fix

diffstat:

 graphics/opencv/distinfo                                   |   3 +-
 graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake |  15 ++++++++++++++
 math/qalculate/distinfo                                    |   3 +-
 math/qalculate/patches/patch-libqalculate_MathStructure.cc |  15 ++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diffs (69 lines):

diff -r 1ff72b874f24 -r 70df754ee0d8 graphics/opencv/distinfo
--- a/graphics/opencv/distinfo  Sat Jul 16 03:36:51 2016 +0000
+++ b/graphics/opencv/distinfo  Sat Jul 16 03:49:56 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2016/03/01 20:14:24 joerg Exp $
+$NetBSD: distinfo,v 1.36 2016/07/16 03:49:56 markd Exp $
 
 SHA1 (opencv-3.1.0.zip) = 8c932b68fe2e1575e88dde759ab1ed1d53d6f41b
 RMD160 (opencv-3.1.0.zip) = d7a811c67cfb16243470822150760252d5770165
@@ -10,6 +10,7 @@
 SHA1 (patch-apps_traincascade_CMakeLists.txt) = 7114cc4c2057e12dc8e47bc61334cb8e175987eb
 SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
 SHA1 (patch-cmake_OpenCVModule.cmake) = 7667f19f3e9c6ff757d92a6a49e7c3430c6c080d
+SHA1 (patch-cmake_OpenCVPCHSupport.cmake) = 237fa2d000c402c55dfdbec3e27c89cffdfde8b1
 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
 SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = c64ef8872c120db0ab92582496235858eec9bf92
diff -r 1ff72b874f24 -r 70df754ee0d8 graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake        Sat Jul 16 03:49:56 2016 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmake_OpenCVPCHSupport.cmake,v 1.1 2016/07/16 03:49:57 markd Exp $
+
+gcc6 trips up ".../cstdlib:75:25: fatal error: stdlib.h: No such file or directory" because of -isystem
+
+--- cmake/OpenCVPCHSupport.cmake.orig  2015-12-18 15:02:16.000000000 +0000
++++ cmake/OpenCVPCHSupport.cmake
+@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+         ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+         OUTPUT_VARIABLE gcc_compiler_version)
+     #MESSAGE("GCC Version: ${gcc_compiler_version}")
+-    IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
++    IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
+         SET(PCHSupport_FOUND TRUE)
+     ENDIF()
+ 
diff -r 1ff72b874f24 -r 70df754ee0d8 math/qalculate/distinfo
--- a/math/qalculate/distinfo   Sat Jul 16 03:36:51 2016 +0000
+++ b/math/qalculate/distinfo   Sat Jul 16 03:49:56 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2013/12/15 19:41:23 joerg Exp $
+$NetBSD: distinfo,v 1.22 2016/07/16 03:56:40 markd Exp $
 
 SHA1 (libqalculate-0.9.7.tar.gz) = c15f7f3a97995decf62cc964956fc1e374ecd78c
 RMD160 (libqalculate-0.9.7.tar.gz) = cc9e198769bea9731f92d2f3836875c83f715674
@@ -9,3 +9,4 @@
 SHA1 (patch-ae) = 7c9685c578a848cb4e9c55756110d891b9254f2b
 SHA1 (patch-af) = 3bab134f0ca10ecf91252e8211982be767e594e5
 SHA1 (patch-libqalculate_Makefile.in) = 61113a55b69142c6cffa6a9ce754ba4367635275
+SHA1 (patch-libqalculate_MathStructure.cc) = 4c2a54f1b8ea84f1fd2c0f43a4ec384a2d69551f
diff -r 1ff72b874f24 -r 70df754ee0d8 math/qalculate/patches/patch-libqalculate_MathStructure.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/qalculate/patches/patch-libqalculate_MathStructure.cc        Sat Jul 16 03:49:56 2016 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-libqalculate_MathStructure.cc,v 1.1 2016/07/16 03:56:40 markd Exp $
+
+Build with gcc6 - from redhat
+
+--- libqalculate/MathStructure.cc.orig 2010-01-05 15:15:27.000000000 +0000
++++ libqalculate/MathStructure.cc
+@@ -7163,7 +7163,7 @@ bool sr_gcd(const MathStructure &m1, con
+       c.polynomialContent(xvar, cont_c, eo);
+       d.polynomialContent(xvar, cont_d, eo);
+       MathStructure gamma;
+-      MathStructure::gcd(cont_c, cont_d, gamma, eo, false);
++      MathStructure::gcd(cont_c, cont_d, gamma, eo, NULL);
+       if(ddeg.isZero()) {
+               mgcd = gamma;
+               return true;