pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11 qt5: updated to 5.12.2



details:   https://anonhg.NetBSD.org/pkgsrc/rev/19fecd9c7221
branches:  trunk
changeset: 393866:19fecd9c7221
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Mar 26 11:14:16 2019 +0000

description:
qt5: updated to 5.12.2

5.12.2:
While not adding new features, the Qt 5.12.2 release provides a number of bug
fixes and other improvements.

Compared to Qt 5.12.1, the new Qt 5.12.2 contains more than 250 bug fixes. For
details of the most important changes, please check the Change files of Qt
5.12.2.

With Qt 5.12.2 we bring back widely asked MinGW 32 bit prebuild binaries in
addition to 64 bit ones.

Qt 5.12 LTS will receive many more patch releases throughout the coming years
and we recommend all active developed projects to migrate to Qt 5.12 LTS. Qt
5.9 LTS is currently in ?Strict? phase and receives only the selected important
bug and security fixes, while Qt 5.12 LTS is currently receiving all the bug
fixes. With Qt 5.6 Support ending in March 2019 all active projects still using
Qt 5.6 LTS should now migrate to a later version of Qt.

diffstat:

 x11/qt5-mysql/distinfo                                                               |   10 +-
 x11/qt5-odbc/distinfo                                                                |   10 +-
 x11/qt5-psql/distinfo                                                                |   10 +-
 x11/qt5-qtbase/Makefile                                                              |    5 +-
 x11/qt5-qtbase/Makefile.common                                                       |    3 +-
 x11/qt5-qtbase/PLIST                                                                 |   15 +-
 x11/qt5-qtbase/distinfo                                                              |   13 +-
 x11/qt5-qtbase/patches/patch-config.tests_unix_iconv_iconv.cpp                       |   18 -
 x11/qt5-qtbase/patches/patch-src_corelib_configure.json                              |   37 +
 x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro   |   15 -
 x11/qt5-qtcharts/distinfo                                                            |   10 +-
 x11/qt5-qtconnectivity/DESCR                                                         |    1 +
 x11/qt5-qtconnectivity/Makefile                                                      |   14 +
 x11/qt5-qtconnectivity/PLIST                                                         |  238 ++++++++++
 x11/qt5-qtconnectivity/buildlink3.mk                                                 |   14 +
 x11/qt5-qtconnectivity/distinfo                                                      |    6 +
 x11/qt5-qtdeclarative/distinfo                                                       |   10 +-
 x11/qt5-qtdoc/PLIST                                                                  |    6 +-
 x11/qt5-qtdoc/distinfo                                                               |   10 +-
 x11/qt5-qtgraphicaleffects/distinfo                                                  |   10 +-
 x11/qt5-qtimageformats/distinfo                                                      |   10 +-
 x11/qt5-qtlocation/PLIST                                                             |    8 +-
 x11/qt5-qtlocation/distinfo                                                          |   13 +-
 x11/qt5-qtlocation/patches/patch-src_location_configure.json                         |    8 +-
 x11/qt5-qtlocation/patches/patch-src_location_declarativemaps_qdeclarativegeomap.cpp |   31 -
 x11/qt5-qtmacextras/distinfo                                                         |   10 +-
 x11/qt5-qtmultimedia/distinfo                                                        |   10 +-
 x11/qt5-qtnetworkauth/distinfo                                                       |   10 +-
 x11/qt5-qtquickcontrols/distinfo                                                     |   10 +-
 x11/qt5-qtquickcontrols2/distinfo                                                    |   10 +-
 x11/qt5-qtscript/PLIST                                                               |    4 +-
 x11/qt5-qtscript/distinfo                                                            |   10 +-
 x11/qt5-qtsensors/distinfo                                                           |   10 +-
 x11/qt5-qtserialport/distinfo                                                        |   10 +-
 x11/qt5-qtsvg/distinfo                                                               |   10 +-
 x11/qt5-qttools/PLIST                                                                |    3 +-
 x11/qt5-qttools/distinfo                                                             |   10 +-
 x11/qt5-qttranslations/PLIST                                                         |   37 +-
 x11/qt5-qttranslations/distinfo                                                      |   10 +-
 x11/qt5-qtwebchannel/distinfo                                                        |   10 +-
 x11/qt5-qtwebsockets/distinfo                                                        |   10 +-
 x11/qt5-qtx11extras/distinfo                                                         |   10 +-
 x11/qt5-qtxmlpatterns/distinfo                                                       |   10 +-
 x11/qt5/Makefile                                                                     |    3 +-
 x11/qt5/Makefile.common                                                              |    4 +-
 45 files changed, 475 insertions(+), 251 deletions(-)

