Sun Apr 28 12:46:31 2019 UTC ()
qt5-qtbase: avoid using semaphores as mutexes on netbsd.
they're quite constrained: the max number of semaphores is limited.

bump PKGREVISION


(maya)
diff -r1.76 -r1.77 pkgsrc/x11/qt5-qtbase/Makefile
diff -r1.30 -r1.31 pkgsrc/x11/qt5-qtbase/Makefile.common
diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtbase/distinfo
diff -r0 -r1.1 pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_thread_qmutex__p.h
cvs diff -r1.76 -r1.77 pkgsrc/x11/qt5-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile 2019/04/25 19:43:15 1.76
+++ pkgsrc/x11/qt5-qtbase/Makefile 2019/04/28 12:46:31 1.77
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.76 2019/04/25 19:43:15 adam Exp $ 1# $NetBSD: Makefile,v 1.77 2019/04/28 12:46:31 maya Exp $
2 2
3DISTNAME= qtbase-everywhere-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtbase-${QTVERSION} 4PKGNAME= qt5-qtbase-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= C++ X GUI toolkit 6COMMENT= C++ X GUI toolkit
6 7
7.include "../../x11/qt5-qtbase/Makefile.common" 8.include "../../x11/qt5-qtbase/Makefile.common"
8 9
9HAS_CONFIGURE= yes 10HAS_CONFIGURE= yes
10CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 11CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
11CONFIGURE_ARGS+= -I "${PREFIX}/include" 12CONFIGURE_ARGS+= -I "${PREFIX}/include"
12CONFIGURE_ARGS+= -L "${PREFIX}/lib" 13CONFIGURE_ARGS+= -L "${PREFIX}/lib"
13CONFIGURE_ARGS+= -opensource -confirm-license 14CONFIGURE_ARGS+= -opensource -confirm-license
14CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg" 15CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
15CONFIGURE_ARGS+= -accessibility 16CONFIGURE_ARGS+= -accessibility
16CONFIGURE_ARGS+= -dbus-linked 17CONFIGURE_ARGS+= -dbus-linked
17CONFIGURE_ARGS+= -icu 18CONFIGURE_ARGS+= -icu
cvs diff -r1.30 -r1.31 pkgsrc/x11/qt5-qtbase/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile.common 2019/03/26 11:14:16 1.30
+++ pkgsrc/x11/qt5-qtbase/Makefile.common 2019/04/28 12:46:31 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.30 2019/03/26 11:14:16 adam Exp $ 1# $NetBSD: Makefile.common,v 1.31 2019/04/28 12:46:31 maya Exp $
2# used by x11/qt5-mysql/Makefile 2# used by x11/qt5-mysql/Makefile
3# used by x11/qt5-odbc/Makefile 3# used by x11/qt5-odbc/Makefile
4# used by x11/qt5-psql/Makefile 4# used by x11/qt5-psql/Makefile
5# used by x11/qt5-qtbase/Makefile 5# used by x11/qt5-qtbase/Makefile
6# used by x11/qt5-qtcharts/Makefile 6# used by x11/qt5-qtcharts/Makefile
7# used by x11/qt5-qtconnectivity/Makefile 7# used by x11/qt5-qtconnectivity/Makefile
8# used by x11/qt5-qtdeclarative/Makefile 8# used by x11/qt5-qtdeclarative/Makefile
9# used by x11/qt5-qtdoc/Makefile 9# used by x11/qt5-qtdoc/Makefile
10# used by x11/qt5-qtgraphicaleffects/Makefile 10# used by x11/qt5-qtgraphicaleffects/Makefile
11# used by x11/qt5-qtimageformats/Makefile 11# used by x11/qt5-qtimageformats/Makefile
12# used by x11/qt5-qtlocation/Makefile 12# used by x11/qt5-qtlocation/Makefile
13# used by x11/qt5-qtmacextras/Makefile 13# used by x11/qt5-qtmacextras/Makefile
14# used by x11/qt5-qtmultimedia/Makefile 14# used by x11/qt5-qtmultimedia/Makefile
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20# used by x11/qt5-qtsvg/Makefile 20# used by x11/qt5-qtsvg/Makefile
21# used by x11/qt5-qttools/Makefile 21# used by x11/qt5-qttools/Makefile
22# used by x11/qt5-qttranslations/Makefile 22# used by x11/qt5-qttranslations/Makefile
23# used by x11/qt5-qtwebchannel/Makefile 23# used by x11/qt5-qtwebchannel/Makefile
24# used by x11/qt5-qtwebkit/Makefile 24# used by x11/qt5-qtwebkit/Makefile
25# used by x11/qt5-qtwebsockets/Makefile 25# used by x11/qt5-qtwebsockets/Makefile
26# used by x11/qt5-qtx11extras/Makefile 26# used by x11/qt5-qtx11extras/Makefile
27# used by x11/qt5-qtxmlpatterns/Makefile 27# used by x11/qt5-qtxmlpatterns/Makefile
28 28
29.include "../../x11/qt5/Makefile.common" 29.include "../../x11/qt5/Makefile.common"
30.include "options.mk" 30.include "options.mk"
31 31
32.include "../../mk/dlopen.buildlink3.mk" 32.include "../../mk/dlopen.buildlink3.mk"
33BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} 33BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
34 34
35USE_LANGUAGES= c c++11 35USE_LANGUAGES= c c++11
36USE_TOOLS+= gmake perl:build pkg-config 36USE_TOOLS+= gmake perl:build pkg-config
37 37
38# Avoid failures to due 'register' usage in X11 headers. 38# Avoid failures to due 'register' usage in X11 headers.
39CFLAGS+= -Wno-register 39CFLAGS+= -Wno-register
40 40
41# wcstof(3) etc. is used in C++ code. 41# wcstof(3) etc. is used in C++ code.
42CFLAGS.NetBSD+= -D_NETBSD_SOURCE 42CFLAGS.NetBSD+= -D_NETBSD_SOURCE
43 43
44# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined. 44# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined.
45BUILDLINK_TRANSFORM+= rm:-Wundef 45BUILDLINK_TRANSFORM+= rm:-Wundef
46 46
cvs diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtbase/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/distinfo 2019/04/25 19:43:15 1.48
+++ pkgsrc/x11/qt5-qtbase/distinfo 2019/04/28 12:46:31 1.49
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1$NetBSD: distinfo,v 1.48 2019/04/25 19:43:15 adam Exp $ 1$NetBSD: distinfo,v 1.49 2019/04/28 12:46:31 maya Exp $
2 2
3SHA1 (qtbase-everywhere-src-5.12.3.tar.xz) = dbe6ed4779998f757473a727b7ff3300c7d31155 3SHA1 (qtbase-everywhere-src-5.12.3.tar.xz) = dbe6ed4779998f757473a727b7ff3300c7d31155
4RMD160 (qtbase-everywhere-src-5.12.3.tar.xz) = aebc6473c64d287fe7ea861c449b094b823225c3 4RMD160 (qtbase-everywhere-src-5.12.3.tar.xz) = aebc6473c64d287fe7ea861c449b094b823225c3
5SHA512 (qtbase-everywhere-src-5.12.3.tar.xz) = 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 5SHA512 (qtbase-everywhere-src-5.12.3.tar.xz) = 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
6Size (qtbase-everywhere-src-5.12.3.tar.xz) = 48382148 bytes 6Size (qtbase-everywhere-src-5.12.3.tar.xz) = 48382148 bytes
7SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b 7SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
8SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26 8SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
9SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515 9SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515
10SHA1 (patch-qmake_Makefile.unix) = ec1af3d76dc5bd0b7b1d375ceeebbd016b6f555f 10SHA1 (patch-qmake_Makefile.unix) = ec1af3d76dc5bd0b7b1d375ceeebbd016b6f555f
11SHA1 (patch-qmake_generators_makefile.cpp) = 26366f21108534a321d9d7c7f87066e9acf7d981 11SHA1 (patch-qmake_generators_makefile.cpp) = 26366f21108534a321d9d7c7f87066e9acf7d981
12SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 3f2a6a11dacbf7959e5ec032cb4b6ef31b874fb7 12SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 3f2a6a11dacbf7959e5ec032cb4b6ef31b874fb7
13SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0 13SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0
14SHA1 (patch-src_corelib_configure.json) = b0865730d33f11e047d3016832e6b56cf5f54add 14SHA1 (patch-src_corelib_configure.json) = b0865730d33f11e047d3016832e6b56cf5f54add
15SHA1 (patch-src_corelib_global_qconfig-bootstrapped.h) = c52c811a44d965cf9d420749ffe999673c388a68 15SHA1 (patch-src_corelib_global_qconfig-bootstrapped.h) = c52c811a44d965cf9d420749ffe999673c388a68
16SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc 16SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc
17SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938 17SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938
18SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073 18SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
 19SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec
19SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd 20SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd
20SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5 21SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5
21SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f 22SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f
22SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 655ca6601ddd1768b92758cfdfd8d1c3514fba94 23SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 655ca6601ddd1768b92758cfdfd8d1c3514fba94
23SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be 24SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be
24SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection__basic.h) = 965338ca06d930a1e2261ea6312592607521e66c 25SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection__basic.h) = 965338ca06d930a1e2261ea6312592607521e66c
25SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb 26SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb
26SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1 27SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1
27SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 1dbb08e5ec6715cbe239efdfb45389959b179ea3 28SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 1dbb08e5ec6715cbe239efdfb45389959b179ea3
28SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1 29SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1
File Added: pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_thread_qmutex__p.h
$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