diff options
Diffstat (limited to 'x11/qt5-qtbase')
| -rw-r--r-- | x11/qt5-qtbase/Makefile | 3 | ||||
| -rw-r--r-- | x11/qt5-qtbase/Makefile.common | 9 | ||||
| -rw-r--r-- | x11/qt5-qtbase/PLIST | 53 | ||||
| -rw-r--r-- | x11/qt5-qtbase/distinfo | 17 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp | 28 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-src_corelib_global_qconfig-bootstrapped.h | 8 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h | 15 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm | 15 |
8 files changed, 60 insertions, 88 deletions
diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index 4b6e59cb9fb..f20716e7d01 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.60 2018/06/05 06:06:54 dbj Exp $ +# $NetBSD: Makefile,v 1.61 2018/06/19 07:21:23 adam Exp $ DISTNAME= qtbase-everywhere-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} -PKGREVISION= 7 COMMENT= C++ X GUI toolkit .include "../../x11/qt5-qtbase/Makefile.common" diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common index 3fbacd85a65..f35460c7f99 100644 --- a/x11/qt5-qtbase/Makefile.common +++ b/x11/qt5-qtbase/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2018/01/31 12:36:57 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.26 2018/06/19 07:21:23 adam Exp $ # used by x11/qt5-mysql/Makefile # used by x11/qt5-odbc/Makefile # used by x11/qt5-psql/Makefile @@ -46,15 +46,12 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${PREFIX}/qt5/lib BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${WRKSRC}/lib MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} -PLIST_VARS+= jit mac unix +PLIST_VARS+= mac unix .if ${OPSYS} == "Darwin" PLIST.mac= yes .else PLIST.unix= yes .endif -.if ${OPSYS} != "NetBSD" -PLIST.jit= yes -.endif # avoid creating a .qt directory in the users home directory SCRIPTS_ENV+= HOME=${WRKDIR} @@ -63,5 +60,5 @@ SCRIPTS_ENV+= HOME=${WRKDIR} && empty(PKGPATH:Mx11/qt5-odbc) && empty(PKGPATH:Mx11/qt5-mysql) \ && empty(PKGPATH:Mx11/qt5-psql) do-configure: - cd ${WRKSRC} && ${QTPREFIX}/bin/qmake -o Makefile + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QTPREFIX}/bin/qmake -o Makefile .endif diff --git a/x11/qt5-qtbase/PLIST b/x11/qt5-qtbase/PLIST index 86cdb7435c2..8fff87605fe 100644 --- a/x11/qt5-qtbase/PLIST +++ b/x11/qt5-qtbase/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2018/03/01 20:09:49 adam Exp $ +@comment $NetBSD: PLIST,v 1.15 2018/06/19 07:21:23 adam Exp $ lib/pkgconfig/Qt5Concurrent.pc lib/pkgconfig/Qt5Core.pc lib/pkgconfig/Qt5DBus.pc @@ -186,6 +186,7 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfsfileengine_iterator_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfsfileengine_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfunctions_fake_env_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfunctions_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfutex_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfutureinterface_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfuturewatcher_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qgb18030codec_p.h @@ -212,6 +213,7 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qlocale_data_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qlocale_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qlocale_tools_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qlockfile_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qlogging_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qloggingregistry_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qmachparser_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qmetaobject_moc_p.h @@ -277,6 +279,7 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qtimezoneprivate_data_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qtimezoneprivate_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qtldurl_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qtools_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qtrace_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qtranslator_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qtsciicodec_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qunicodetables_p.h @@ -525,7 +528,6 @@ qt5/include/QtCore/QStandardPaths qt5/include/QtCore/QState qt5/include/QtCore/QStateMachine qt5/include/QtCore/QStaticArrayData -qt5/include/QtCore/QStaticAssertFailure qt5/include/QtCore/QStaticByteArrayData qt5/include/QtCore/QStaticByteArrayMatcherBase qt5/include/QtCore/QStaticPlugin @@ -634,7 +636,6 @@ qt5/include/QtCore/qarraydatapointer.h qt5/include/QtCore/qatomic.h qt5/include/QtCore/qatomic_bootstrap.h qt5/include/QtCore/qatomic_cxx11.h -qt5/include/QtCore/qatomic_msvc.h qt5/include/QtCore/qbasicatomic.h qt5/include/QtCore/qbasictimer.h qt5/include/QtCore/qbitarray.h @@ -1576,6 +1577,8 @@ qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkdatagram_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkdiskcache_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkfile_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkinterface_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkinterface_uikit_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkinterface_unix_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkreply_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkreplydataimpl_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkreplyfileimpl_p.h @@ -1895,10 +1898,12 @@ qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestresult_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtesttable_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestutil_macos_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestxunitstreamer_p.h +qt5/include/QtTest/${PKGVERSION}/QtTest/private/qttestlib-config_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qxctestlogger_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qxmltestlogger_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qxunittestlogger_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/valgrind_p.h +qt5/include/QtTest/QAbstractItemModelTester qt5/include/QtTest/QEventSizeOfChecker qt5/include/QtTest/QSignalSpy qt5/include/QtTest/QSpontaneKeyEvent @@ -1918,6 +1923,7 @@ qt5/include/QtTest/QtTestGui qt5/include/QtTest/QtTestNetwork qt5/include/QtTest/QtTestVersion qt5/include/QtTest/QtTestWidgets +qt5/include/QtTest/qabstractitemmodeltester.h qt5/include/QtTest/qbenchmark.h qt5/include/QtTest/qbenchmarkmetric.h qt5/include/QtTest/qsignalspy.h @@ -1937,6 +1943,8 @@ qt5/include/QtTest/qtestmouse.h qt5/include/QtTest/qtestspontaneevent.h qt5/include/QtTest/qtestsystem.h qt5/include/QtTest/qtesttouch.h +qt5/include/QtTest/qttestglobal.h +qt5/include/QtTest/qttestlib-config.h qt5/include/QtTest/qttestversion.h qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qabstractfileiconengine_p.h qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qdbusmenuadaptor_p.h @@ -2495,6 +2503,7 @@ ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSKmsEglDeviceIntegrationPlugin.cmake ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSKmsGbmIntegrationPlugin.cmake ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSX11IntegrationPlugin.cmake +qt5/lib/cmake/Qt5Gui/Qt5Gui_QFlatpakThemePlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake ${PLIST.gtk3}qt5/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake @@ -2538,17 +2547,17 @@ qt5/lib/libQt5Concurrent.prl qt5/lib/libQt5Concurrent.so qt5/lib/libQt5Concurrent.so.${PKGVERSION} qt5/lib/libQt5Concurrent.so.5 -qt5/lib/libQt5Concurrent.so.5.10 +qt5/lib/libQt5Concurrent.so.5.11 qt5/lib/libQt5Core.prl qt5/lib/libQt5Core.so qt5/lib/libQt5Core.so.${PKGVERSION} qt5/lib/libQt5Core.so.5 -qt5/lib/libQt5Core.so.5.10 +qt5/lib/libQt5Core.so.5.11 qt5/lib/libQt5DBus.prl qt5/lib/libQt5DBus.so qt5/lib/libQt5DBus.so.${PKGVERSION} qt5/lib/libQt5DBus.so.5 -qt5/lib/libQt5DBus.so.5.10 +qt5/lib/libQt5DBus.so.5.11 qt5/lib/libQt5DeviceDiscoverySupport.a qt5/lib/libQt5DeviceDiscoverySupport.prl qt5/lib/libQt5EdidSupport.a @@ -2557,12 +2566,12 @@ ${PLIST.egl}qt5/lib/libQt5EglFSDeviceIntegration.prl ${PLIST.egl}qt5/lib/libQt5EglFSDeviceIntegration.so ${PLIST.egl}qt5/lib/libQt5EglFSDeviceIntegration.so.${PKGVERSION} ${PLIST.egl}qt5/lib/libQt5EglFSDeviceIntegration.so.5 -${PLIST.egl}qt5/lib/libQt5EglFSDeviceIntegration.so.5.10 +${PLIST.egl}qt5/lib/libQt5EglFSDeviceIntegration.so.5.11 ${PLIST.egl}qt5/lib/libQt5EglFsKmsSupport.prl ${PLIST.egl}qt5/lib/libQt5EglFsKmsSupport.so ${PLIST.egl}qt5/lib/libQt5EglFsKmsSupport.so.${PKGVERSION} ${PLIST.egl}qt5/lib/libQt5EglFsKmsSupport.so.5 -${PLIST.egl}qt5/lib/libQt5EglFsKmsSupport.so.5.10 +${PLIST.egl}qt5/lib/libQt5EglFsKmsSupport.so.5.11 ${PLIST.egl}qt5/lib/libQt5EglSupport.a ${PLIST.egl}qt5/lib/libQt5EglSupport.prl qt5/lib/libQt5EventDispatcherSupport.a @@ -2577,60 +2586,60 @@ qt5/lib/libQt5Gui.prl qt5/lib/libQt5Gui.so qt5/lib/libQt5Gui.so.${PKGVERSION} qt5/lib/libQt5Gui.so.5 -qt5/lib/libQt5Gui.so.5.10 +qt5/lib/libQt5Gui.so.5.11 ${PLIST.unix}qt5/lib/libQt5KmsSupport.a ${PLIST.unix}qt5/lib/libQt5KmsSupport.prl qt5/lib/libQt5Network.prl qt5/lib/libQt5Network.so qt5/lib/libQt5Network.so.${PKGVERSION} qt5/lib/libQt5Network.so.5 -qt5/lib/libQt5Network.so.5.10 +qt5/lib/libQt5Network.so.5.11 qt5/lib/libQt5OpenGL.prl qt5/lib/libQt5OpenGL.so qt5/lib/libQt5OpenGL.so.${PKGVERSION} qt5/lib/libQt5OpenGL.so.5 -qt5/lib/libQt5OpenGL.so.5.10 +qt5/lib/libQt5OpenGL.so.5.11 qt5/lib/libQt5OpenGLExtensions.prl qt5/lib/libQt5OpenGLExtensions.so qt5/lib/libQt5OpenGLExtensions.so.${PKGVERSION} qt5/lib/libQt5OpenGLExtensions.so.5 -qt5/lib/libQt5OpenGLExtensions.so.5.10 +qt5/lib/libQt5OpenGLExtensions.so.5.11 qt5/lib/libQt5PlatformCompositorSupport.a qt5/lib/libQt5PlatformCompositorSupport.prl qt5/lib/libQt5PrintSupport.prl qt5/lib/libQt5PrintSupport.so qt5/lib/libQt5PrintSupport.so.${PKGVERSION} qt5/lib/libQt5PrintSupport.so.5 -qt5/lib/libQt5PrintSupport.so.5.10 +qt5/lib/libQt5PrintSupport.so.5.11 ${PLIST.unix}qt5/lib/libQt5ServiceSupport.a ${PLIST.unix}qt5/lib/libQt5ServiceSupport.prl qt5/lib/libQt5Sql.prl qt5/lib/libQt5Sql.so qt5/lib/libQt5Sql.so.${PKGVERSION} qt5/lib/libQt5Sql.so.5 -qt5/lib/libQt5Sql.so.5.10 +qt5/lib/libQt5Sql.so.5.11 qt5/lib/libQt5Test.prl qt5/lib/libQt5Test.so qt5/lib/libQt5Test.so.${PKGVERSION} qt5/lib/libQt5Test.so.5 -qt5/lib/libQt5Test.so.5.10 +qt5/lib/libQt5Test.so.5.11 qt5/lib/libQt5ThemeSupport.a qt5/lib/libQt5ThemeSupport.prl qt5/lib/libQt5Widgets.prl qt5/lib/libQt5Widgets.so qt5/lib/libQt5Widgets.so.${PKGVERSION} qt5/lib/libQt5Widgets.so.5 -qt5/lib/libQt5Widgets.so.5.10 +qt5/lib/libQt5Widgets.so.5.11 ${PLIST.unix}qt5/lib/libQt5XcbQpa.prl ${PLIST.unix}qt5/lib/libQt5XcbQpa.so ${PLIST.unix}qt5/lib/libQt5XcbQpa.so.${PKGVERSION} ${PLIST.unix}qt5/lib/libQt5XcbQpa.so.5 -${PLIST.unix}qt5/lib/libQt5XcbQpa.so.5.10 +${PLIST.unix}qt5/lib/libQt5XcbQpa.so.5.11 qt5/lib/libQt5Xml.prl qt5/lib/libQt5Xml.so qt5/lib/libQt5Xml.so.${PKGVERSION} qt5/lib/libQt5Xml.so.5 -qt5/lib/libQt5Xml.so.5.10 +qt5/lib/libQt5Xml.so.5.11 qt5/lib/pkgconfig/Qt5Concurrent.pc qt5/lib/pkgconfig/Qt5Core.pc qt5/lib/pkgconfig/Qt5DBus.pc @@ -2664,6 +2673,7 @@ qt5/mkspecs/common/clang.conf qt5/mkspecs/common/g++-base.conf qt5/mkspecs/common/g++-macx.conf qt5/mkspecs/common/g++-unix.conf +qt5/mkspecs/common/g++-win32.conf qt5/mkspecs/common/g++.conf qt5/mkspecs/common/gcc-base-mac.conf qt5/mkspecs/common/gcc-base-unix.conf @@ -2788,6 +2798,8 @@ qt5/mkspecs/devices/linux-rasp-pi3-vc4-g++/qmake.conf qt5/mkspecs/devices/linux-rasp-pi3-vc4-g++/qplatformdefs.h qt5/mkspecs/devices/linux-rcar-h2-g++/qmake.conf qt5/mkspecs/devices/linux-rcar-h2-g++/qplatformdefs.h +qt5/mkspecs/devices/linux-rcar-m3-g++/qmake.conf +qt5/mkspecs/devices/linux-rcar-m3-g++/qplatformdefs.h qt5/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf qt5/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qplatformdefs.h qt5/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf @@ -2813,7 +2825,6 @@ qt5/mkspecs/features/create_cmake.prf qt5/mkspecs/features/ctest_testcase.prf qt5/mkspecs/features/ctest_testcase_common.prf qt5/mkspecs/features/ctest_testcase_installed.prf -qt5/mkspecs/features/data/android/dx.bat qt5/mkspecs/features/data/cmake/ExtraSourceIncludes.cmake.in qt5/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qt5/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in @@ -2889,6 +2900,7 @@ qt5/mkspecs/features/qt_parts.prf qt5/mkspecs/features/qt_plugin.prf qt5/mkspecs/features/qt_targets.prf qt5/mkspecs/features/qt_tool.prf +qt5/mkspecs/features/qt_tracepoints.prf qt5/mkspecs/features/resolve_config.prf qt5/mkspecs/features/resolve_target.prf qt5/mkspecs/features/resources.prf @@ -3122,6 +3134,8 @@ qt5/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf qt5/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h qt5/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf qt5/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h +qt5/mkspecs/win32-clang-g++/qmake.conf +qt5/mkspecs/win32-clang-g++/qplatformdefs.h qt5/mkspecs/win32-clang-msvc/qmake.conf qt5/mkspecs/win32-clang-msvc/qplatformdefs.h qt5/mkspecs/win32-g++/qmake.conf @@ -3161,6 +3175,7 @@ ${PLIST.egl}qt5/plugins/platforms/libqminimalegl.so qt5/plugins/platforms/libqoffscreen.so ${PLIST.unix}qt5/plugins/platforms/libqvnc.so ${PLIST.unix}qt5/plugins/platforms/libqxcb.so +qt5/plugins/platformthemes/libqflatpak.so ${PLIST.cups}qt5/plugins/printsupport/libcupsprintersupport.so qt5/plugins/sqldrivers/libqsqlite.so ${PLIST.egl}qt5/plugins/xcbglintegrations/libqxcb-egl-integration.so diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index f74220b92b9..35eb830bfe7 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.41 2018/06/05 06:06:54 dbj Exp $ +$NetBSD: distinfo,v 1.42 2018/06/19 07:21:23 adam Exp $ -SHA1 (qtbase-everywhere-src-5.10.1.tar.xz) = 234275f97ca401ae3df5e0c3d937e68056957bbe -RMD160 (qtbase-everywhere-src-5.10.1.tar.xz) = b0587af8736bedc9b80ceb85f10ece64389a904c -SHA512 (qtbase-everywhere-src-5.10.1.tar.xz) = abc8087bb7c5db2a668ba87cef67ab7ab9d884b770bce916b7fe7bf4e0a1fac47114eff50e15bd9efed66d63307d6aceed5cb097aa2ae5df98cffd11af8691ba -Size (qtbase-everywhere-src-5.10.1.tar.xz) = 46024708 bytes +SHA1 (qtbase-everywhere-src-5.11.0.tar.xz) = 277bfe3ebbead8096f6a16416db522179404d41e +RMD160 (qtbase-everywhere-src-5.11.0.tar.xz) = c410fd305f81907bb5703410383bb28daca6e105 +SHA512 (qtbase-everywhere-src-5.11.0.tar.xz) = 9f68e00d432db6999f932da6ba759e465ea7d65461ef8db13765f16bd812f2ddd05beede1df3c6546165bc4924a6bd14cc0ff083defc43e2dce37ea20c561462 +Size (qtbase-everywhere-src-5.11.0.tar.xz) = 46803416 bytes SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = ffd0107d57e308aa83a780818756c9a538efc591 SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26 @@ -11,17 +11,14 @@ SHA1 (patch-mkspecs_features_toolchain.prf) = 80b3ce33d6ea1879101e96b489deaedc15 SHA1 (patch-qmake_Makefile.unix) = ec1af3d76dc5bd0b7b1d375ceeebbd016b6f555f SHA1 (patch-qmake_generators_makefile.cpp) = 26366f21108534a321d9d7c7f87066e9acf7d981 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = f0a4fdd304af2ee6c1b63022ccfcebd2640f0fcb -SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = 4387447f0f23f0f8c623c0c019ab632bc1cb5617 -SHA1 (patch-src_corelib_global_qconfig-bootstrapped.h) = ec5487cc27518b2588d40e7ad59eeee89e93b055 -SHA1 (patch-src_corelib_global_qglobal.h) = ba87f0711ed0151f3b98ca5269634d47b8cbd6c9 +SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0 +SHA1 (patch-src_corelib_global_qconfig-bootstrapped.h) = bb29280da569d5644ee4a45609fd7e672c7f4f63 SHA1 (patch-src_corelib_io_io.pri) = fd2f93b5af4dda729b274dd0d8f82ca29b3cb62a SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 37f61c305335ca6a690b0491220ca8de508bfdb6 -SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 3131d74a547abdcca7594b49b739cc1c0eed68f5 SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5 SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f -SHA1 (patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm) = 062b9e38ee6223281a6ae851aa5cb8ecae4c7874 SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 1655b2320b250defcfa406c95e58a1b728c0f2d9 SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 655ca6601ddd1768b92758cfdfd8d1c3514fba94 SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp index 1335cefb911..9e20ea77be9 100644 --- a/x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp +++ b/x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp @@ -1,11 +1,11 @@ -$NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.2 2018/01/17 19:30:47 markd Exp $ +$NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.3 2018/06/19 07:21:23 adam Exp $ -* Add DragonFly support -* Add NetBSD support +Add DragonFly support +Add NetBSD support ---- src/corelib/codecs/qiconvcodec.cpp.orig 2017-01-18 14:20:58.000000000 +0000 +--- src/corelib/codecs/qiconvcodec.cpp.orig 2018-05-14 04:46:28.000000000 +0000 +++ src/corelib/codecs/qiconvcodec.cpp -@@ -52,9 +52,14 @@ QT_REQUIRE_CONFIG(iconv); +@@ -51,9 +51,14 @@ QT_REQUIRE_CONFIG(iconv); #include <stdio.h> #include <dlfcn.h> @@ -16,12 +16,12 @@ $NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.2 2018/01/17 19:30:47 mark + // unistd.h is needed for the _XOPEN_UNIX macro #include <unistd.h> --#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) -+#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) || defined(Q_OS_NETBSD) || defined(__DragonFly__) +-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) ++#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) || defined(Q_OS_NETBSD) || defined(__DragonFly__) # include <langinfo.h> #endif -@@ -71,6 +76,9 @@ QT_REQUIRE_CONFIG(iconv); +@@ -70,6 +75,9 @@ QT_REQUIRE_CONFIG(iconv); # else # define UTF16 "UTF-16LE" # endif @@ -31,18 +31,12 @@ $NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.2 2018/01/17 19:30:47 mark #else # define UTF16 "UTF-16" #endif -@@ -444,11 +452,13 @@ iconv_t QIconvCodec::createIconv_t(const - #endif - const char *codeset = empty_codeset; - cd = iconv_open(to ? to : codeset, from ? from : codeset); -+#elif defined(__NetBSD) -+ const char *codeset = 0; - #else +@@ -447,7 +455,7 @@ iconv_t QIconvCodec::createIconv_t(const char *codeset = 0; #endif --#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) -+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) +-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) ++#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) || defined(Q_OS_NETBSD) || defined(__DragonFly__) if (cd == (iconv_t) -1) { codeset = nl_langinfo(CODESET); if (codeset) diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_global_qconfig-bootstrapped.h b/x11/qt5-qtbase/patches/patch-src_corelib_global_qconfig-bootstrapped.h index 80de4d1e86b..b2d4aefda95 100644 --- a/x11/qt5-qtbase/patches/patch-src_corelib_global_qconfig-bootstrapped.h +++ b/x11/qt5-qtbase/patches/patch-src_corelib_global_qconfig-bootstrapped.h @@ -1,13 +1,13 @@ -$NetBSD: patch-src_corelib_global_qconfig-bootstrapped.h,v 1.1 2018/01/31 12:36:57 jperkin Exp $ +$NetBSD: patch-src_corelib_global_qconfig-bootstrapped.h,v 1.2 2018/06/19 07:21:23 adam Exp $ SunOS does not have getauxval. ---- src/corelib/global/qconfig-bootstrapped.h.orig 2017-11-30 13:49:46.000000000 +0000 +--- src/corelib/global/qconfig-bootstrapped.h.orig 2018-05-14 04:46:28.000000000 +0000 +++ src/corelib/global/qconfig-bootstrapped.h -@@ -78,7 +78,11 @@ - #define QT_FEATURE_cxx11_random (QT_HAS_INCLUDE(<random>) ? 1 : -1) +@@ -79,7 +79,11 @@ #define QT_NO_DATASTREAM #define QT_FEATURE_datetimeparser -1 + #define QT_FEATURE_etw -1 +#ifdef __sun +# define QT_FEATURE_getauxval -1 +#else diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h b/x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h deleted file mode 100644 index 0a7dcc88402..00000000000 --- a/x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_corelib_global_qglobal.h,v 1.1 2018/04/19 08:23:12 jperkin Exp $ - -Pull in upstream fix from https://codereview.qt-project.org/#/c/221071 - ---- src/corelib/global/qglobal.h.orig 2018-02-08 18:24:48.000000000 +0000 -+++ src/corelib/global/qglobal.h -@@ -508,7 +508,7 @@ using qsizetype = QIntegerForSizeof<std: - # define Q_ALWAYS_INLINE inline - #endif - --#ifdef Q_CC_GNU -+#if defined(Q_CC_GNU) && defined(Q_OS_WIN) - # define QT_INIT_METAOBJECT __attribute__((init_priority(101))) - #else - # define QT_INIT_METAOBJECT diff --git a/x11/qt5-qtbase/patches/patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm b/x11/qt5-qtbase/patches/patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm deleted file mode 100644 index 50e734b6008..00000000000 --- a/x11/qt5-qtbase/patches/patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm,v 1.1 2018/01/31 14:08:26 adam Exp $ - -Fix compilation error. - ---- src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm.orig 2018-01-31 12:52:17.000000000 +0000 -+++ src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm -@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGly - - QFixed QCoreTextFontEngine::emSquareSize() const - { -- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); -+ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); - } - - QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const |