diffs (truncated from 1184 to 300 lines):

diff -r 89002a69644e -r 19fecd9c7221 x11/qt5-mysql/distinfo
--- a/x11/qt5-mysql/distinfo    Tue Mar 26 07:29:36 2019 +0000
+++ b/x11/qt5-mysql/distinfo    Tue Mar 26 11:14:16 2019 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2018/12/18 09:57:17 adam Exp $
+$NetBSD: distinfo,v 1.9 2019/03/26 11:14:16 adam Exp $
 
-SHA1 (qtbase-everywhere-src-5.12.0.tar.xz) = 67ea0cdbe65d9406dcef36b3a6899cb17c812678
-RMD160 (qtbase-everywhere-src-5.12.0.tar.xz) = 83fbdcf4cfa783c7e1be09fee1a439c26d006a70
-SHA512 (qtbase-everywhere-src-5.12.0.tar.xz) = 8e6c51b754840d17e694b5b4a0d732afe04ebe48d166bca429db01ce3ac9014bb0ed35fe99ad165973889d96919f6b6774429585bae9a7fdba6b07f4c1eb3570
-Size (qtbase-everywhere-src-5.12.0.tar.xz) = 48288896 bytes
+SHA1 (qtbase-everywhere-src-5.12.2.tar.xz) = d12a34ef75ac344e29dad4400b844cbda6c447f1
+RMD160 (qtbase-everywhere-src-5.12.2.tar.xz) = 91adec66cc25605b11ec468e2037c0d40f2416a8
+SHA512 (qtbase-everywhere-src-5.12.2.tar.xz) = 6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613
+Size (qtbase-everywhere-src-5.12.2.tar.xz) = 48364464 bytes
diff -r 89002a69644e -r 19fecd9c7221 x11/qt5-odbc/distinfo
--- a/x11/qt5-odbc/distinfo     Tue Mar 26 07:29:36 2019 +0000
+++ b/x11/qt5-odbc/distinfo     Tue Mar 26 11:14:16 2019 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2018/12/18 09:57:17 adam Exp $
+$NetBSD: distinfo,v 1.8 2019/03/26 11:14:16 adam Exp $
 
-SHA1 (qtbase-everywhere-src-5.12.0.tar.xz) = 67ea0cdbe65d9406dcef36b3a6899cb17c812678
-RMD160 (qtbase-everywhere-src-5.12.0.tar.xz) = 83fbdcf4cfa783c7e1be09fee1a439c26d006a70
-SHA512 (qtbase-everywhere-src-5.12.0.tar.xz) = 8e6c51b754840d17e694b5b4a0d732afe04ebe48d166bca429db01ce3ac9014bb0ed35fe99ad165973889d96919f6b6774429585bae9a7fdba6b07f4c1eb3570
-Size (qtbase-everywhere-src-5.12.0.tar.xz) = 48288896 bytes
+SHA1 (qtbase-everywhere-src-5.12.2.tar.xz) = d12a34ef75ac344e29dad4400b844cbda6c447f1
+RMD160 (qtbase-everywhere-src-5.12.2.tar.xz) = 91adec66cc25605b11ec468e2037c0d40f2416a8
+SHA512 (qtbase-everywhere-src-5.12.2.tar.xz) = 6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613
+Size (qtbase-everywhere-src-5.12.2.tar.xz) = 48364464 bytes
diff -r 89002a69644e -r 19fecd9c7221 x11/qt5-psql/distinfo
--- a/x11/qt5-psql/distinfo     Tue Mar 26 07:29:36 2019 +0000
+++ b/x11/qt5-psql/distinfo     Tue Mar 26 11:14:16 2019 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2018/12/18 09:57:17 adam Exp $
+$NetBSD: distinfo,v 1.9 2019/03/26 11:14:16 adam Exp $
 
