diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index 718c9b9d1a79..83322cbbfc7b 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -170,8 +170,7 @@ CONFIGURE_ARGS+= -verbose _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \ - ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf \ - ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_data_cmake_Qt5BasicConfig.cmake.in + ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf . if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 _EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \ diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 65eb9b143800..eb69867d2be1 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -22,7 +22,7 @@ _QT_MK_INCLUDED= qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 5 -QT5_VERSION?= 5.13.0 +QT5_VERSION?= 5.13.2 # We accept the Qt version to be passed by either or all of the three mk files. . if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS) diff --git a/comms/qt5-connectivity/Makefile b/comms/qt5-connectivity/Makefile index 407f58d5f6c1..95dad0a7d9aa 100644 --- a/comms/qt5-connectivity/Makefile +++ b/comms/qt5-connectivity/Makefile @@ -2,7 +2,6 @@ PORTNAME= connectivity DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt5- diff --git a/comms/qt5-sensors/Makefile b/comms/qt5-sensors/Makefile index 315e633a5b5f..556e740ec743 100644 --- a/comms/qt5-sensors/Makefile +++ b/comms/qt5-sensors/Makefile @@ -2,7 +2,6 @@ PORTNAME= sensors DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt5- diff --git a/comms/qt5-serialbus/Makefile b/comms/qt5-serialbus/Makefile index 83306da338bd..aeccbf4933ae 100644 --- a/comms/qt5-serialbus/Makefile +++ b/comms/qt5-serialbus/Makefile @@ -2,7 +2,6 @@ PORTNAME= serialbus DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt5- diff --git a/comms/qt5-serialport/Makefile b/comms/qt5-serialport/Makefile index cfdf7d911559..57d113647247 100644 --- a/comms/qt5-serialport/Makefile +++ b/comms/qt5-serialport/Makefile @@ -2,7 +2,6 @@ PORTNAME= serialport DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt5- diff --git a/databases/qt5-sql/Makefile b/databases/qt5-sql/Makefile index 20fbabb5da23..ae52f74ffee6 100644 --- a/databases/qt5-sql/Makefile +++ b/databases/qt5-sql/Makefile @@ -2,7 +2,6 @@ PORTNAME= sql DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-assistant/Makefile b/devel/qt5-assistant/Makefile index e45337e72407..f4c9bd227208 100644 --- a/devel/qt5-assistant/Makefile +++ b/devel/qt5-assistant/Makefile @@ -2,7 +2,6 @@ PORTNAME= assistant DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-buildtools/Makefile b/devel/qt5-buildtools/Makefile index a262f182a14e..ab86eed4f1f4 100644 --- a/devel/qt5-buildtools/Makefile +++ b/devel/qt5-buildtools/Makefile @@ -2,7 +2,6 @@ PORTNAME= buildtools DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-buildtools/pkg-plist b/devel/qt5-buildtools/pkg-plist index 7321b692565a..722ad634ffb7 100644 --- a/devel/qt5-buildtools/pkg-plist +++ b/devel/qt5-buildtools/pkg-plist @@ -4,3 +4,5 @@ %%QT_LIBDIR%%/libQt5Bootstrap.a %%QT_LIBDIR%%/libQt5Bootstrap.prl %%QT_MKSPECDIR%%/modules/qt_lib_bootstrap_private.pri +%%QT_CMAKEDIR%%/Qt5Bootstrap/Qt5BootstrapConfig.cmake +%%QT_CMAKEDIR%%/Qt5Bootstrap/Qt5BootstrapConfigVersion.cmake diff --git a/devel/qt5-concurrent/Makefile b/devel/qt5-concurrent/Makefile index 61442887fb97..cc9b3a04fc51 100644 --- a/devel/qt5-concurrent/Makefile +++ b/devel/qt5-concurrent/Makefile @@ -2,7 +2,6 @@ PORTNAME= concurrent DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index 8fff0c19f58f..c8188323842f 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -2,7 +2,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-dbus/Makefile b/devel/qt5-dbus/Makefile index 31e054bb1892..bb1b65531d34 100644 --- a/devel/qt5-dbus/Makefile +++ b/devel/qt5-dbus/Makefile @@ -2,7 +2,6 @@ PORTNAME= dbus DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-designer/Makefile b/devel/qt5-designer/Makefile index 1fe82c4ddbc9..098bf1efac76 100644 --- a/devel/qt5-designer/Makefile +++ b/devel/qt5-designer/Makefile @@ -2,7 +2,6 @@ PORTNAME= designer DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-designer/pkg-plist b/devel/qt5-designer/pkg-plist index f98a8c8d9dbc..f37efab0fed4 100644 --- a/devel/qt5-designer/pkg-plist +++ b/devel/qt5-designer/pkg-plist @@ -178,6 +178,8 @@ %%QT_CMAKEDIR%%/Qt5Designer/Qt5DesignerConfig.cmake %%QT_CMAKEDIR%%/Qt5Designer/Qt5DesignerConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake +%%QT_CMAKEDIR%%/Qt5DesignerComponents/Qt5DesignerComponentsConfig.cmake +%%QT_CMAKEDIR%%/Qt5DesignerComponents/Qt5DesignerComponentsConfigVersion.cmake %%WEBKIT%%%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake %%QT_BINDIR%%/designer %%QT_LIBDIR%%/libQt5Designer.prl diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile index 86387e37905b..6b05aab6cc33 100644 --- a/devel/qt5-help/Makefile +++ b/devel/qt5-help/Makefile @@ -2,7 +2,6 @@ PORTNAME= help DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-linguist/Makefile b/devel/qt5-linguist/Makefile index 31c62b25b725..b774755429ef 100644 --- a/devel/qt5-linguist/Makefile +++ b/devel/qt5-linguist/Makefile @@ -2,7 +2,6 @@ PORTNAME= linguist DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-linguisttools/Makefile b/devel/qt5-linguisttools/Makefile index 47a9c27f36ad..dd095a8ee2f6 100644 --- a/devel/qt5-linguisttools/Makefile +++ b/devel/qt5-linguisttools/Makefile @@ -2,7 +2,6 @@ PORTNAME= linguisttools DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-linguisttools/files/patch-src_linguist_lrelease_main.cpp b/devel/qt5-linguisttools/files/patch-src_linguist_lrelease_main.cpp deleted file mode 100644 index 2cee8e13ace2..000000000000 --- a/devel/qt5-linguisttools/files/patch-src_linguist_lrelease_main.cpp +++ /dev/null @@ -1,19 +0,0 @@ -This is upstream as - -https://code.qt.io/cgit/qt/qttools.git/commit/src/linguist/lrelease?h=5.13.1&id=6a832f5474d3b4f789e4bcdebcd425e5ec98423f - -in 5.13.1 - ---- src/linguist/lrelease/main.cpp.orig 2019-09-01 11:53:23 UTC -+++ src/linguist/lrelease/main.cpp -@@ -180,7 +180,9 @@ static QStringList translationsFromProjects(const Proj - - static QStringList translationsFromProject(const Project &project, bool topLevel) - { -- QStringList result = *project.translations; -+ QStringList result; -+ if (project.translations) -+ result << *project.translations; - result << translationsFromProjects(project.subProjects, false); - if (topLevel && result.isEmpty()) { - printErr(LR::tr("lrelease warning: Met no 'TRANSLATIONS' entry in project file '%1'\n") diff --git a/devel/qt5-location/Makefile b/devel/qt5-location/Makefile index 13553465c697..4deabe000ac1 100644 --- a/devel/qt5-location/Makefile +++ b/devel/qt5-location/Makefile @@ -2,7 +2,6 @@ PORTNAME= location DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-qdbus/Makefile b/devel/qt5-qdbus/Makefile index 57ccc6fdf576..1f43f0470b62 100644 --- a/devel/qt5-qdbus/Makefile +++ b/devel/qt5-qdbus/Makefile @@ -2,7 +2,6 @@ PORTNAME= qdbus DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-qdbusviewer/Makefile b/devel/qt5-qdbusviewer/Makefile index e31bbf027ccc..4e85a308e30b 100644 --- a/devel/qt5-qdbusviewer/Makefile +++ b/devel/qt5-qdbusviewer/Makefile @@ -2,7 +2,6 @@ PORTNAME= qdbusviewer DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-qdoc-data/pkg-plist b/devel/qt5-qdoc-data/pkg-plist index dbdec877d3cf..12240d6a7712 100644 --- a/devel/qt5-qdoc-data/pkg-plist +++ b/devel/qt5-qdoc-data/pkg-plist @@ -13,6 +13,7 @@ %%QT_DOCDIR%%/global/html-header-online.qdocconf %%QT_DOCDIR%%/global/includes-online/search.qdoc %%QT_DOCDIR%%/global/includes/examples-run.qdocinc +%%QT_DOCDIR%%/global/includes/module-use.qdocinc %%QT_DOCDIR%%/global/macros.qdocconf %%QT_DOCDIR%%/global/manifest-meta.qdocconf %%QT_DOCDIR%%/global/qt-cpp-defines.qdocconf diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile index c4e6df909c62..3199162c3e0e 100644 --- a/devel/qt5-qdoc/Makefile +++ b/devel/qt5-qdoc/Makefile @@ -2,7 +2,6 @@ PORTNAME= qdoc DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel textproc PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-qmake/pkg-plist b/devel/qt5-qmake/pkg-plist index 24a0a8e6e488..a6b929422f15 100644 --- a/devel/qt5-qmake/pkg-plist +++ b/devel/qt5-qmake/pkg-plist @@ -165,6 +165,7 @@ %%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf %%QT_MKSPECDIR%%/features/android/resolve_target.prf %%QT_MKSPECDIR%%/features/android/sdk.prf +%%QT_MKSPECDIR%%/features/android/spec_post.prf %%QT_MKSPECDIR%%/features/benchmark.prf %%QT_MKSPECDIR%%/features/build_pass.prf %%QT_MKSPECDIR%%/features/cmake_functions.prf @@ -252,6 +253,7 @@ %%QT_MKSPECDIR%%/features/qt_module_pris.prf %%QT_MKSPECDIR%%/features/qt_parts.prf %%QT_MKSPECDIR%%/features/qt_plugin.prf +%%QT_MKSPECDIR%%/features/qt_prefix_build_check.prf %%QT_MKSPECDIR%%/features/qt_targets.prf %%QT_MKSPECDIR%%/features/qt_test_helper.prf %%QT_MKSPECDIR%%/features/qt_tool.prf diff --git a/devel/qt5-remoteobjects/Makefile b/devel/qt5-remoteobjects/Makefile index e1b0dd477020..474cf7d97554 100644 --- a/devel/qt5-remoteobjects/Makefile +++ b/devel/qt5-remoteobjects/Makefile @@ -2,7 +2,6 @@ PORTNAME= remoteobjects DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-remoteobjects/pkg-plist b/devel/qt5-remoteobjects/pkg-plist index 220fda3610a6..ee47a61f1b81 100644 --- a/devel/qt5-remoteobjects/pkg-plist +++ b/devel/qt5-remoteobjects/pkg-plist @@ -70,6 +70,7 @@ %%QT_LIBDIR%%/libQt5RemoteObjects.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5RemoteObjects.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5RemoteObjects.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt5RepParser.prl %%QT_MKSPECDIR%%/features/remoteobjects_repc.prf %%QT_MKSPECDIR%%/features/repcclient.pri %%QT_MKSPECDIR%%/features/repccommon.pri @@ -89,3 +90,4 @@ %%QT_QMLDIR%%/QtRemoteObjects/plugins.qmltypes %%QT_QMLDIR%%/QtRemoteObjects/qmldir libdata/pkgconfig/Qt5RemoteObjects.pc +libdata/pkgconfig/Qt5RepParser.pc diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile index bf840672f0a8..fa519ba36781 100644 --- a/devel/qt5-script/Makefile +++ b/devel/qt5-script/Makefile @@ -2,7 +2,6 @@ PORTNAME= script DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-scripttools/Makefile b/devel/qt5-scripttools/Makefile index 9c06c9382058..057be36faf30 100644 --- a/devel/qt5-scripttools/Makefile +++ b/devel/qt5-scripttools/Makefile @@ -2,7 +2,6 @@ PORTNAME= scripttools DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-scxml/Makefile b/devel/qt5-scxml/Makefile index 359d751a60c1..d994bca6eaaf 100644 --- a/devel/qt5-scxml/Makefile +++ b/devel/qt5-scxml/Makefile @@ -2,7 +2,6 @@ PORTNAME= scxml DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-testlib/Makefile b/devel/qt5-testlib/Makefile index 21bc762a05cd..52a3d32e83a0 100644 --- a/devel/qt5-testlib/Makefile +++ b/devel/qt5-testlib/Makefile @@ -2,7 +2,6 @@ PORTNAME= testlib DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-uitools/Makefile b/devel/qt5-uitools/Makefile index 7519a61dfa36..7bca3c5cdc0a 100644 --- a/devel/qt5-uitools/Makefile +++ b/devel/qt5-uitools/Makefile @@ -2,7 +2,6 @@ PORTNAME= uitools DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5/distinfo b/devel/qt5/distinfo index 5e7e4d3c0794..5abbfba5d52f 100644 --- a/devel/qt5/distinfo +++ b/devel/qt5/distinfo @@ -1,81 +1,81 @@ -TIMESTAMP = 1561315565 -SHA256 (KDE/Qt/5.13.0/qt3d-everywhere-src-5.13.0.tar.xz) = 9f6b317acbcf483bf78465956669957eb19fdd8df610e9a580d42017e629ec4f -SIZE (KDE/Qt/5.13.0/qt3d-everywhere-src-5.13.0.tar.xz) = 84982424 -SHA256 (KDE/Qt/5.13.0/qtactiveqt-everywhere-src-5.13.0.tar.xz) = 7abccc4dfc8891dc96594ace38cfe006ff7fd0eaffcb49c856f4e60119357323 -SIZE (KDE/Qt/5.13.0/qtactiveqt-everywhere-src-5.13.0.tar.xz) = 263492 -SHA256 (KDE/Qt/5.13.0/qtandroidextras-everywhere-src-5.13.0.tar.xz) = d49a2e60348affb4cf367d29ed307d162ace27e41c5a947dd7c712d816dccea2 -SIZE (KDE/Qt/5.13.0/qtandroidextras-everywhere-src-5.13.0.tar.xz) = 105200 -SHA256 (KDE/Qt/5.13.0/qtbase-everywhere-src-5.13.0.tar.xz) = ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe -SIZE (KDE/Qt/5.13.0/qtbase-everywhere-src-5.13.0.tar.xz) = 48640652 -SHA256 (KDE/Qt/5.13.0/qtcharts-everywhere-src-5.13.0.tar.xz) = 04e381ec287edf230583eb32fbcde40bce62119d3eabbe2978f4ce8366e36b27 -SIZE (KDE/Qt/5.13.0/qtcharts-everywhere-src-5.13.0.tar.xz) = 4245840 -SHA256 (KDE/Qt/5.13.0/qtconnectivity-everywhere-src-5.13.0.tar.xz) = 64fad0692c639d25295cc85f12526f3fe2eaeb51bcf47d8561ad00dd57ad5053 -SIZE (KDE/Qt/5.13.0/qtconnectivity-everywhere-src-5.13.0.tar.xz) = 2758792 -SHA256 (KDE/Qt/5.13.0/qtdatavis3d-everywhere-src-5.13.0.tar.xz) = 6f4e5dd8e7a94d117f374a9b66013e373f5c1ccf963ad6556bf1fc8baf783821 -SIZE (KDE/Qt/5.13.0/qtdatavis3d-everywhere-src-5.13.0.tar.xz) = 5200160 -SHA256 (KDE/Qt/5.13.0/qtdeclarative-everywhere-src-5.13.0.tar.xz) = b9e8780aef0af4a60e64dcc405bdf5c03a04b28e3b94d5c2e69d0006db566ba9 -SIZE (KDE/Qt/5.13.0/qtdeclarative-everywhere-src-5.13.0.tar.xz) = 20514784 -SHA256 (KDE/Qt/5.13.0/qtdoc-everywhere-src-5.13.0.tar.xz) = 7e5202b83e91555c7f0842918332b4d623828002b46fde93014a32c6beea8106 -SIZE (KDE/Qt/5.13.0/qtdoc-everywhere-src-5.13.0.tar.xz) = 5726900 -SHA256 (KDE/Qt/5.13.0/qtgamepad-everywhere-src-5.13.0.tar.xz) = 6bc1086d8c6a36a80dfa939b5ecb372be8c913a81e2986d84302012eafdc4b63 -SIZE (KDE/Qt/5.13.0/qtgamepad-everywhere-src-5.13.0.tar.xz) = 385944 -SHA256 (KDE/Qt/5.13.0/qtgraphicaleffects-everywhere-src-5.13.0.tar.xz) = 33bf92d6560d4d7b87f3e99dfacbc9cafc7ea5ef3d40f00cc3777a005251d0ff -SIZE (KDE/Qt/5.13.0/qtgraphicaleffects-everywhere-src-5.13.0.tar.xz) = 14270956 -SHA256 (KDE/Qt/5.13.0/qtimageformats-everywhere-src-5.13.0.tar.xz) = 91cb638e5f856acc17ab5a2e1a052dc91bb1af2bdbd7d99ba6a8a48f4a15f499 -SIZE (KDE/Qt/5.13.0/qtimageformats-everywhere-src-5.13.0.tar.xz) = 1800908 -SHA256 (KDE/Qt/5.13.0/qtlocation-everywhere-src-5.13.0.tar.xz) = 205a47d259841b3879c59d3054d8b1098d3b0e7b45c64ad327daedefb4421414 -SIZE (KDE/Qt/5.13.0/qtlocation-everywhere-src-5.13.0.tar.xz) = 6112360 -SHA256 (KDE/Qt/5.13.0/qtlottie-everywhere-src-5.13.0.tar.xz) = 5315e8a5d1ab76b61e1cf5f88f5ed43fe06b91ec732139902c9a242ac5ea714c -SIZE (KDE/Qt/5.13.0/qtlottie-everywhere-src-5.13.0.tar.xz) = 81940 -SHA256 (KDE/Qt/5.13.0/qtmacextras-everywhere-src-5.13.0.tar.xz) = 6a4effe1378e9ce27d3731ff5306929d252587e2c3a81c04979b9609702527e1 -SIZE (KDE/Qt/5.13.0/qtmacextras-everywhere-src-5.13.0.tar.xz) = 68800 -SHA256 (KDE/Qt/5.13.0/qtmultimedia-everywhere-src-5.13.0.tar.xz) = 5076219d277083d2535e5f739d06783abe2e059e9d3fd9f924a1fa7970946d72 -SIZE (KDE/Qt/5.13.0/qtmultimedia-everywhere-src-5.13.0.tar.xz) = 3743064 -SHA256 (KDE/Qt/5.13.0/qtnetworkauth-everywhere-src-5.13.0.tar.xz) = 91ff879d0a9f7e8ff658fb569136f102ee9f25bd47852e97a1f39826c1932c0d -SIZE (KDE/Qt/5.13.0/qtnetworkauth-everywhere-src-5.13.0.tar.xz) = 140932 -SHA256 (KDE/Qt/5.13.0/qtpurchasing-everywhere-src-5.13.0.tar.xz) = 8aba72cf543f3ef26d128824f844487beea319fbd155931a8771afcf48cdeb7e -SIZE (KDE/Qt/5.13.0/qtpurchasing-everywhere-src-5.13.0.tar.xz) = 207784 -SHA256 (KDE/Qt/5.13.0/qtquickcontrols-everywhere-src-5.13.0.tar.xz) = a5c6d40e0432246129d3f350a9aa419901dd73f2e4f8af6efb7a3e86e57ae167 -SIZE (KDE/Qt/5.13.0/qtquickcontrols-everywhere-src-5.13.0.tar.xz) = 6056676 -SHA256 (KDE/Qt/5.13.0/qtquickcontrols2-everywhere-src-5.13.0.tar.xz) = a5cb7e6d68285203bfb1aee87551228879fa9d93d87be5c8bab38e5a79dc916d -SIZE (KDE/Qt/5.13.0/qtquickcontrols2-everywhere-src-5.13.0.tar.xz) = 9227220 -SHA256 (KDE/Qt/5.13.0/qtremoteobjects-everywhere-src-5.13.0.tar.xz) = 24b2fc953ab4db7f46d8b7da38fef2483b2e9a51ea6836007077947e246fdadc -SIZE (KDE/Qt/5.13.0/qtremoteobjects-everywhere-src-5.13.0.tar.xz) = 346092 -SHA256 (KDE/Qt/5.13.0/qtscript-everywhere-src-5.13.0.tar.xz) = 2323eb93a215b837d8d276f7f35e7dfb6a28b952d8b51fb92c60619813a37a80 -SIZE (KDE/Qt/5.13.0/qtscript-everywhere-src-5.13.0.tar.xz) = 2674484 -SHA256 (KDE/Qt/5.13.0/qtscxml-everywhere-src-5.13.0.tar.xz) = fcd5b347a51d47b70b8192a20934951bb80cafa18fa55413ffc9e1fcb1bb2766 -SIZE (KDE/Qt/5.13.0/qtscxml-everywhere-src-5.13.0.tar.xz) = 434276 -SHA256 (KDE/Qt/5.13.0/qtsensors-everywhere-src-5.13.0.tar.xz) = 1fae52836c786a9fd50e9e1d590384b9aea479f4569e33fc2d69536bbe2cde48 -SIZE (KDE/Qt/5.13.0/qtsensors-everywhere-src-5.13.0.tar.xz) = 2036004 -SHA256 (KDE/Qt/5.13.0/qtserialbus-everywhere-src-5.13.0.tar.xz) = 5ef8ce8d7dbdd4065e1a1e842d7effb7134ce262790fcd59076937f3b40b78f3 -SIZE (KDE/Qt/5.13.0/qtserialbus-everywhere-src-5.13.0.tar.xz) = 330256 -SHA256 (KDE/Qt/5.13.0/qtserialport-everywhere-src-5.13.0.tar.xz) = 2f58309789e1d6b3a2653922f932703cfffddaea06bff63a552900bd63beb985 -SIZE (KDE/Qt/5.13.0/qtserialport-everywhere-src-5.13.0.tar.xz) = 302836 -SHA256 (KDE/Qt/5.13.0/qtspeech-everywhere-src-5.13.0.tar.xz) = 1bfeea13cc23a9d9a02081f4e3378bc8ef51af5dfd684b261cf0a0e93be5b644 -SIZE (KDE/Qt/5.13.0/qtspeech-everywhere-src-5.13.0.tar.xz) = 99952 -SHA256 (KDE/Qt/5.13.0/qtsvg-everywhere-src-5.13.0.tar.xz) = 0f568e20d13418c6d8e395db2ce4d2d706d3fb470cd665853e3637a29fde0eaf -SIZE (KDE/Qt/5.13.0/qtsvg-everywhere-src-5.13.0.tar.xz) = 1859144 -SHA256 (KDE/Qt/5.13.0/qttools-everywhere-src-5.13.0.tar.xz) = a7887a618dc6434c2567521990c2a7ca72ca6a8379c1d93c5aa6c1798d7a0819 -SIZE (KDE/Qt/5.13.0/qttools-everywhere-src-5.13.0.tar.xz) = 9083492 -SHA256 (KDE/Qt/5.13.0/qttranslations-everywhere-src-5.13.0.tar.xz) = 2f8fb3b2c62fcf1aacd0b32432b960a83546384688c0ea78514e4cf4f2f94c28 -SIZE (KDE/Qt/5.13.0/qttranslations-everywhere-src-5.13.0.tar.xz) = 1379324 -SHA256 (KDE/Qt/5.13.0/qtvirtualkeyboard-everywhere-src-5.13.0.tar.xz) = 91483feb79c648ec8820a238ee2a12cf1aa117e8f3a5b06d069450e0c9ad42e9 -SIZE (KDE/Qt/5.13.0/qtvirtualkeyboard-everywhere-src-5.13.0.tar.xz) = 10918808 -SHA256 (KDE/Qt/5.13.0/qtwayland-everywhere-src-5.13.0.tar.xz) = b67a6d8119628bca3301bd03992880db07d61d405534067c9cd2a598695a7cf3 -SIZE (KDE/Qt/5.13.0/qtwayland-everywhere-src-5.13.0.tar.xz) = 478076 -SHA256 (KDE/Qt/5.13.0/qtwebchannel-everywhere-src-5.13.0.tar.xz) = 7f6260c73bca968511ab2facfbb14b4d8cc7a9c5b2d0f9211e7390ed8fb52b9a -SIZE (KDE/Qt/5.13.0/qtwebchannel-everywhere-src-5.13.0.tar.xz) = 183296 -SHA256 (KDE/Qt/5.13.0/qtwebengine-everywhere-src-5.13.0.tar.xz) = e0af82ecee1ab41b6732697f667b98b7b0c53164bebcfaad8070e88b2e064efe -SIZE (KDE/Qt/5.13.0/qtwebengine-everywhere-src-5.13.0.tar.xz) = 256899724 -SHA256 (KDE/Qt/5.13.0/qtwebglplugin-everywhere-src-5.13.0.tar.xz) = b8f05ee429f3fb7d6cef789333ddb56aafdc30a83e05b04f5f9e05650146c06e -SIZE (KDE/Qt/5.13.0/qtwebglplugin-everywhere-src-5.13.0.tar.xz) = 73464 -SHA256 (KDE/Qt/5.13.0/qtwebsockets-everywhere-src-5.13.0.tar.xz) = f941dd44f6e16041a25723c1b70ce9e28910c630509da0044ecb9fdda28a6e34 -SIZE (KDE/Qt/5.13.0/qtwebsockets-everywhere-src-5.13.0.tar.xz) = 235516 -SHA256 (KDE/Qt/5.13.0/qtwebview-everywhere-src-5.13.0.tar.xz) = 090da2f41b3ea40e73d3a7d7d873492bb911a3492376bb44daee917b459535a9 -SIZE (KDE/Qt/5.13.0/qtwebview-everywhere-src-5.13.0.tar.xz) = 131236 -SHA256 (KDE/Qt/5.13.0/qtwinextras-everywhere-src-5.13.0.tar.xz) = 096387a674f7fa1faeda856b87e965bd2937e3dcce334f10df694468003887d4 -SIZE (KDE/Qt/5.13.0/qtwinextras-everywhere-src-5.13.0.tar.xz) = 759460 -SHA256 (KDE/Qt/5.13.0/qtx11extras-everywhere-src-5.13.0.tar.xz) = f33fe1cf2258bc972171f723c6f37208da47f578b09876fea47c7ba558a8f1d6 -SIZE (KDE/Qt/5.13.0/qtx11extras-everywhere-src-5.13.0.tar.xz) = 115876 -SHA256 (KDE/Qt/5.13.0/qtxmlpatterns-everywhere-src-5.13.0.tar.xz) = 75186ff075d9a3bd30cee145bad6bc69d491b5e555b048d11136727f050d7319 -SIZE (KDE/Qt/5.13.0/qtxmlpatterns-everywhere-src-5.13.0.tar.xz) = 1389724 +TIMESTAMP = 1572554821 +SHA256 (KDE/Qt/5.13.2/qt3d-everywhere-src-5.13.2.tar.xz) = d1b9fc0be82264b5f76c3a5330901dff95c1f2bcb67916c3fac6bad4ff69adc9 +SIZE (KDE/Qt/5.13.2/qt3d-everywhere-src-5.13.2.tar.xz) = 81537856 +SHA256 (KDE/Qt/5.13.2/qtactiveqt-everywhere-src-5.13.2.tar.xz) = 0f34a2f59a4438b4d060066eaed35e0f738d620b42782d598bad2f1a56cc094a +SIZE (KDE/Qt/5.13.2/qtactiveqt-everywhere-src-5.13.2.tar.xz) = 264608 +SHA256 (KDE/Qt/5.13.2/qtandroidextras-everywhere-src-5.13.2.tar.xz) = 403e8f463552564333b1a4d2e0a52c28b27296d096737e55a2327642a7277af8 +SIZE (KDE/Qt/5.13.2/qtandroidextras-everywhere-src-5.13.2.tar.xz) = 105628 +SHA256 (KDE/Qt/5.13.2/qtbase-everywhere-src-5.13.2.tar.xz) = 26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121 +SIZE (KDE/Qt/5.13.2/qtbase-everywhere-src-5.13.2.tar.xz) = 48735704 +SHA256 (KDE/Qt/5.13.2/qtcharts-everywhere-src-5.13.2.tar.xz) = 3bad81c3cfb32cf72fb0ce2ac2794d031cf78a3902b4715f89c09b2d0e041e87 +SIZE (KDE/Qt/5.13.2/qtcharts-everywhere-src-5.13.2.tar.xz) = 4244092 +SHA256 (KDE/Qt/5.13.2/qtconnectivity-everywhere-src-5.13.2.tar.xz) = 644e234eb64f602ef5cdeb8802ef9b58e75478f1124f001937275d62ed692e17 +SIZE (KDE/Qt/5.13.2/qtconnectivity-everywhere-src-5.13.2.tar.xz) = 2777504 +SHA256 (KDE/Qt/5.13.2/qtdatavis3d-everywhere-src-5.13.2.tar.xz) = ecf934c3eb07173505781734f95cfc2cf9d89e6b1b98516ac98a137797f4ef28 +SIZE (KDE/Qt/5.13.2/qtdatavis3d-everywhere-src-5.13.2.tar.xz) = 5182216 +SHA256 (KDE/Qt/5.13.2/qtdeclarative-everywhere-src-5.13.2.tar.xz) = d9a524f45fe9e136cda2252f9d7013ec17046d907e3f39606db920987c22d1fd +SIZE (KDE/Qt/5.13.2/qtdeclarative-everywhere-src-5.13.2.tar.xz) = 20940748 +SHA256 (KDE/Qt/5.13.2/qtdoc-everywhere-src-5.13.2.tar.xz) = be09543143d5dca984d2c2d9085751317e7a95b78fdbe9b6a30f2faa03543e46 +SIZE (KDE/Qt/5.13.2/qtdoc-everywhere-src-5.13.2.tar.xz) = 5747084 +SHA256 (KDE/Qt/5.13.2/qtgamepad-everywhere-src-5.13.2.tar.xz) = 75164885433e36a90b557aa7f319ff3d6278c3616469f67b42dda6eb8b92e76e +SIZE (KDE/Qt/5.13.2/qtgamepad-everywhere-src-5.13.2.tar.xz) = 386668 +SHA256 (KDE/Qt/5.13.2/qtgraphicaleffects-everywhere-src-5.13.2.tar.xz) = 297a89bb6c771f849c4ce866e5c98dadf665163b3dab03bc48a58f51424e7e66 +SIZE (KDE/Qt/5.13.2/qtgraphicaleffects-everywhere-src-5.13.2.tar.xz) = 14845928 +SHA256 (KDE/Qt/5.13.2/qtimageformats-everywhere-src-5.13.2.tar.xz) = 6968649fdccc7d633cf9ada25f1bdaf0a2fb45a214d58c2c47896166d4553ac0 +SIZE (KDE/Qt/5.13.2/qtimageformats-everywhere-src-5.13.2.tar.xz) = 1803796 +SHA256 (KDE/Qt/5.13.2/qtlocation-everywhere-src-5.13.2.tar.xz) = 5fe4b824d3dc6c800682ff986333ec09edb9c27582066e928b1862b4d58212e3 +SIZE (KDE/Qt/5.13.2/qtlocation-everywhere-src-5.13.2.tar.xz) = 6050044 +SHA256 (KDE/Qt/5.13.2/qtlottie-everywhere-src-5.13.2.tar.xz) = af9a10aaa110767ffd88e02cb8ad0a3930ccfeb61f0c125afbf3791136d36253 +SIZE (KDE/Qt/5.13.2/qtlottie-everywhere-src-5.13.2.tar.xz) = 82052 +SHA256 (KDE/Qt/5.13.2/qtmacextras-everywhere-src-5.13.2.tar.xz) = 545ede0783ebc2405c6efa6ed0b2b7147a1d7e60eb7fcb853abfca0a9cb65ed5 +SIZE (KDE/Qt/5.13.2/qtmacextras-everywhere-src-5.13.2.tar.xz) = 69164 +SHA256 (KDE/Qt/5.13.2/qtmultimedia-everywhere-src-5.13.2.tar.xz) = 5f885459d46ea2f2bb24597678befd4913d8f88029730d01984f51f9c367b9f4 +SIZE (KDE/Qt/5.13.2/qtmultimedia-everywhere-src-5.13.2.tar.xz) = 3820660 +SHA256 (KDE/Qt/5.13.2/qtnetworkauth-everywhere-src-5.13.2.tar.xz) = 6326943e5c1a3e6eac8dcc44d088f1a3d1c45d14100ff1e95f833b0463243af3 +SIZE (KDE/Qt/5.13.2/qtnetworkauth-everywhere-src-5.13.2.tar.xz) = 141172 +SHA256 (KDE/Qt/5.13.2/qtpurchasing-everywhere-src-5.13.2.tar.xz) = e9ef800b7d79f660c72f7024f82a2915b1111b47417f93c3dc2354b9bf307ff4 +SIZE (KDE/Qt/5.13.2/qtpurchasing-everywhere-src-5.13.2.tar.xz) = 208096 +SHA256 (KDE/Qt/5.13.2/qtquickcontrols-everywhere-src-5.13.2.tar.xz) = d6e64d8db13ada55fcb0d5e8ca26097085680087d931435c6c6db859d87493ea +SIZE (KDE/Qt/5.13.2/qtquickcontrols-everywhere-src-5.13.2.tar.xz) = 5955448 +SHA256 (KDE/Qt/5.13.2/qtquickcontrols2-everywhere-src-5.13.2.tar.xz) = 90ee8be7b66cc65f3f22e71a0b35adab5c169ac4f8ebc6f9e7685228bf8a7d70 +SIZE (KDE/Qt/5.13.2/qtquickcontrols2-everywhere-src-5.13.2.tar.xz) = 9252912 +SHA256 (KDE/Qt/5.13.2/qtremoteobjects-everywhere-src-5.13.2.tar.xz) = bd24db9d2bb08ae7955291af52ee7510aa193d0f72ed0e3ff74f7cf7e81f4d65 +SIZE (KDE/Qt/5.13.2/qtremoteobjects-everywhere-src-5.13.2.tar.xz) = 367032 +SHA256 (KDE/Qt/5.13.2/qtscript-everywhere-src-5.13.2.tar.xz) = 3d92691c25577fbf7511d40253de0cd9d31444ea5a0aa860f65efb9fa0f3ce70 +SIZE (KDE/Qt/5.13.2/qtscript-everywhere-src-5.13.2.tar.xz) = 2696452 +SHA256 (KDE/Qt/5.13.2/qtscxml-everywhere-src-5.13.2.tar.xz) = e489dff21e18c1e7f72ffd31af82404f845bd90824c6b978140591366398a9d9 +SIZE (KDE/Qt/5.13.2/qtscxml-everywhere-src-5.13.2.tar.xz) = 435428 +SHA256 (KDE/Qt/5.13.2/qtsensors-everywhere-src-5.13.2.tar.xz) = 46f73bbfddfd78a419c6424d6839318774b84c955a7f7a96c12c590f6d8fb177 +SIZE (KDE/Qt/5.13.2/qtsensors-everywhere-src-5.13.2.tar.xz) = 2046708 +SHA256 (KDE/Qt/5.13.2/qtserialbus-everywhere-src-5.13.2.tar.xz) = 48159393b1368976b5324eac48424e2a6e5d63c783194d0576a978151f882da3 +SIZE (KDE/Qt/5.13.2/qtserialbus-everywhere-src-5.13.2.tar.xz) = 338428 +SHA256 (KDE/Qt/5.13.2/qtserialport-everywhere-src-5.13.2.tar.xz) = 7677ffc1dce3b75c0a98d07d215588a8dccb5c276c55b4ecd60c35ed1c89cb34 +SIZE (KDE/Qt/5.13.2/qtserialport-everywhere-src-5.13.2.tar.xz) = 310736 +SHA256 (KDE/Qt/5.13.2/qtspeech-everywhere-src-5.13.2.tar.xz) = a0aca08feeac6925ead7f841319bdcfd60bfc126de07807edaf267c2ca8d13d5 +SIZE (KDE/Qt/5.13.2/qtspeech-everywhere-src-5.13.2.tar.xz) = 100312 +SHA256 (KDE/Qt/5.13.2/qtsvg-everywhere-src-5.13.2.tar.xz) = 849e2e357e1333b64ecb728352f652cd8d916f029ed848f775b15d0b500cb7d7 +SIZE (KDE/Qt/5.13.2/qtsvg-everywhere-src-5.13.2.tar.xz) = 1890380 +SHA256 (KDE/Qt/5.13.2/qttools-everywhere-src-5.13.2.tar.xz) = 919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e +SIZE (KDE/Qt/5.13.2/qttools-everywhere-src-5.13.2.tar.xz) = 9110256 +SHA256 (KDE/Qt/5.13.2/qttranslations-everywhere-src-5.13.2.tar.xz) = 25755941a2525de2d7ae48e0011d04db7cc09e4e73fe83293206ceafa0aa82d9 +SIZE (KDE/Qt/5.13.2/qttranslations-everywhere-src-5.13.2.tar.xz) = 1365880 +SHA256 (KDE/Qt/5.13.2/qtvirtualkeyboard-everywhere-src-5.13.2.tar.xz) = 8e368dde237d21666f6cc8512a060e205388e519a4d7559c0505cc75224ed62b +SIZE (KDE/Qt/5.13.2/qtvirtualkeyboard-everywhere-src-5.13.2.tar.xz) = 10923292 +SHA256 (KDE/Qt/5.13.2/qtwayland-everywhere-src-5.13.2.tar.xz) = 3c9b2358d9cee02552b875db93b56f3b9bc3b0f4df7a2ff7e8b72f2a8f2ca952 +SIZE (KDE/Qt/5.13.2/qtwayland-everywhere-src-5.13.2.tar.xz) = 495536 +SHA256 (KDE/Qt/5.13.2/qtwebchannel-everywhere-src-5.13.2.tar.xz) = f452d419d8b19b566835f316bbf282dabc8b1c2a74c9c98c1aec4184465e9c13 +SIZE (KDE/Qt/5.13.2/qtwebchannel-everywhere-src-5.13.2.tar.xz) = 192652 +SHA256 (KDE/Qt/5.13.2/qtwebengine-everywhere-src-5.13.2.tar.xz) = adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb +SIZE (KDE/Qt/5.13.2/qtwebengine-everywhere-src-5.13.2.tar.xz) = 255593964 +SHA256 (KDE/Qt/5.13.2/qtwebglplugin-everywhere-src-5.13.2.tar.xz) = ae369929d5a3356391bccd25cac22846dc44cbb726ce7b60924f53944addabb7 +SIZE (KDE/Qt/5.13.2/qtwebglplugin-everywhere-src-5.13.2.tar.xz) = 73608 +SHA256 (KDE/Qt/5.13.2/qtwebsockets-everywhere-src-5.13.2.tar.xz) = fc11236c8bf69b27a4e237a27b9ea27fc90d8c25d81d1d451ce3a0b63cbc02d3 +SIZE (KDE/Qt/5.13.2/qtwebsockets-everywhere-src-5.13.2.tar.xz) = 244668 +SHA256 (KDE/Qt/5.13.2/qtwebview-everywhere-src-5.13.2.tar.xz) = 394cc7a9cb29b7883816ff3137b022f30568151aada0739fc99a23789c21c015 +SIZE (KDE/Qt/5.13.2/qtwebview-everywhere-src-5.13.2.tar.xz) = 131168 +SHA256 (KDE/Qt/5.13.2/qtwinextras-everywhere-src-5.13.2.tar.xz) = e94d70f68dacbcfa2bb0cbe53c7024083b16d5d44806c107fe268d34028cb779 +SIZE (KDE/Qt/5.13.2/qtwinextras-everywhere-src-5.13.2.tar.xz) = 760204 +SHA256 (KDE/Qt/5.13.2/qtx11extras-everywhere-src-5.13.2.tar.xz) = 95a7c5c30f42e9575c3a17a2c0eb0cdbdd2d89dbcb3ee1426cd41bb07e28c51c +SIZE (KDE/Qt/5.13.2/qtx11extras-everywhere-src-5.13.2.tar.xz) = 127228 +SHA256 (KDE/Qt/5.13.2/qtxmlpatterns-everywhere-src-5.13.2.tar.xz) = 1e87d8c004ec0beea3b29d13f0964c563aa9fae51c392c998750ca4e386374e2 +SIZE (KDE/Qt/5.13.2/qtxmlpatterns-everywhere-src-5.13.2.tar.xz) = 1392192 diff --git a/devel/qt5/files/extrapatch-mkspecs_features_data_cmake_Qt5BasicConfig.cmake.in b/devel/qt5/files/extrapatch-mkspecs_features_data_cmake_Qt5BasicConfig.cmake.in deleted file mode 100644 index 6480ed7d2caa..000000000000 --- a/devel/qt5/files/extrapatch-mkspecs_features_data_cmake_Qt5BasicConfig.cmake.in +++ /dev/null @@ -1,18 +0,0 @@ -Fix the location of the Qt5 libraries in the generated cmake files. Without this patch -we will get stuff like: -LINK_FLAGS = [...] /usr/local/lib/libQt5Widgets.so [...] -LINK_LIBRARIES= [...] /usr/local/lib/qt5/libQt5Widgets.so.5.13.0 [...] -in the generated build.ninja files, making the builds fail due to the wrong path in -LINK_FLAGS - ---- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.orig 2019-06-13 04:18:18 UTC -+++ mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -53,7 +53,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file p - set(_lib_deps) - set(_link_flags) - -- get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE) -+ get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib/qt5\" ABSOLUTE) - - if(EXISTS \"${prl_file_location}\") - file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS[ \\t]*=\") diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile index 68c3c5df150e..641f22665d44 100644 --- a/graphics/qt5-3d/Makefile +++ b/graphics/qt5-3d/Makefile @@ -2,7 +2,6 @@ PORTNAME= 3d DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-3d/pkg-plist b/graphics/qt5-3d/pkg-plist index 380e762fdb0b..800b644d42bb 100644 --- a/graphics/qt5-3d/pkg-plist +++ b/graphics/qt5-3d/pkg-plist @@ -705,6 +705,8 @@ %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/dispatchcompute_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/effect_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entity_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entityaccumulator_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entityvisitor_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/environmentlight_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/expandboundingvolumejob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filtercompatibletechniquejob_p.h @@ -1192,6 +1194,7 @@ %%QT_CMAKEDIR%%/Qt53DQuickScene2D/Qt53DQuickScene2DConfigVersion.cmake %%QT_CMAKEDIR%%/Qt53DRender/Qt53DRenderConfig.cmake %%QT_CMAKEDIR%%/Qt53DRender/Qt53DRenderConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_AssimpSceneImportPlugin.cmake %%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_DefaultGeometryLoaderPlugin.cmake %%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFGeometryLoaderPlugin.cmake %%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneExportPlugin.cmake @@ -1300,6 +1303,8 @@ %%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so.debug %%QT_PLUGINDIR%%/renderplugins/libscene2d.so %%DEBUG%%%%QT_PLUGINDIR%%/renderplugins/libscene2d.so.debug +%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so +%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so.debug %%QT_PLUGINDIR%%/sceneparsers/libgltfsceneexport.so %%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneexport.so.debug %%QT_PLUGINDIR%%/sceneparsers/libgltfsceneimport.so diff --git a/graphics/qt5-graphicaleffects/Makefile b/graphics/qt5-graphicaleffects/Makefile index 20fb2f83aa13..f16a34db1609 100644 --- a/graphics/qt5-graphicaleffects/Makefile +++ b/graphics/qt5-graphicaleffects/Makefile @@ -2,7 +2,6 @@ PORTNAME= graphicaleffects DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-imageformats/Makefile b/graphics/qt5-imageformats/Makefile index a65581620396..b37a90f09c0a 100644 --- a/graphics/qt5-imageformats/Makefile +++ b/graphics/qt5-imageformats/Makefile @@ -2,7 +2,6 @@ PORTNAME= imageformats DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-opengl/Makefile b/graphics/qt5-opengl/Makefile index d39dc5f76edd..be001a76ef30 100644 --- a/graphics/qt5-opengl/Makefile +++ b/graphics/qt5-opengl/Makefile @@ -2,7 +2,6 @@ PORTNAME= opengl DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-pixeltool/Makefile b/graphics/qt5-pixeltool/Makefile index da08514217c9..a2fccc06154f 100644 --- a/graphics/qt5-pixeltool/Makefile +++ b/graphics/qt5-pixeltool/Makefile @@ -2,7 +2,6 @@ PORTNAME= pixeltool DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-svg/Makefile b/graphics/qt5-svg/Makefile index 1450847740dd..b0a2e193dbeb 100644 --- a/graphics/qt5-svg/Makefile +++ b/graphics/qt5-svg/Makefile @@ -2,7 +2,6 @@ PORTNAME= svg DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile index e44ec5b9b1d5..bfb8c14b14f3 100644 --- a/graphics/qt5-wayland/Makefile +++ b/graphics/qt5-wayland/Makefile @@ -2,7 +2,6 @@ PORTNAME= wayland DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-wayland/pkg-plist b/graphics/qt5-wayland/pkg-plist index 3d60e51ea2e8..8b601bdfc139 100644 --- a/graphics/qt5-wayland/pkg-plist +++ b/graphics/qt5-wayland/pkg-plist @@ -139,6 +139,7 @@ %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlserverbufferintegration_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlserverbufferintegrationfactory_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwltexturesharingextension_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-hardware-integration-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-ivi-application-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-qt-key-unstable-v1-server-protocol.h diff --git a/misc/qt5-examples/distinfo b/misc/qt5-examples/distinfo index af3d9162da8d..fc5760fee937 100644 --- a/misc/qt5-examples/distinfo +++ b/misc/qt5-examples/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561317057 -SHA256 (KDE/Qt/5.13.0/qt-everywhere-src-5.13.0.tar.xz) = 2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6 -SIZE (KDE/Qt/5.13.0/qt-everywhere-src-5.13.0.tar.xz) = 504491324 +TIMESTAMP = 1572555131 +SHA256 (KDE/Qt/5.13.2/qt-everywhere-src-5.13.2.tar.xz) = 55e8273536be41f4f63064a79e552a22133848bb419400b6fa8e9fc0dc05de08 +SIZE (KDE/Qt/5.13.2/qt-everywhere-src-5.13.2.tar.xz) = 500830260 diff --git a/misc/qt5-examples/pkg-plist b/misc/qt5-examples/pkg-plist index cdb7291bd802..d025a21d584e 100644 --- a/misc/qt5-examples/pkg-plist +++ b/misc/qt5-examples/pkg-plist @@ -1,4 +1,3 @@ -%%QT_EXAMPLEDIR%%/HACKING %%QT_EXAMPLEDIR%%/README %%QT_EXAMPLEDIR%%/activeqt/README %%QT_EXAMPLEDIR%%/activeqt/activeqt.pro @@ -1512,7 +1511,7 @@ %%QT_EXAMPLEDIR%%/location/geojson_viewer/main.qml %%QT_EXAMPLEDIR%%/location/geojson_viewer/qml.qrc %%QT_EXAMPLEDIR%%/location/itemview_transitions/OsloListModel.qml -%%QT_EXAMPLEDIR%%/location/itemview_transitions/doc/images/itemview_trasitions.jpg +%%QT_EXAMPLEDIR%%/location/itemview_transitions/doc/images/itemview_transitions.jpg %%QT_EXAMPLEDIR%%/location/itemview_transitions/doc/src/itemview_transitions.qdoc %%QT_EXAMPLEDIR%%/location/itemview_transitions/itemview_transitions.pro %%QT_EXAMPLEDIR%%/location/itemview_transitions/main.cpp @@ -2892,8 +2891,6 @@ %%QT_EXAMPLEDIR%%/qt3d/controls/main.cpp %%QT_EXAMPLEDIR%%/qt3d/controls/main.qml %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/LICENSE -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/chest/Chest.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/chest/diffuse.webp %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/cubemaps/miramar/README.TXT @@ -2927,70 +2924,6 @@ %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/gltf/wine/wine2VS.glsl %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/gltf/wine/wine3FS.glsl %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/gltf/wine/wine3VS.glsl -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/bamboo.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/bamboo_normal.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cover.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cover_normal.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cross-bamboo.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cross-palm.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cross-pine.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cross-pot-cover.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cross-pot.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cross-shrub.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cross-spikes.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cylinder-bamboo.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cylinder-palm.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cylinder-pine.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cylinder-pot-cover.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cylinder-pot.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cylinder-shrub.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/cylinder-spikes.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/palm.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/palm_normal.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/pine.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/pine_normal.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/pot.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/pot_normal.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/shrub.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/shrub_normal.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/sphere-bamboo.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/sphere-palm.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/sphere-pine.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/sphere-pot-cover.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/sphere-pot.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/sphere-shrub.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/sphere-spikes.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/spikes.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/spikes_normal.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/square-bamboo.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/square-palm.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/square-pine.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/square-pot-cover.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/square-pot.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/square-shrub.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/square-spikes.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/triangle-bamboo.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/triangle-palm.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/triangle-pine.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/triangle-pot-cover.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/triangle-pot.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/triangle-shrub.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/houseplants/triangle-spikes.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/diffus_black.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/diffus_blue.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/diffus_green.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/diffus_red.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/diffus_rust.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/diffus_stainless_steel.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/diffus_yellow.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/metal_barrel.obj -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/normal_hard_bumps.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/normal_no_bumps.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/normal_soft_bumps.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/specular.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/specular_rust.webp -%%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/metalbarrel/specular_stainless_steel.webp %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/obj/ball.obj %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/obj/material-sphere.obj %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/obj/plane-10x10.obj @@ -6164,6 +6097,14 @@ %%QT_EXAMPLEDIR%%/webenginewidgets/minimal/doc/src/minimal.qdoc %%QT_EXAMPLEDIR%%/webenginewidgets/minimal/main.cpp %%QT_EXAMPLEDIR%%/webenginewidgets/minimal/minimal.pro +%%QT_EXAMPLEDIR%%/webenginewidgets/notifications/data/data.qrc +%%QT_EXAMPLEDIR%%/webenginewidgets/notifications/data/icon.png +%%QT_EXAMPLEDIR%%/webenginewidgets/notifications/data/index.html +%%QT_EXAMPLEDIR%%/webenginewidgets/notifications/doc/images/notifications-example.png +%%QT_EXAMPLEDIR%%/webenginewidgets/notifications/doc/src/notifications.qdoc +%%QT_EXAMPLEDIR%%/webenginewidgets/notifications/main.cpp +%%QT_EXAMPLEDIR%%/webenginewidgets/notifications/notificationpopup.h +%%QT_EXAMPLEDIR%%/webenginewidgets/notifications/notifications.pro %%QT_EXAMPLEDIR%%/webenginewidgets/printme/data/data.qrc %%QT_EXAMPLEDIR%%/webenginewidgets/printme/data/icon.svg %%QT_EXAMPLEDIR%%/webenginewidgets/printme/data/index.html diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile index 5e28ad19c084..796af73e49f2 100644 --- a/multimedia/qt5-multimedia/Makefile +++ b/multimedia/qt5-multimedia/Makefile @@ -2,7 +2,6 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- diff --git a/multimedia/qt5-multimedia/pkg-plist b/multimedia/qt5-multimedia/pkg-plist index eac9e19ac472..e0da8e6323f8 100644 --- a/multimedia/qt5-multimedia/pkg-plist +++ b/multimedia/qt5-multimedia/pkg-plist @@ -278,6 +278,12 @@ %%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsversion.h %%QT_INCDIR%%/QtMultimediaWidgets/qvideowidget.h %%QT_INCDIR%%/QtMultimediaWidgets/qvideowidgetcontrol.h +%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake +%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfig.cmake +%%QT_CMAKEDIR%%/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5MultimediaQuick/Qt5MultimediaQuickConfig.cmake +%%QT_CMAKEDIR%%/Qt5MultimediaQuick/Qt5MultimediaQuickConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5Multimedia/Qt5MultimediaConfig.cmake %%QT_CMAKEDIR%%/Qt5Multimedia/Qt5MultimediaConfigVersion.cmake %%NO_GSTREAMER%%%%QT_CMAKEDIR%%/Qt5Multimedia/Qt5Multimedia_AudioCaptureServicePlugin.cmake @@ -288,8 +294,6 @@ %%GSTREAMER%%%%QT_CMAKEDIR%%/Qt5Multimedia/Qt5Multimedia_QGstreamerPlayerServicePlugin.cmake %%QT_CMAKEDIR%%/Qt5Multimedia/Qt5Multimedia_QM3uPlaylistPlugin.cmake %%PULSEAUDIO%%%%QT_CMAKEDIR%%/Qt5Multimedia/Qt5Multimedia_QPulseAudioPlugin.cmake -%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake -%%QT_CMAKEDIR%%/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfigVersion.cmake %%QT_LIBDIR%%/libQt5Multimedia.prl %%QT_LIBDIR%%/libQt5Multimedia.so %%QT_LIBDIR%%/libQt5Multimedia.so.5 diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile index d7d5430b1579..ea465f36e48e 100644 --- a/net/qt5-network/Makefile +++ b/net/qt5-network/Makefile @@ -2,7 +2,6 @@ PORTNAME= network DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= net PKGNAMEPREFIX= qt5- diff --git a/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp b/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp index 732fc793d947..b2d7469257b1 100644 --- a/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp +++ b/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp @@ -9,9 +9,9 @@ Clean up interface type and MTU detection. place them on top of each other, that would be ok). - IFM_FDDI (still) exists in 11.2, not in 12.0 ---- src/network/kernel/qnetworkinterface_unix.cpp.orig 2019-02-09 11:35:25.320227000 +0100 -+++ src/network/kernel/qnetworkinterface_unix.cpp 2019-02-09 11:43:51.515736000 +0100 -@@ -420,13 +420,25 @@ +--- src/network/kernel/qnetworkinterface_unix.cpp.orig 2019-10-25 07:16:48 UTC ++++ src/network/kernel/qnetworkinterface_unix.cpp +@@ -420,13 +420,24 @@ QT_BEGIN_INCLUDE_NAMESPACE #endif // QT_PLATFORM_UIKIT QT_END_INCLUDE_NAMESPACE @@ -22,10 +22,9 @@ Clean up interface type and MTU detection. - socket = qt_safe_socket(AF_INET, SOCK_DGRAM, 0); - return socket; -} - + int socket{-1}; -+ -+ int open() + ++ int open() + { + if (socket == -1) + socket = qt_safe_socket(address_family, SOCK_DGRAM, 0); @@ -42,7 +41,7 @@ Clean up interface type and MTU detection. static QNetworkInterface::InterfaceType probeIfType(int socket, int iftype, struct ifmediareq *req) { // Determine the interface type. -@@ -480,16 +492,9 @@ +@@ -480,16 +491,9 @@ static QNetworkInterface::InterfaceType probeIfType(in static QList createInterfaces(ifaddrs *rawList) { QList interfaces; @@ -51,23 +50,20 @@ Clean up interface type and MTU detection. - struct ifreq req; - }; - int socket = -1; -+ SockPuppet socket; -+ SockPuppet localSocket; +- memset(&mediareq, 0, sizeof(mediareq)); - // ensure both structs start with the name field, of size IFNAMESIZ - Q_STATIC_ASSERT(sizeof(mediareq.ifm_name) == sizeof(req.ifr_name)); - Q_ASSERT(&mediareq.ifm_name == &req.ifr_name); -- ++ SockPuppet socket; ++ SockPuppet localSocket; + // on NetBSD we use AF_LINK and sockaddr_dl // scan the list for that family - for (ifaddrs *ptr = rawList; ptr; ptr = ptr->ifa_next) -@@ -503,13 +508,22 @@ +@@ -503,14 +507,22 @@ static QList createInterfa + iface->name = QString::fromLatin1(ptr->ifa_name); iface->flags = convertFlags(ptr->ifa_flags); iface->hardwareAddress = iface->makeHwAddress(sdl->sdl_alen, (uchar*)LLADDR(sdl)); - -- qstrncpy(mediareq.ifm_name, ptr->ifa_name, sizeof(mediareq.ifm_name)); -- iface->type = probeIfType(openSocket(socket), sdl->sdl_type, &mediareq); -- iface->mtu = getMtu(socket, &req); + { + ifmediareq req; + memset(&req, 0, sizeof(req)); @@ -81,7 +77,10 @@ Clean up interface type and MTU detection. + req.ifr_addr.sa_family = AF_LOCAL; + iface->mtu = getMtu(localSocket.open(), &req); + } -+ + +- qstrncpy(mediareq.ifm_name, ptr->ifa_name, sizeof(mediareq.ifm_name)); +- iface->type = probeIfType(openSocket(socket), sdl->sdl_type, &mediareq); +- iface->mtu = getMtu(socket, &req); } - if (socket != -1) @@ -89,7 +88,7 @@ Clean up interface type and MTU detection. return interfaces; } -@@ -608,7 +622,7 @@ +@@ -609,7 +621,7 @@ static QList interfaceList { QList interfaces; diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp index c09b2b96c983..390855e9df06 100644 --- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp +++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols.cpp @@ -1,15 +1,6 @@ -Redefine SSL stack functions to their proper symbols in LibreSSL. -Also reference a redefined DSA_bits() that does not natively exist -in LibreSSL. - -Ensure that we link to the correct ssl library selected in -DEFAULT_VERSIONS. - -Do not define SSL_CONF_CTX symbols absent from LibreSSL. - ---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2018-12-03 11:15:26 UTC -+++ src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -152,6 +152,14 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, +--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2019-10-25 09:16:48.000000000 +0200 ++++ src/network/ssl/qsslsocket_openssl_symbols.cpp 2019-11-01 20:03:08.715014000 +0100 +@@ -152,6 +152,14 @@ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return) DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) @@ -24,7 +15,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL. DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) -@@ -159,6 +167,7 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY +@@ -159,6 +167,7 @@ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) @@ -32,7 +23,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL. DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) #ifdef TLS1_3_VERSION -@@ -443,7 +452,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a +@@ -443,7 +452,7 @@ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) @@ -41,7 +32,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL. DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); -@@ -846,8 +855,8 @@ static QPair loadOpenSsl() +@@ -839,8 +848,8 @@ #endif #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so // first attempt: the canonical name is libssl.so. @@ -52,18 +43,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL. if (libcrypto->load() && libssl->load()) { // libssl.so. and libcrypto.so. found return pair; -@@ -876,8 +885,8 @@ static QPair loadOpenSsl() - // macOS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third - // attempt, _after_ /Contents/Frameworks has been searched. - // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. -- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); -- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); -+ libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), -1); -+ libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), -1); - if (libcrypto->load() && libssl->load()) { - // libssl.so.0 and libcrypto.so.0 found - return pair; -@@ -961,12 +970,21 @@ bool q_resolveOpenSslSymbols() +@@ -980,12 +989,21 @@ RESOLVEFUNC(EVP_CIPHER_CTX_reset) RESOLVEFUNC(EVP_PKEY_base_id) RESOLVEFUNC(RSA_bits) @@ -85,7 +65,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL. RESOLVEFUNC(DH_get0_pqg) RESOLVEFUNC(SSL_CTX_set_options) #ifdef TLS1_3_VERSION -@@ -1001,7 +1019,9 @@ bool q_resolveOpenSslSymbols() +@@ -1024,7 +1042,9 @@ RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) RESOLVEFUNC(DH_bits) @@ -95,7 +75,7 @@ Do not define SSL_CONF_CTX symbols absent from LibreSSL. #if QT_CONFIG(dtls) RESOLVEFUNC(DTLSv1_listen) -@@ -1237,7 +1257,7 @@ bool q_resolveOpenSslSymbols() +@@ -1280,7 +1300,7 @@ RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) RESOLVEFUNC(SSL_CTX_get_cert_store); diff --git a/net/qt5-networkauth/Makefile b/net/qt5-networkauth/Makefile index b2ed31d1e47b..0624c150acde 100644 --- a/net/qt5-networkauth/Makefile +++ b/net/qt5-networkauth/Makefile @@ -2,7 +2,6 @@ PORTNAME= networkauth DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= net PKGNAMEPREFIX= qt5- diff --git a/print/qt5-printsupport/Makefile b/print/qt5-printsupport/Makefile index ec140b4699b1..6cd3c690753c 100644 --- a/print/qt5-printsupport/Makefile +++ b/print/qt5-printsupport/Makefile @@ -2,7 +2,6 @@ PORTNAME= printsupport DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= print PKGNAMEPREFIX= qt5- diff --git a/sysutils/qt5-qtdiag/Makefile b/sysutils/qt5-qtdiag/Makefile index 94e4432cb307..34e18b168457 100644 --- a/sysutils/qt5-qtdiag/Makefile +++ b/sysutils/qt5-qtdiag/Makefile @@ -2,7 +2,6 @@ PORTNAME= qtdiag DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= sysutils PKGNAMEPREFIX= qt5- diff --git a/sysutils/qt5-qtpaths/Makefile b/sysutils/qt5-qtpaths/Makefile index 8694a2758f87..00c2a7e2bd5b 100644 --- a/sysutils/qt5-qtpaths/Makefile +++ b/sysutils/qt5-qtpaths/Makefile @@ -2,7 +2,6 @@ PORTNAME= qtpaths DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= sysutils PKGNAMEPREFIX= qt5- diff --git a/sysutils/qt5-qtplugininfo/Makefile b/sysutils/qt5-qtplugininfo/Makefile index 93687c95666c..eb61e1db0d89 100644 --- a/sysutils/qt5-qtplugininfo/Makefile +++ b/sysutils/qt5-qtplugininfo/Makefile @@ -2,7 +2,6 @@ PORTNAME= qtplugininfo DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= sysutils PKGNAMEPREFIX= qt5- diff --git a/textproc/qt5-xml/Makefile b/textproc/qt5-xml/Makefile index af7f9abe905c..e5929d163a87 100644 --- a/textproc/qt5-xml/Makefile +++ b/textproc/qt5-xml/Makefile @@ -2,7 +2,6 @@ PORTNAME= xml DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt5- diff --git a/textproc/qt5-xmlpatterns/Makefile b/textproc/qt5-xmlpatterns/Makefile index 5d7478aaf304..8370b7d852f9 100644 --- a/textproc/qt5-xmlpatterns/Makefile +++ b/textproc/qt5-xmlpatterns/Makefile @@ -2,7 +2,6 @@ PORTNAME= xmlpatterns DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt5- diff --git a/www/qt5-webchannel/Makefile b/www/qt5-webchannel/Makefile index 45c240462efe..3c03268016da 100644 --- a/www/qt5-webchannel/Makefile +++ b/www/qt5-webchannel/Makefile @@ -2,7 +2,6 @@ PORTNAME= webchannel DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- diff --git a/www/qt5-websockets-qml/Makefile b/www/qt5-websockets-qml/Makefile index ab5167ee2883..dc6bfdae1292 100644 --- a/www/qt5-websockets-qml/Makefile +++ b/www/qt5-websockets-qml/Makefile @@ -2,7 +2,6 @@ PORTNAME= websockets-qml DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- diff --git a/www/qt5-websockets/Makefile b/www/qt5-websockets/Makefile index 71ee92b07082..fa22ebcaec44 100644 --- a/www/qt5-websockets/Makefile +++ b/www/qt5-websockets/Makefile @@ -2,7 +2,6 @@ PORTNAME= websockets DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- diff --git a/www/qt5-webview/Makefile b/www/qt5-webview/Makefile index 63c6d7909fdf..0a2f6d6bc02a 100644 --- a/www/qt5-webview/Makefile +++ b/www/qt5-webview/Makefile @@ -2,7 +2,6 @@ PORTNAME= webview DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- diff --git a/www/qt5-webview/files/patch-qtwebview.pro b/www/qt5-webview/files/patch-qtwebview.pro new file mode 100644 index 000000000000..92aeff9ae0ce --- /dev/null +++ b/www/qt5-webview/files/patch-qtwebview.pro @@ -0,0 +1,6 @@ +--- qtwebview.pro.orig 2019-10-14 10:11:35 UTC ++++ qtwebview.pro +@@ -1,3 +1 @@ +-requires(qtConfig(gui)) +- + load(qt_parts) diff --git a/x11-toolkits/qt5-charts/Makefile b/x11-toolkits/qt5-charts/Makefile index 5a0ba2774b21..7783c311dcac 100644 --- a/x11-toolkits/qt5-charts/Makefile +++ b/x11-toolkits/qt5-charts/Makefile @@ -2,7 +2,6 @@ PORTNAME= charts DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-datavis3d/Makefile b/x11-toolkits/qt5-datavis3d/Makefile index 87613b526f0a..9a2ca789f6f4 100644 --- a/x11-toolkits/qt5-datavis3d/Makefile +++ b/x11-toolkits/qt5-datavis3d/Makefile @@ -2,7 +2,6 @@ PORTNAME= datavis3d DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile index 1dfd7db9b324..eb84c7be52a4 100644 --- a/x11-toolkits/qt5-declarative/Makefile +++ b/x11-toolkits/qt5-declarative/Makefile @@ -2,7 +2,6 @@ PORTNAME= declarative DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-declarative/pkg-plist b/x11-toolkits/qt5-declarative/pkg-plist index bf0507dd9dca..4ff5a892093b 100644 --- a/x11-toolkits/qt5-declarative/pkg-plist +++ b/x11-toolkits/qt5-declarative/pkg-plist @@ -674,6 +674,8 @@ %%QT_INCDIR%%/QtQuickWidgets/qquickwidget.h %%QT_INCDIR%%/QtQuickWidgets/qtquickwidgetsglobal.h %%QT_INCDIR%%/QtQuickWidgets/qtquickwidgetsversion.h +%%QT_CMAKEDIR%%/Qt5PacketProtocol/Qt5PacketProtocolConfig.cmake +%%QT_CMAKEDIR%%/Qt5PacketProtocol/Qt5PacketProtocolConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5Qml/Qt5QmlConfig.cmake %%QT_CMAKEDIR%%/Qt5Qml/Qt5QmlConfigExtras.cmake %%QT_CMAKEDIR%%/Qt5Qml/Qt5QmlConfigVersion.cmake @@ -688,9 +690,17 @@ %%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QQmlProfilerServiceFactory.cmake %%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QQuickProfilerAdapterFactory.cmake %%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QTcpServerConnectionFactory.cmake +%%QT_CMAKEDIR%%/Qt5QmlDebug/Qt5QmlDebugConfig.cmake +%%QT_CMAKEDIR%%/Qt5QmlDebug/Qt5QmlDebugConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5QmlDevTools/Qt5QmlDevToolsConfig.cmake +%%QT_CMAKEDIR%%/Qt5QmlDevTools/Qt5QmlDevToolsConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5Quick/Qt5QuickConfig.cmake %%QT_CMAKEDIR%%/Qt5Quick/Qt5QuickConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake +%%QT_CMAKEDIR%%/Qt5QuickParticles/Qt5QuickParticlesConfig.cmake +%%QT_CMAKEDIR%%/Qt5QuickParticles/Qt5QuickParticlesConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5QuickShapes/Qt5QuickShapesConfig.cmake +%%QT_CMAKEDIR%%/Qt5QuickShapes/Qt5QuickShapesConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5QuickTest/Qt5QuickTestConfig.cmake %%QT_CMAKEDIR%%/Qt5QuickTest/Qt5QuickTestConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake diff --git a/x11-toolkits/qt5-gamepad/Makefile b/x11-toolkits/qt5-gamepad/Makefile index a9c28dbe7f6b..a64df6ed831f 100644 --- a/x11-toolkits/qt5-gamepad/Makefile +++ b/x11-toolkits/qt5-gamepad/Makefile @@ -2,7 +2,6 @@ PORTNAME= gamepad DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index d636ed747e7c..9095d6604a24 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -2,7 +2,6 @@ PORTNAME= gui DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-gui/pkg-plist b/x11-toolkits/qt5-gui/pkg-plist index a6cba5dded33..e95fab51cd05 100644 --- a/x11-toolkits/qt5-gui/pkg-plist +++ b/x11-toolkits/qt5-gui/pkg-plist @@ -754,6 +754,22 @@ %%QT_INCDIR%%/QtXkbCommonSupport/QtXkbCommonSupportDepends %%QT_INCDIR%%/QtXkbCommonSupport/QtXkbCommonSupportVersion %%QT_INCDIR%%/QtXkbCommonSupport/qtxkbcommonsupportversion.h +%%QT_CMAKEDIR%%/Qt5AccessibilitySupport/Qt5AccessibilitySupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5AccessibilitySupport/Qt5AccessibilitySupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5DeviceDiscoverySupport/Qt5DeviceDiscoverySupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5DeviceDiscoverySupport/Qt5DeviceDiscoverySupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5EdidSupport/Qt5EdidSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5EdidSupport/Qt5EdidSupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5EglSupport/Qt5EglSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5EglSupport/Qt5EglSupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5EventDispatcherSupport/Qt5EventDispatcherSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5EventDispatcherSupport/Qt5EventDispatcherSupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5FbSupport/Qt5FbSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5FbSupport/Qt5FbSupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5FontDatabaseSupport/Qt5FontDatabaseSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5FontDatabaseSupport/Qt5FontDatabaseSupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5GlxSupport/Qt5GlxSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5GlxSupport/Qt5GlxSupportConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5Gui/Qt5GuiConfig.cmake %%QT_CMAKEDIR%%/Qt5Gui/Qt5GuiConfigExtras.cmake %%QT_CMAKEDIR%%/Qt5Gui/Qt5GuiConfigVersion.cmake @@ -776,8 +792,24 @@ %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake +%%QT_CMAKEDIR%%/Qt5InputSupport/Qt5InputSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5InputSupport/Qt5InputSupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5KmsSupport/Qt5KmsSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5KmsSupport/Qt5KmsSupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake %%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5PlatformCompositorSupport/Qt5PlatformCompositorSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5PlatformCompositorSupport/Qt5PlatformCompositorSupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5ServiceSupport/Qt5ServiceSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5ServiceSupport/Qt5ServiceSupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5ThemeSupport/Qt5ThemeSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5ThemeSupport/Qt5ThemeSupportConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5XcbQpa/Qt5XcbQpaConfig.cmake +%%QT_CMAKEDIR%%/Qt5XcbQpa/Qt5XcbQpaConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfig.cmake +%%QT_CMAKEDIR%%/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfigVersion.cmake %%QT_BINDIR%%/qvkgen %%QT_LIBDIR%%/libQt5AccessibilitySupport.a %%QT_LIBDIR%%/libQt5AccessibilitySupport.prl diff --git a/x11-toolkits/qt5-quickcontrols/Makefile b/x11-toolkits/qt5-quickcontrols/Makefile index 8d2beabd0a03..d2898e1f446a 100644 --- a/x11-toolkits/qt5-quickcontrols/Makefile +++ b/x11-toolkits/qt5-quickcontrols/Makefile @@ -2,7 +2,6 @@ PORTNAME= quickcontrols DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-quickcontrols2/Makefile b/x11-toolkits/qt5-quickcontrols2/Makefile index 63027dc41262..046a8c68a3c8 100644 --- a/x11-toolkits/qt5-quickcontrols2/Makefile +++ b/x11-toolkits/qt5-quickcontrols2/Makefile @@ -2,7 +2,6 @@ PORTNAME= quickcontrols2 DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-uiplugin/Makefile b/x11-toolkits/qt5-uiplugin/Makefile index e8f85e0ccaae..f36cb97c4d44 100644 --- a/x11-toolkits/qt5-uiplugin/Makefile +++ b/x11-toolkits/qt5-uiplugin/Makefile @@ -2,7 +2,6 @@ PORTNAME= uiplugin DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits devel PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-uiplugin/pkg-plist b/x11-toolkits/qt5-uiplugin/pkg-plist index ae78e7c39ee7..88888029c868 100644 --- a/x11-toolkits/qt5-uiplugin/pkg-plist +++ b/x11-toolkits/qt5-uiplugin/pkg-plist @@ -10,3 +10,5 @@ %%QT_CMAKEDIR%%/Qt5UiPlugin/Qt5UiPluginConfig.cmake %%QT_CMAKEDIR%%/Qt5UiPlugin/Qt5UiPluginConfigVersion.cmake %%QT_MKSPECDIR%%/modules/qt_lib_uiplugin.pri +%%QT_LIBDIR%%/libQt5UiPlugin.prl +libdata/pkgconfig/Qt5UiPlugin.pc diff --git a/x11-toolkits/qt5-virtualkeyboard/Makefile b/x11-toolkits/qt5-virtualkeyboard/Makefile index ac8540afea54..10ce02bcadb7 100644 --- a/x11-toolkits/qt5-virtualkeyboard/Makefile +++ b/x11-toolkits/qt5-virtualkeyboard/Makefile @@ -2,7 +2,6 @@ PORTNAME= virtualkeyboard DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-virtualkeyboard/pkg-plist b/x11-toolkits/qt5-virtualkeyboard/pkg-plist index cffebefe3c59..5bcd58480110 100644 --- a/x11-toolkits/qt5-virtualkeyboard/pkg-plist +++ b/x11-toolkits/qt5-virtualkeyboard/pkg-plist @@ -47,6 +47,8 @@ %%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboardselectionlistmodel.h %%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboardtrace.h %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QVirtualKeyboardPlugin.cmake +%%QT_CMAKEDIR%%/Qt5HunspellInputMethod/Qt5HunspellInputMethodConfig.cmake +%%QT_CMAKEDIR%%/Qt5HunspellInputMethod/Qt5HunspellInputMethodConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5VirtualKeyboard/Qt5VirtualKeyboardConfig.cmake %%QT_CMAKEDIR%%/Qt5VirtualKeyboard/Qt5VirtualKeyboardConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboardHunspellPlugin.cmake diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile index 022a2f49f4c9..7e63dac85b53 100644 --- a/x11-toolkits/qt5-widgets/Makefile +++ b/x11-toolkits/qt5-widgets/Makefile @@ -2,7 +2,6 @@ PORTNAME= widgets DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11/qt5-qev/Makefile b/x11/qt5-qev/Makefile index 6033bd649e23..4ef012577306 100644 --- a/x11/qt5-qev/Makefile +++ b/x11/qt5-qev/Makefile @@ -2,7 +2,6 @@ PORTNAME= qev DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11 PKGNAMEPREFIX= qt5- diff --git a/x11/qt5-x11extras/Makefile b/x11/qt5-x11extras/Makefile index d94d2d1b85ae..3534ee2a8666 100644 --- a/x11/qt5-x11extras/Makefile +++ b/x11/qt5-x11extras/Makefile @@ -2,7 +2,6 @@ PORTNAME= x11extras DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11 PKGNAMEPREFIX= qt5-