[pkgsrc/trunk]: pkgsrc gcc6 build fix

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e3ce835f2ab2
branches:  trunk
changeset: 349809:e3ce835f2ab2
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Jul 16 04:02:13 2016 +0000

description:
gcc6 build fix

diffstat:

 math/z3/distinfo                                                |   4 +-
 math/z3/patches/patch-src_util_debug.cpp                        |  15 +++++++
 math/z3/patches/patch-src_util_mpz.cpp                          |  15 +++++++
 misc/kdepim-runtime4/distinfo                                   |   3 +-
 misc/kdepim-runtime4/patches/patch-plugins_tests_CMakeLists.txt |  21 ++++++++++
 5 files changed, 56 insertions(+), 2 deletions(-)

diffs (90 lines):

diff -r 70df754ee0d8 -r e3ce835f2ab2 math/z3/distinfo
--- a/math/z3/distinfo  Sat Jul 16 03:49:56 2016 +0000
+++ b/math/z3/distinfo  Sat Jul 16 04:02:13 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2015/11/24 05:45:58 dholland Exp $
+$NetBSD: distinfo,v 1.2 2016/07/16 04:02:13 markd Exp $
 
 SHA1 (z3-4.4.1.tar.gz) = 60094acaa53459ec694899aca9f17aa830875610
 RMD160 (z3-4.4.1.tar.gz) = 2c891e115a5d097dbbda53c1b322c65bc5b679f7
@@ -9,3 +9,5 @@
 SHA512 (z3-jumbo-patch-20151123.gz) = c23d363bf53b40c3ccbfc10d03ef3621d6abfa9cf86375e7e853e85a0971db70992173df04df1a895e16d4a9b533e955953455a7533889963d2920a4b48d0056
 Size (z3-jumbo-patch-20151123.gz) = 4395 bytes
 SHA1 (patch-scripts_mk__util.py) = 1ab32d86649c5b3e83e9b20632d21018a1e22617
+SHA1 (patch-src_util_debug.cpp) = 607ea4e078884920a3034cf00779dce25fc8e623
+SHA1 (patch-src_util_mpz.cpp) = 69988bec1472df14209ae0dbfdc8a94c9e71cc82
diff -r 70df754ee0d8 -r e3ce835f2ab2 math/z3/patches/patch-src_util_debug.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/z3/patches/patch-src_util_debug.cpp  Sat Jul 16 04:02:13 2016 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_util_debug.cpp,v 1.1 2016/07/16 04:02:13 markd Exp $
+
+gcc6 fix
+
+--- src/util/debug.cpp.orig    2015-10-05 12:07:19.000000000 +0000
++++ src/util/debug.cpp
+@@ -76,7 +76,7 @@ void invoke_gdb() {
+     for (;;) {
+         std::cerr << "(C)ontinue, (A)bort, (S)top, (T)hrow exception, Invoke (G)DB\n";
+         char result;
+-        bool ok = (std::cin >> result);
++        bool ok = bool(std::cin >> result);
+         if (!ok) exit(ERR_INTERNAL_FATAL); // happens if std::cin is eof or unattached.
+         switch(result) {
+         case 'C':
diff -r 70df754ee0d8 -r e3ce835f2ab2 math/z3/patches/patch-src_util_mpz.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/z3/patches/patch-src_util_mpz.cpp    Sat Jul 16 04:02:13 2016 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_util_mpz.cpp,v 1.1 2016/07/16 04:02:13 markd Exp $
+
+gcc6 fix
+
+--- src/util/mpz.cpp.orig      2015-10-05 12:07:19.000000000 +0000
++++ src/util/mpz.cpp
+@@ -134,7 +134,7 @@ mpz_manager<SYNCH>::mpz_manager():
+ #endif
+     
+     mpz one(1);
+-    set(m_two64, UINT64_MAX);
++    set(m_two64, (uint64)UINT64_MAX);
+     add(m_two64, one, m_two64);
+ }
+ 
diff -r 70df754ee0d8 -r e3ce835f2ab2 misc/kdepim-runtime4/distinfo
--- a/misc/kdepim-runtime4/distinfo     Sat Jul 16 03:49:56 2016 +0000
+++ b/misc/kdepim-runtime4/distinfo     Sat Jul 16 04:02:13 2016 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2016/01/10 19:34:35 markd Exp $
+$NetBSD: distinfo,v 1.17 2016/07/16 04:05:53 markd Exp $
 
 SHA1 (kdepim-runtime-4.14.10.tar.xz) = f5b1e44f1d10d29bad308b3fd90a48b34da7493c
 RMD160 (kdepim-runtime-4.14.10.tar.xz) = a03ab7a8bdb65741d35fde271e7634bc8570beea
 SHA512 (kdepim-runtime-4.14.10.tar.xz) = 599cf08ee7c4bfcc2dcde7d146c5c889663a463e59e4e4773e6b1cee909d02914fce414afe473a127d484b5daa2fa9332dcef8092c3b953cdbebc87663e70577
 Size (kdepim-runtime-4.14.10.tar.xz) = 1175432 bytes
+SHA1 (patch-plugins_tests_CMakeLists.txt) = 8e32ae46a539b79fddd40f9c02ab242fef9a66b0
diff -r 70df754ee0d8 -r e3ce835f2ab2 misc/kdepim-runtime4/patches/patch-plugins_tests_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/kdepim-runtime4/patches/patch-plugins_tests_CMakeLists.txt   Sat Jul 16 04:02:13 2016 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-plugins_tests_CMakeLists.txt,v 1.1 2016/07/16 04:05:54 markd Exp $
+
+gcc6 wont compile this test so disable
+
+--- plugins/tests/CMakeLists.txt.orig  2015-06-25 20:42:43.000000000 +0000
++++ plugins/tests/CMakeLists.txt
+@@ -22,10 +22,10 @@ endmacro()
+ add_akonadiplugin_test(mailserializertest.cpp "${KDEPIMLIBS_KMIME_LIBS}" "")
+ add_akonadiplugin_test(mailserializerplugintest.cpp "${KDEPIMLIBS_KMIME_LIBS}" "")
+ 
+-add_akonadiplugin_test(kcalcoreserializertest.cpp "${KDEPIMLIBS_KCALCORE_LIBS}" "")
++#add_akonadiplugin_test(kcalcoreserializertest.cpp "${KDEPIMLIBS_KCALCORE_LIBS}" "")
+ 
+ add_akonadiplugin_test(addresseeserializertest.cpp "${KDEPIMLIBS_KABC_LIBS};${KDEPIMLIBS_AKONADI_KABC_LIBS}" "../akonadi_serializer_addressee.cpp")
+ 
+-if (KDEPIMLIBS_KCAL_LIBS)
+-  add_akonadiplugin_test(kcalserializertest.cpp "${KDEPIMLIBS_KCAL_LIBS}" "")
+-endif ()
++#if (KDEPIMLIBS_KCAL_LIBS)
++#  add_akonadiplugin_test(kcalserializertest.cpp "${KDEPIMLIBS_KCAL_LIBS}" "")
++#endif ()