-SHA1 (qtbase-everywhere-src-5.12.0.tar.xz) = 67ea0cdbe65d9406dcef36b3a6899cb17c812678
-RMD160 (qtbase-everywhere-src-5.12.0.tar.xz) = 83fbdcf4cfa783c7e1be09fee1a439c26d006a70
-SHA512 (qtbase-everywhere-src-5.12.0.tar.xz) = 8e6c51b754840d17e694b5b4a0d732afe04ebe48d166bca429db01ce3ac9014bb0ed35fe99ad165973889d96919f6b6774429585bae9a7fdba6b07f4c1eb3570
-Size (qtbase-everywhere-src-5.12.0.tar.xz) = 48288896 bytes
+SHA1 (qtbase-everywhere-src-5.12.2.tar.xz) = d12a34ef75ac344e29dad4400b844cbda6c447f1
+RMD160 (qtbase-everywhere-src-5.12.2.tar.xz) = 91adec66cc25605b11ec468e2037c0d40f2416a8
+SHA512 (qtbase-everywhere-src-5.12.2.tar.xz) = 6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613
+Size (qtbase-everywhere-src-5.12.2.tar.xz) = 48364464 bytes
diff -r 89002a69644e -r 19fecd9c7221 x11/qt5-qtbase/Makefile
--- a/x11/qt5-qtbase/Makefile   Tue Mar 26 07:29:36 2019 +0000
+++ b/x11/qt5-qtbase/Makefile   Tue Mar 26 11:14:16 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2018/12/18 09:57:18 adam Exp $
+# $NetBSD: Makefile,v 1.70 2019/03/26 11:14:16 adam Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
@@ -8,6 +8,8 @@
 
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       -prefix "${QTPREFIX}"
+CONFIGURE_ARGS+=       -I "${PREFIX}/include"
+CONFIGURE_ARGS+=       -L "${PREFIX}/lib"
 CONFIGURE_ARGS+=       -opensource -confirm-license
 CONFIGURE_ARGS+=       -sysconfdir "${PKG_SYSCONFDIR}/xdg"
 CONFIGURE_ARGS+=       -accessibility
@@ -24,7 +26,6 @@
 CONFIGURE_ARGS+=       -no-sql-oci
 CONFIGURE_ARGS+=       -no-sql-odbc
 CONFIGURE_ARGS+=       -no-sql-psql
-#CONFIGURE_ARGS+=      -no-sql-sqlite
 CONFIGURE_ARGS+=       -no-sql-sqlite2
 CONFIGURE_ARGS+=       -no-sql-tds
 CONFIGURE_ARGS+=       -no-strip
diff -r 89002a69644e -r 19fecd9c7221 x11/qt5-qtbase/Makefile.common
--- a/x11/qt5-qtbase/Makefile.common    Tue Mar 26 07:29:36 2019 +0000
+++ b/x11/qt5-qtbase/Makefile.common    Tue Mar 26 11:14:16 2019 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.29 2018/12/18 09:57:18 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2019/03/26 11:14:16 adam Exp $
 # used by x11/qt5-mysql/Makefile
 # used by x11/qt5-odbc/Makefile
 # used by x11/qt5-psql/Makefile
 # used by x11/qt5-qtbase/Makefile
 # used by x11/qt5-qtcharts/Makefile
+# used by x11/qt5-qtconnectivity/Makefile
 # used by x11/qt5-qtdeclarative/Makefile
 # used by x11/qt5-qtdoc/Makefile
 # used by x11/qt5-qtgraphicaleffects/Makefile
