CVS commit: pkgsrc/x11/qt5-qtbase

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Apr 28 12:46:31 UTC 2019

Modified Files:
        pkgsrc/x11/qt5-qtbase: Makefile Makefile.common distinfo
Added Files:
        pkgsrc/x11/qt5-qtbase/patches: patch-src_corelib_thread_qmutex__p.h

Log Message:
qt5-qtbase: avoid using semaphores as mutexes on netbsd.
they're quite constrained: the max number of semaphores is limited.

bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/x11/qt5-qtbase/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/qt5-qtbase/Makefile.common
cvs rdiff -u -r1.48 -r1.49 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_thread_qmutex__p.h

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

Modified files:

Index: pkgsrc/x11/qt5-qtbase/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.76 pkgsrc/x11/qt5-qtbase/Makefile:1.77
--- pkgsrc/x11/qt5-qtbase/Makefile:1.76 Thu Apr 25 19:43:15 2019
+++ pkgsrc/x11/qt5-qtbase/Makefile      Sun Apr 28 12:46:31 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.76 2019/04/25 19:43:15 adam Exp $
+# $NetBSD: Makefile,v 1.77 2019/04/28 12:46:31 maya Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       C++ X GUI toolkit
 
 .include "../../x11/qt5-qtbase/Makefile.common"

Index: pkgsrc/x11/qt5-qtbase/Makefile.common
diff -u pkgsrc/x11/qt5-qtbase/Makefile.common:1.30 pkgsrc/x11/qt5-qtbase/Makefile.common:1.31
--- pkgsrc/x11/qt5-qtbase/Makefile.common:1.30  Tue Mar 26 11:14:16 2019
+++ pkgsrc/x11/qt5-qtbase/Makefile.common       Sun Apr 28 12:46:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2019/03/26 11:14:16 adam Exp $
+# $NetBSD: Makefile.common,v 1.31 2019/04/28 12:46:31 maya Exp $
 # used by x11/qt5-mysql/Makefile
 # used by x11/qt5-odbc/Makefile
 # used by x11/qt5-psql/Makefile
@@ -30,7 +30,7 @@
 .include "options.mk"
 
 .include "../../mk/dlopen.buildlink3.mk"
-BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 
 USE_LANGUAGES=         c c++11
 USE_TOOLS+=            gmake perl:build pkg-config

Index: pkgsrc/x11/qt5-qtbase/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.48 pkgsrc/x11/qt5-qtbase/distinfo:1.49
--- pkgsrc/x11/qt5-qtbase/distinfo:1.48 Thu Apr 25 19:43:15 2019
+++ pkgsrc/x11/qt5-qtbase/distinfo      Sun Apr 28 12:46:31 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2019/04/25 19:43:15 adam Exp $
+$NetBSD: distinfo,v 1.49 2019/04/28 12:46:31 maya Exp $
 
 SHA1 (qtbase-everywhere-src-5.12.3.tar.xz) = dbe6ed4779998f757473a727b7ff3300c7d31155
 RMD160 (qtbase-everywhere-src-5.12.3.tar.xz) = aebc6473c64d287fe7ea861c449b094b823225c3
@@ -16,6 +16,7 @@ SHA1 (patch-src_corelib_global_qconfig-b
 SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc
 SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938
 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
+SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec
 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd
 SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5
 SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f

Added files:

Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_thread_qmutex__p.h
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_thread_qmutex__p.h:1.1
--- /dev/null   Sun Apr 28 12:46:32 2019
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_thread_qmutex__p.h  Sun Apr 28 12:46:31 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_corelib_thread_qmutex__p.h,v 1.1 2019/04/28 12:46:31 maya Exp $
+
+Avoid using semaphores on netbsd. they're flimsy and sem_init fails
+if you use too many semaphores.
+
+--- src/corelib/thread/qmutex_p.h.orig 2019-04-09 09:51:26.000000000 +0000
++++ src/corelib/thread/qmutex_p.h
+@@ -65,7 +65,7 @@
+ #elif defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)
+ // use Linux mutexes everywhere except for LSB builds
+ #  define QT_LINUX_FUTEX
+-#elif defined(Q_OS_UNIX)
++#elif defined(Q_OS_UNIX) && !defined(__NetBSD__)
+ # if _POSIX_VERSION-0 >= 200112L || _XOPEN_VERSION-0 >= 600
+ #  include <semaphore.h>
+ #  define QT_UNIX_SEMAPHORE