CVS commit: pkgsrc/x11/qt4-libs

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri May 26 12:09:11 UTC 2017

Modified Files:
        pkgsrc/x11/qt4-libs: distinfo
        pkgsrc/x11/qt4-libs/patches: patch-aq
Added Files:
        pkgsrc/x11/qt4-libs/patches: patch-src_3rdparty_sqlite_sqlite3.c

Log Message:
SunOS and GCC >=6.x fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/x11/qt4-libs/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/qt4-libs/patches/patch-aq
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_sqlite_sqlite3.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt4-libs/distinfo
diff -u pkgsrc/x11/qt4-libs/distinfo:1.112 pkgsrc/x11/qt4-libs/distinfo:1.113
--- pkgsrc/x11/qt4-libs/distinfo:1.112  Fri Dec 16 10:21:00 2016
+++ pkgsrc/x11/qt4-libs/distinfo        Fri May 26 12:09:11 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.112 2016/12/16 10:21:00 joerg Exp $
+$NetBSD: distinfo,v 1.113 2017/05/26 12:09:11 jperkin Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
 RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
@@ -20,7 +20,7 @@ SHA1 (patch-am) = 018a5982834737ca8ceb64
 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
 SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91
 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
-SHA1 (patch-aq) = 3f2755b26f31536cbda36cbbc1795bcd882c6b59
+SHA1 (patch-aq) = b861cbfacc5f91339fc5f56cd7eeaad90d25c5d9
 SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
 SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
@@ -47,6 +47,7 @@ SHA1 (patch-src_3rdparty_javascriptcore_
 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_RefCountedLeakCounter.h) = 3b70ecb3a95944a3dd4a26c7b5c53e44aa89de1a
 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h) = f23437f6e4b47f999d4fc2c576c5e7a63446b9da
 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h) = b625c9edd3b3febc1338240549c32fb50ed0a5f4
+SHA1 (patch-src_3rdparty_sqlite_sqlite3.c) = 29685d814c8b2b0514987340a09871c719fc4a3f
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = c7c9c39b11007e7ec3884874a38d000e3238bf64
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.h) = bf748efe8d150fe636cbc5b20dcd9a7d4945c8c9

Index: pkgsrc/x11/qt4-libs/patches/patch-aq
diff -u pkgsrc/x11/qt4-libs/patches/patch-aq:1.17 pkgsrc/x11/qt4-libs/patches/patch-aq:1.18
--- pkgsrc/x11/qt4-libs/patches/patch-aq:1.17   Sat Jul 18 11:11:53 2015
+++ pkgsrc/x11/qt4-libs/patches/patch-aq        Fri May 26 12:09:11 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.17 2015/07/18 11:11:53 adam Exp $
+$NetBSD: patch-aq,v 1.18 2017/05/26 12:09:11 jperkin Exp $
 
 --- configure.orig     2015-05-07 14:14:56.000000000 +0000
 +++ configure
@@ -92,6 +92,15 @@ $NetBSD: patch-aq,v 1.17 2015/07/18 11:1
                ;;
            3.4*)
                canBuildQtXmlPatterns="no"
+@@ -7734,7 +7747,7 @@ case "$XPLATFORM" in
+     *-g++*)
+       # Check gcc's version
+       case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+-          5*|4*|3.4*)
++          [4-9]*|3.4*)
+               ;;
+             3.3*)
+                 canBuildWebKit="no"
 @@ -7981,7 +7994,7 @@ fi
  # env. variable.
  if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ]; then

Added files:

Index: pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_sqlite_sqlite3.c
diff -u /dev/null pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_sqlite_sqlite3.c:1.1
--- /dev/null   Fri May 26 12:09:11 2017
+++ pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_sqlite_sqlite3.c     Fri May 26 12:09:11 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_sqlite_sqlite3.c,v 1.1 2017/05/26 12:09:11 jperkin Exp $
+
+Only define _XOPEN_SOURCE on SunOS if not already using C99 or above.
+
+--- src/3rdparty/sqlite/sqlite3.c.orig 2015-05-07 14:14:48.000000000 +0000
++++ src/3rdparty/sqlite/sqlite3.c
+@@ -424,7 +424,7 @@
+ **
+ ** See also ticket #2741.
+ */
+-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && SQLITE_THREADSAFE && !defined(VXWORKS)
++#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && SQLITE_THREADSAFE && !defined(VXWORKS) && (!defined(__sun) || __STDC_VERSION__ - 0 < 199901L)
+ #  define _XOPEN_SOURCE 500  /* Needed to enable pthread recursive mutexes */
+ #endif
+