diff -r 89002a69644e -r 19fecd9c7221 x11/qt5-qtbase/PLIST
--- a/x11/qt5-qtbase/PLIST      Tue Mar 26 07:29:36 2019 +0000
+++ b/x11/qt5-qtbase/PLIST      Tue Mar 26 11:14:16 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2018/12/18 09:57:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2019/03/26 11:14:16 adam Exp $
 lib/pkgconfig/Qt5Concurrent.pc
 lib/pkgconfig/Qt5Core.pc
 lib/pkgconfig/Qt5DBus.pc
@@ -1114,6 +1114,7 @@
 qt5/include/QtGui/${PKGVERSION}/QtGui/private/qtriangulatingstroker_p.h
 qt5/include/QtGui/${PKGVERSION}/QtGui/private/qtriangulator_p.h
 qt5/include/QtGui/${PKGVERSION}/QtGui/private/qvectorpath_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qvulkanfunctions_p.h
 qt5/include/QtGui/${PKGVERSION}/QtGui/private/qvulkanwindow_p.h
 qt5/include/QtGui/${PKGVERSION}/QtGui/private/qwindow_p.h
 qt5/include/QtGui/${PKGVERSION}/QtGui/private/qxbmhandler_p.h
@@ -1801,6 +1802,7 @@
 qt5/include/QtPlatformHeaders/QEGLNativeContext
 qt5/include/QtPlatformHeaders/QEglFSFunctions
 qt5/include/QtPlatformHeaders/QGLXNativeContext
+qt5/include/QtPlatformHeaders/QLinuxFbFunctions
 qt5/include/QtPlatformHeaders/QPlatformHeaderHelper
 qt5/include/QtPlatformHeaders/QWGLNativeContext
 qt5/include/QtPlatformHeaders/QWaylandWindowFunctions
@@ -1815,6 +1817,7 @@
 qt5/include/QtPlatformHeaders/qeglfsfunctions.h
 qt5/include/QtPlatformHeaders/qeglnativecontext.h
 qt5/include/QtPlatformHeaders/qglxnativecontext.h
+qt5/include/QtPlatformHeaders/qlinuxfbfunctions.h
 qt5/include/QtPlatformHeaders/qplatformheaderhelper.h
 qt5/include/QtPlatformHeaders/qtplatformheadersversion.h
 qt5/include/QtPlatformHeaders/qwaylandwindowfunctions.h
@@ -2732,6 +2735,7 @@
 qt5/mkspecs/common/mac.conf
 qt5/mkspecs/common/mac/qplatformdefs.h
 qt5/mkspecs/common/macx.conf
+qt5/mkspecs/common/msvc-based-version.conf
 qt5/mkspecs/common/msvc-desktop.conf
 qt5/mkspecs/common/msvc-version.conf
 qt5/mkspecs/common/nacl/g++-nacl32.conf
@@ -2862,6 +2866,7 @@
 qt5/mkspecs/features/benchmark.prf
 qt5/mkspecs/features/build_pass.prf
 qt5/mkspecs/features/cmake_functions.prf
+qt5/mkspecs/features/cmdline.prf
 qt5/mkspecs/features/configure.prf
 qt5/mkspecs/features/configure_base.prf
 qt5/mkspecs/features/create_cmake.prf
@@ -2874,6 +2879,7 @@
 qt5/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 qt5/mkspecs/features/data/configure.json
 qt5/mkspecs/features/data/dummy.cpp
+qt5/mkspecs/features/data/dumpvcvars.bat
 qt5/mkspecs/features/data/mac/objc_namespace.sh
 qt5/mkspecs/features/data/macros.cpp
 qt5/mkspecs/features/data/unix/findclasslist.pl
@@ -2917,8 +2923,6 @@
 qt5/mkspecs/features/qlalr.prf
 qt5/mkspecs/features/qmake.conf
 qt5/mkspecs/features/qmake_use.prf
-qt5/mkspecs/features/qml1_module.prf
-qt5/mkspecs/features/qml1_plugin.prf
 qt5/mkspecs/features/qml_debug.prf
 qt5/mkspecs/features/qml_module.prf
 qt5/mkspecs/features/qml_plugin.prf
@@ -2994,7 +2998,6 @@
 qt5/mkspecs/features/vxworks.prf
 qt5/mkspecs/features/warn_off.prf
 qt5/mkspecs/features/warn_on.prf
-qt5/mkspecs/features/wasm/qt.prf
 qt5/mkspecs/features/wasm/wasm.prf
 qt5/mkspecs/features/wayland-scanner.prf
 qt5/mkspecs/features/win32/console.prf
@@ -3187,6 +3190,8 @@
 qt5/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
 qt5/mkspecs/wasm-emscripten/qmake.conf
 qt5/mkspecs/wasm-emscripten/qplatformdefs.h
+qt5/mkspecs/win32-arm64-msvc2017/qmake.conf
+qt5/mkspecs/win32-arm64-msvc2017/qplatformdefs.h
 qt5/mkspecs/win32-clang-g++/qmake.conf
 qt5/mkspecs/win32-clang-g++/qplatformdefs.h
 qt5/mkspecs/win32-clang-msvc/qmake.conf
@@ -3203,6 +3208,8 @@
 qt5/mkspecs/winrt-arm-msvc2015/qplatformdefs.h
 qt5/mkspecs/winrt-arm-msvc2017/qmake.conf
 qt5/mkspecs/winrt-arm-msvc2017/qplatformdefs.h
+qt5/mkspecs/winrt-arm64-msvc2017/qmake.conf
+qt5/mkspecs/winrt-arm64-msvc2017/qplatformdefs.h
 qt5/mkspecs/winrt-x64-msvc2015/qmake.conf
 qt5/mkspecs/winrt-x64-msvc2015/qplatformdefs.h
 qt5/mkspecs/winrt-x64-msvc2017/qmake.conf
diff -r 89002a69644e -r 19fecd9c7221 x11/qt5-qtbase/distinfo
--- a/x11/qt5-qtbase/distinfo   Tue Mar 26 07:29:36 2019 +0000
+++ b/x11/qt5-qtbase/distinfo   Tue Mar 26 11:14:16 2019 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.46 2018/12/18 09:57:18 adam Exp $
+$NetBSD: distinfo,v 1.47 2019/03/26 11:14:16 adam Exp $
 
-SHA1 (qtbase-everywhere-src-5.12.0.tar.xz) = 67ea0cdbe65d9406dcef36b3a6899cb17c812678
-RMD160 (qtbase-everywhere-src-5.12.0.tar.xz) = 83fbdcf4cfa783c7e1be09fee1a439c26d006a70
-SHA512 (qtbase-everywhere-src-5.12.0.tar.xz) = 8e6c51b754840d17e694b5b4a0d732afe04ebe48d166bca429db01ce3ac9014bb0ed35fe99ad165973889d96919f6b6774429585bae9a7fdba6b07f4c1eb3570
-Size (qtbase-everywhere-src-5.12.0.tar.xz) = 48288896 bytes
-SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = ffd0107d57e308aa83a780818756c9a538efc591
+SHA1 (qtbase-everywhere-src-5.12.2.tar.xz) = d12a34ef75ac344e29dad4400b844cbda6c447f1
+RMD160 (qtbase-everywhere-src-5.12.2.tar.xz) = 91adec66cc25605b11ec468e2037c0d40f2416a8
+SHA512 (qtbase-everywhere-src-5.12.2.tar.xz) = 6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613
+Size (qtbase-everywhere-src-5.12.2.tar.xz) = 48364464 bytes
 SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
 SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
 SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515
@@ -12,6 +11,7 @@
 SHA1 (patch-qmake_generators_makefile.cpp) = 26366f21108534a321d9d7c7f87066e9acf7d981
 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 3f2a6a11dacbf7959e5ec032cb4b6ef31b874fb7
 SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0
+SHA1 (patch-src_corelib_configure.json) = b0865730d33f11e047d3016832e6b56cf5f54add
 SHA1 (patch-src_corelib_global_qconfig-bootstrapped.h) = c52c811a44d965cf9d420749ffe999673c388a68
 SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc
 SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938
@@ -19,7 +19,6 @@
 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
-SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 1655b2320b250defcfa406c95e58a1b728c0f2d9
 SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 655ca6601ddd1768b92758cfdfd8d1c3514fba94
 SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be
 SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection__basic.h) = 965338ca06d930a1e2261ea6312592607521e66c
diff -r 89002a69644e -r 19fecd9c7221 x11/qt5-qtbase/patches/patch-config.tests_unix_iconv_iconv.cpp
--- a/x11/qt5-qtbase/patches/patch-config.tests_unix_iconv_iconv.cpp    Tue Mar 26 07:29:36 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-config.tests_unix_iconv_iconv.cpp,v 1.2 2018/01/17 19:30:47 markd Exp $
-
-Fix for NetBSD iconv(3)
-
---- config.tests/iconv/iconv.cpp.orig  2017-10-02 08:43:38.000000000 +0000
-+++ config.tests/iconv/iconv.cpp
-@@ -43,7 +43,11 @@ int main(int, char **)
- {
-     iconv_t x = iconv_open("", "");
- 
-+#if defined(__NetBSD__)
-+    const char *inp;
-+#else
-     char *inp;
-+#endif
-     char *outp;
-     size_t inbytes, outbytes;
-     iconv(x, &inp, &inbytes, &outp, &outbytes);
diff -r 89002a69644e -r 19fecd9c7221 x11/qt5-qtbase/patches/patch-src_corelib_configure.json
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtbase/patches/patch-src_corelib_configure.json   Tue Mar 26 11:14:16 2019 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-src_corelib_configure.json,v 1.1 2019/03/26 11:14:16 adam Exp $
+
+Revert change from 5.12.1 to correctly detect 64-bit atomics and dlopen().
+
+--- src/corelib/configure.json.orig    2019-03-06 07:59:50.000000000 +0000
++++ src/corelib/configure.json
+@@ -133,6 +133,7 @@
+         "libatomic": {
+             "label": "64 bit atomics",
+             "test": {
++                "include": [ "atomic", "cstdint" ],
+                 "tail": [
+                     "void test(volatile std::atomic<std::int64_t> &a)",
+                     "{",
+@@ -151,7 +152,6 @@
+                 ],
+                 "qmake": "CONFIG += c++11"
+             },
+-            "headers": [ "atomic", "cstdint" ],
+             "sources": [
+                 "",
+                 "-latomic"
+@@ -160,13 +160,13 @@
+         "libdl": {
+             "label": "dlopen()",
+             "test": {
++                "include": "dlfcn.h",
+                 "main": [
+                     "dlclose(dlopen(0, 0));",
+                     "dlsym(RTLD_DEFAULT, 0);",
+                     "dlerror();"
+                 ]
+             },
+-            "headers": "dlfcn.h",
+             "sources": [
+                 "",
+                 "-ldl"
diff -r 89002a69644e -r 19fecd9c7221 x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro
--- a/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro        Tue Mar 26 07:29:36 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_platforminputcontexts_compose_compose.pro,v 1.2 2018/01/17 19:30:47 markd Exp $
-
-PR pkg/48553
-
---- src/plugins/platforminputcontexts/compose/compose.pro.orig 2017-05-26 12:43:31.000000000 +0000
-+++ src/plugins/platforminputcontexts/compose/compose.pro
-@@ -9,6 +9,8 @@ SOURCES += $$PWD/qcomposeplatforminputco
- HEADERS += $$PWD/qcomposeplatforminputcontext.h \
-            $$PWD/generator/qtablegenerator.h \
- 
-+DEFINES += X11BASE=\\\"$$(X11BASE)\\\"
-+
- # libxkbcommon
- !qtConfig(xkbcommon-system) {
-     include(../../../3rdparty/xkbcommon.pri)
diff -r 89002a69644e -r 19fecd9c7221 x11/qt5-qtcharts/distinfo
--- a/x11/qt5-qtcharts/distinfo Tue Mar 26 07:29:36 2019 +0000
+++ b/x11/qt5-qtcharts/distinfo Tue Mar 26 11:14:16 2019 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2018/12/18 09:57:18 adam Exp $



Home | Main Index | Thread Index | Old Index