diff options
103 files changed, 340 insertions, 310 deletions
diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index ef63764841d0..2a03c8fad100 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -105,36 +105,39 @@ DIST_SUBDIR= KDE/Qt/${_QT_VERSION} . if ${_QT_VER:M5} # KDE maintains a repository with a patched Qt5 distribution. _KDE_3d= 0 -_KDE_base= 157 +_KDE_base= 156 _KDE_charts= 0 -_KDE_connectivity= 5 +_KDE_connectivity= 6 _KDE_datavis3d= 0 -_KDE_declarative= 21 +_KDE_declarative= 31 _KDE_gamepad= 0 _KDE_graphicaleffects= 0 -_KDE_imageformats= 6 -_KDE_location= 3 -_KDE_multimedia= 1 +_KDE_imageformats= 9 +_KDE_location= 4 +_KDE_multimedia= 3 _KDE_networkauth= 0 _KDE_quick3d= 1 _KDE_quickcontrols= 0 -_KDE_quickcontrols2= 7 +_KDE_quickcontrols2= 6 _KDE_quicktimeline= 0 _KDE_remoteobjects= 0 _KDE_script= 0 -_KDE_script_ORIGIN_TAG= v5.15.11-lts -_KDE_script_VERSION= 5.15.11 +_KDE_script_ORIGIN_TAG= v5.15.15-lts +_KDE_script_VERSION= 5.15.15 _KDE_scxml= 0 _KDE_sensors= 0 _KDE_serialbus= 0 _KDE_serialport= 0 _KDE_speech= 1 _KDE_svg= 8 -_KDE_tools= 1 +_KDE_tools= 3 _KDE_translations= 0 _KDE_virtualkeyboard= 0 _KDE_wayland= 57 _KDE_webchannel= 3 +_KDE_webengine= 0 +_KDE_webengine_ORIGIN_TAG= v5.15.15-lts +_KDE_webengine_VERSION= 5.15.15 _KDE_webglplugin= 0 _KDE_websockets= 2 _KDE_webview= 0 @@ -142,10 +145,15 @@ _KDE_x11extras= 0 _KDE_xmlpatterns= 0 . if defined(_KDE_${_QT_DIST}) +. if defined(_KDE_${_QT_DIST}_ORIGIN_TAG) +_KDE_${_QT_DIST}_BRANCH= ${_KDE_${_QT_DIST}_VERSION} +. else +_KDE_${_QT_DIST}_BRANCH= kde/5.15 +COMMENT+= (KDE patched) +. endif QT5_KDE_PATCH= p${_KDE_${_QT_DIST}} _KDE_${_QT_DIST}_VERSION?= ${_QT_VERSION} _KDE_${_QT_DIST}_ORIGIN_TAG?= v${_KDE_${_QT_DIST}_VERSION}-lts-lgpl -COMMENT+= (KDE patched) . else QT5_KDE_PATCH= # . endif @@ -405,7 +413,7 @@ qt5-pre-configure: # As the patch collection was created after a version bump, all module verisions # are tagged as 5.15.3 touch ${WRKSRC}/.qmake.conf # easier than to -f before the sed - ${REINPLACE_CMD} -e '/MODULE_VERSION/s|5\.15\.[0-9]|${_QT_VERSION}|g' \ + ${REINPLACE_CMD} -e '/MODULE_VERSION/s|5\.15\.\([0-9]*\)|${_QT_VERSION}|g' \ ${WRKSRC}/.qmake.conf # **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE **** @@ -525,7 +533,8 @@ qt-create-kde-distfile: ${_QT_DIST} \ ${DISTDIR}/${DIST_SUBDIR} \ ${_KDE_${_QT_DIST}_VERSION} \ - ${_KDE_${_QT_DIST}_ORIGIN_TAG} + ${_KDE_${_QT_DIST}_ORIGIN_TAG} \ + ${_KDE_${_QT_DIST}_BRANCH} .endif # defined(_QT_DIST_MK_INCLUDED) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 912cc591787d..2c3421a456fe 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 6 -QT5_VERSION?= 5.15.8 +QT5_VERSION?= 5.15.10 QT6_VERSION?= 6.5.2 PYSIDE6_VERSION?= ${QT6_VERSION} diff --git a/accessibility/qt5-speech/Makefile b/accessibility/qt5-speech/Makefile index 536443664079..e4d9491da5da 100644 --- a/accessibility/qt5-speech/Makefile +++ b/accessibility/qt5-speech/Makefile @@ -1,6 +1,5 @@ PORTNAME= speech PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= accessibility PKGNAMEPREFIX= qt5- diff --git a/accessibility/qt5-speech/distinfo b/accessibility/qt5-speech/distinfo index 7ffe20fb1407..4891ed8597e2 100644 --- a/accessibility/qt5-speech/distinfo +++ b/accessibility/qt5-speech/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941039 -SHA256 (KDE/Qt/5.15.8/kde-qtspeech-5.15.8p1.tar.xz) = f82fe7a283bae28707e609ba3d60ab1c6f5d250848557a99ff86e6f823a5976a -SIZE (KDE/Qt/5.15.8/kde-qtspeech-5.15.8p1.tar.xz) = 80408 +TIMESTAMP = 1694023999 +SHA256 (KDE/Qt/5.15.10/kde-qtspeech-5.15.10p1.tar.xz) = 64ec116f9a2bd6273708d384c0ca63798d1fbeb3a93d7f0006436b4c289342f2 +SIZE (KDE/Qt/5.15.10/kde-qtspeech-5.15.10p1.tar.xz) = 80120 diff --git a/comms/qt5-connectivity/distinfo b/comms/qt5-connectivity/distinfo index 21e3b20934ca..7482032e8ce2 100644 --- a/comms/qt5-connectivity/distinfo +++ b/comms/qt5-connectivity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941040 -SHA256 (KDE/Qt/5.15.8/kde-qtconnectivity-5.15.8p5.tar.xz) = 1c4a6ad789394e9c6ef6f9de5cb4b11b4dc67a7329820abcc18112ec0f39ea6d -SIZE (KDE/Qt/5.15.8/kde-qtconnectivity-5.15.8p5.tar.xz) = 2789984 +TIMESTAMP = 1694022445 +SHA256 (KDE/Qt/5.15.10/kde-qtconnectivity-5.15.10p6.tar.xz) = 5fcbaf77d0778b1d9d04b35f5929283dc87d9251fb4f037e0c46122d950b7ed8 +SIZE (KDE/Qt/5.15.10/kde-qtconnectivity-5.15.10p6.tar.xz) = 2795832 diff --git a/comms/qt5-connectivity/pkg-plist b/comms/qt5-connectivity/pkg-plist index 9f074e9576cc..adea30542e1c 100644 --- a/comms/qt5-connectivity/pkg-plist +++ b/comms/qt5-connectivity/pkg-plist @@ -71,7 +71,6 @@ %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferrequest_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothutils_winrt_p.h -%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qleadvertiser_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_android_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluez_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluezdbus_p.h diff --git a/comms/qt5-sensors/distinfo b/comms/qt5-sensors/distinfo index b8f0d9dd585f..89e73cd36cfc 100644 --- a/comms/qt5-sensors/distinfo +++ b/comms/qt5-sensors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941041 -SHA256 (KDE/Qt/5.15.8/kde-qtsensors-5.15.8p0.tar.xz) = 2dff6e013c5f01a7d1079e192a8a995860259d37ab7310ac0f23b573fe2b5cb2 -SIZE (KDE/Qt/5.15.8/kde-qtsensors-5.15.8p0.tar.xz) = 2031088 +TIMESTAMP = 1694023912 +SHA256 (KDE/Qt/5.15.10/kde-qtsensors-5.15.10p0.tar.xz) = ace546c4ca6d8fa0360269e656879a8df9766cf842c925c17b75d5c327080c63 +SIZE (KDE/Qt/5.15.10/kde-qtsensors-5.15.10p0.tar.xz) = 2030876 diff --git a/comms/qt5-serialbus/distinfo b/comms/qt5-serialbus/distinfo index 7aaa6f1fae6a..0c1cef515182 100644 --- a/comms/qt5-serialbus/distinfo +++ b/comms/qt5-serialbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941042 -SHA256 (KDE/Qt/5.15.8/kde-qtserialbus-5.15.8p0.tar.xz) = 5be19ad827c59ff779dbea832c41d35ed7818734971856461a8b0e6bfe4e7b06 -SIZE (KDE/Qt/5.15.8/kde-qtserialbus-5.15.8p0.tar.xz) = 333532 +TIMESTAMP = 1694023937 +SHA256 (KDE/Qt/5.15.10/kde-qtserialbus-5.15.10p0.tar.xz) = bdb0e87eeb0e18a18aab846ea9af6adf312e290ccf5ede24a95d4e52ca24ed28 +SIZE (KDE/Qt/5.15.10/kde-qtserialbus-5.15.10p0.tar.xz) = 333548 diff --git a/comms/qt5-serialport/distinfo b/comms/qt5-serialport/distinfo index 3b51a0c0be7c..31edcacbd155 100644 --- a/comms/qt5-serialport/distinfo +++ b/comms/qt5-serialport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941043 -SHA256 (KDE/Qt/5.15.8/kde-qtserialport-5.15.8p0.tar.xz) = 6b0ce59cb6e946e45a5a7671e81e5e3158f134d501d22e99042af562ef753a8c -SIZE (KDE/Qt/5.15.8/kde-qtserialport-5.15.8p0.tar.xz) = 300316 +TIMESTAMP = 1694023970 +SHA256 (KDE/Qt/5.15.10/kde-qtserialport-5.15.10p0.tar.xz) = 3066ef587744bc4156554114f3b1ebc0109b4d1da9acf3e3f87b2a4190c1750a +SIZE (KDE/Qt/5.15.10/kde-qtserialport-5.15.10p0.tar.xz) = 300176 diff --git a/databases/qt5-sql/distinfo b/databases/qt5-sql/distinfo index f5936c2931cf..3e088ff3618c 100644 --- a/databases/qt5-sql/distinfo +++ b/databases/qt5-sql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941044 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785634 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/databases/qt5-sqldrivers-ibase/Makefile b/databases/qt5-sqldrivers-ibase/Makefile index 1d38dab06856..72ad384eb456 100644 --- a/databases/qt5-sqldrivers-ibase/Makefile +++ b/databases/qt5-sqldrivers-ibase/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 DB= IBase DB_DESC= InterBase/Firebird diff --git a/databases/qt5-sqldrivers-ibase/distinfo b/databases/qt5-sqldrivers-ibase/distinfo index dcaa3a12b7cd..99c793dd9209 100644 --- a/databases/qt5-sqldrivers-ibase/distinfo +++ b/databases/qt5-sqldrivers-ibase/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1671832634 -SHA256 (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 0b4416fb9f5f8428a125d3d6661ba91f3a4789d307a2a9513ab3adb8a322c7b3 -SIZE (KDE/Qt/5.15.7/kde-qtbase-5.15.7p177.tar.xz) = 50134400 +TIMESTAMP = 1694024995 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p155.tar.xz) = cfcd353f53d6cbd7059fc3df3f9b76503b85aed3a524149c340a34c876b24368 +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p155.tar.xz) = 50202948 diff --git a/databases/qt5-sqldrivers-mysql/distinfo b/databases/qt5-sqldrivers-mysql/distinfo index e2618e500f27..60846ed56164 100644 --- a/databases/qt5-sqldrivers-mysql/distinfo +++ b/databases/qt5-sqldrivers-mysql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941046 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785635 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp b/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp index d76cd1b67365..2226444592de 100644 --- a/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp +++ b/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp @@ -1,9 +1,9 @@ ---- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig 2020-10-27 08:02:11 UTC +--- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig 2023-09-04 21:23:22 UTC +++ src/plugins/sqldrivers/mysql/qsql_mysql.cpp -@@ -352,11 +360,11 @@ void QMYSQLResultPrivate::bindBlobs() - - for(i = 0; i < fields.count(); ++i) { - fieldInfo = fields.at(i).myField; +@@ -363,11 +363,11 @@ void QMYSQLResultPrivate::bindBlobs() + MYSQL_BIND *bind; + for (int i = 0; i < fields.count(); ++i) { + const MYSQL_FIELD *fieldInfo = fields.at(i).myField; - if (qIsBlob(inBinds[i].buffer_type) && meta && fieldInfo) { + if (qIsBlob(inBinds[i].buffer_type) && meta && fieldInfo && fieldInfo->max_length) { bind = &inBinds[i]; diff --git a/databases/qt5-sqldrivers-odbc/distinfo b/databases/qt5-sqldrivers-odbc/distinfo index ec8a7a6fffa4..c9b60474b26c 100644 --- a/databases/qt5-sqldrivers-odbc/distinfo +++ b/databases/qt5-sqldrivers-odbc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941047 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785636 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/databases/qt5-sqldrivers-pgsql/distinfo b/databases/qt5-sqldrivers-pgsql/distinfo index 9dc52b635345..2d160dbbeb9b 100644 --- a/databases/qt5-sqldrivers-pgsql/distinfo +++ b/databases/qt5-sqldrivers-pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941048 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785637 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/databases/qt5-sqldrivers-sqlite2/distinfo b/databases/qt5-sqldrivers-sqlite2/distinfo index d9958e487c40..dcb640e46153 100644 --- a/databases/qt5-sqldrivers-sqlite2/distinfo +++ b/databases/qt5-sqldrivers-sqlite2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941050 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785639 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/databases/qt5-sqldrivers-sqlite3/distinfo b/databases/qt5-sqldrivers-sqlite3/distinfo index 63aec06230f7..1cb3aad2b183 100644 --- a/databases/qt5-sqldrivers-sqlite3/distinfo +++ b/databases/qt5-sqldrivers-sqlite3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941051 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785640 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/databases/qt5-sqldrivers-tds/distinfo b/databases/qt5-sqldrivers-tds/distinfo index e0354d3b6a1a..e104ced6b5f8 100644 --- a/databases/qt5-sqldrivers-tds/distinfo +++ b/databases/qt5-sqldrivers-tds/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941052 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785641 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/devel/pyside2-tools/Makefile b/devel/pyside2-tools/Makefile index 87a8a01669b5..4c4300ec22a8 100644 --- a/devel/pyside2-tools/Makefile +++ b/devel/pyside2-tools/Makefile @@ -1,6 +1,5 @@ PORTNAME= pyside2-tools -DISTVERSION= 5.15.2 -PORTREVISION= 2 +DISTVERSION= 5.15.10 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/pyside2-tools/distinfo b/devel/pyside2-tools/distinfo index 39d624953340..cc11ae21516d 100644 --- a/devel/pyside2-tools/distinfo +++ b/devel/pyside2-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606840487 -SHA256 (pyside-setup-opensource-src-5.15.2.tar.xz) = b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418 -SIZE (pyside-setup-opensource-src-5.15.2.tar.xz) = 3472624 +TIMESTAMP = 1694811002 +SHA256 (pyside-setup-opensource-src-5.15.10.tar.xz) = 2af691d3613a41f83a60439b46568fc2c696dbfae42f7cd7b07152d115ead33a +SIZE (pyside-setup-opensource-src-5.15.10.tar.xz) = 3583764 diff --git a/devel/pyside2/Makefile b/devel/pyside2/Makefile index ed4dfdd96465..4a3650bb7202 100644 --- a/devel/pyside2/Makefile +++ b/devel/pyside2/Makefile @@ -1,6 +1,5 @@ PORTNAME= pyside2 -DISTVERSION= 5.15.2 -PORTREVISION= 3 +DISTVERSION= 5.15.10 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/pyside2/distinfo b/devel/pyside2/distinfo index 70d8c980b93f..9026ecf60bfd 100644 --- a/devel/pyside2/distinfo +++ b/devel/pyside2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606754632 -SHA256 (pyside-setup-opensource-src-5.15.2.tar.xz) = b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418 -SIZE (pyside-setup-opensource-src-5.15.2.tar.xz) = 3472624 +TIMESTAMP = 1694808326 +SHA256 (pyside-setup-opensource-src-5.15.10.tar.xz) = 2af691d3613a41f83a60439b46568fc2c696dbfae42f7cd7b07152d115ead33a +SIZE (pyside-setup-opensource-src-5.15.10.tar.xz) = 3583764 diff --git a/devel/pyside2/pkg-plist b/devel/pyside2/pkg-plist index 9ebbd41591dc..3f7b302a9244 100644 --- a/devel/pyside2/pkg-plist +++ b/devel/pyside2/pkg-plist @@ -17,6 +17,7 @@ include/PySide2/QtMultimediaWidgets/pyside2_qtmultimediawidgets_python.h include/PySide2/QtNetwork/pyside2_qtnetwork_python.h include/PySide2/QtOpenGL/pyside2_qtopengl_python.h include/PySide2/QtOpenGLFunctions/pyside2_qtopenglfunctions_python.h +include/PySide2/QtOpenGLFunctions/qopenglversionfunctionsfactory.h include/PySide2/QtPositioning/pyside2_qtpositioning_python.h include/PySide2/QtPrintSupport/pyside2_qtprintsupport_python.h include/PySide2/QtQml/pyside2_qtqml_python.h @@ -45,20 +46,20 @@ include/PySide2/QtXml/pyside2_qtxml_python.h include/PySide2/QtXmlPatterns/pyside2_qtxmlpatterns_python.h include/PySide2/dynamicqmetaobject.h include/PySide2/feature_select.h -include/PySide2/pysideqenum.h include/PySide2/pyside.h include/PySide2/pyside2_global.h include/PySide2/pysideclassinfo.h include/PySide2/pysidemacros.h include/PySide2/pysidemetafunction.h include/PySide2/pysideproperty.h +include/PySide2/pysideqenum.h include/PySide2/pysideqflags.h include/PySide2/pysidesignal.h include/PySide2/pysidestaticstrings.h include/PySide2/pysideweakref.h include/PySide2/signalmanager.h -lib/cmake/PySide2-%%DISTVERSION%%/PySide2Config%%PYVERSTR%%.cmake lib/cmake/PySide2-%%DISTVERSION%%/PySide2Config.cmake +lib/cmake/PySide2-%%DISTVERSION%%/PySide2Config%%PYVERSTR%%.cmake lib/cmake/PySide2-%%DISTVERSION%%/PySide2ConfigVersion.cmake lib/cmake/PySide2-%%DISTVERSION%%/PySide2Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/PySide2-%%DISTVERSION%%/PySide2Targets.cmake @@ -110,14 +111,14 @@ lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/PySide2/QtXml%%PYVERSTR%%.so %%PYTHON_SITELIBDIR%%/PySide2/QtXmlPatterns%%PYVERSTR%%.so %%PYTHON_SITELIBDIR%%/PySide2/__init__.py -%%PYTHON_SITELIBDIR%%/PySide2/_config.py -%%PYTHON_SITELIBDIR%%/PySide2/_git_pyside_version.py %%PYTHON_SITELIBDIR%%/PySide2/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/PySide2/__pycache__/__init__%%PYVERSTR%%.pyc %%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_config%%PYVERSTR%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_config%%PYVERSTR%%.pyc %%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_git_pyside_version%%PYVERSTR%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_git_pyside_version%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/PySide2/_config.py +%%PYTHON_SITELIBDIR%%/PySide2/_git_pyside_version.py libdata/pkgconfig/pyside2.pc share/PySide2/glue/qtcharts.cpp share/PySide2/glue/qtcore.cpp @@ -126,6 +127,7 @@ share/PySide2/glue/qtgui.cpp share/PySide2/glue/qtmultimedia.cpp share/PySide2/glue/qtnetwork.cpp share/PySide2/glue/qtopengl.cpp +share/PySide2/glue/qtopenglfunctions.cpp share/PySide2/glue/qtprintsupport.cpp share/PySide2/glue/qtqml.cpp share/PySide2/glue/qtquick.cpp diff --git a/devel/qt5-assistant/distinfo b/devel/qt5-assistant/distinfo index 639be5517eb3..6becf06efdd8 100644 --- a/devel/qt5-assistant/distinfo +++ b/devel/qt5-assistant/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941053 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694025418 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/devel/qt5-buildtools/distinfo b/devel/qt5-buildtools/distinfo index e73a1bbc29b0..b242e1dbe1a5 100644 --- a/devel/qt5-buildtools/distinfo +++ b/devel/qt5-buildtools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941054 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785643 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/devel/qt5-concurrent/distinfo b/devel/qt5-concurrent/distinfo index 5796b6d375a7..6b6d02d2dc7d 100644 --- a/devel/qt5-concurrent/distinfo +++ b/devel/qt5-concurrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941056 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785645 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index 6e67d92fb3e6..44d583eb278f 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -1,6 +1,5 @@ PORTNAME= core PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-core/distinfo b/devel/qt5-core/distinfo index afb8df4f1ae1..15300ebc6b17 100644 --- a/devel/qt5-core/distinfo +++ b/devel/qt5-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941057 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694781500 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/devel/qt5-dbus/distinfo b/devel/qt5-dbus/distinfo index f8cae8222b0b..2902d28d6add 100644 --- a/devel/qt5-dbus/distinfo +++ b/devel/qt5-dbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941058 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785647 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/devel/qt5-designer/distinfo b/devel/qt5-designer/distinfo index 9412c2f2b479..973ee5fc6b64 100644 --- a/devel/qt5-designer/distinfo +++ b/devel/qt5-designer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941059 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694025451 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/devel/qt5-help/distinfo b/devel/qt5-help/distinfo index 16427a41c575..15a61225739a 100644 --- a/devel/qt5-help/distinfo +++ b/devel/qt5-help/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941060 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694025459 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/devel/qt5-linguist/distinfo b/devel/qt5-linguist/distinfo index c7c419d5c16d..24f049aa9afd 100644 --- a/devel/qt5-linguist/distinfo +++ b/devel/qt5-linguist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941061 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694024228 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/devel/qt5-linguisttools/distinfo b/devel/qt5-linguisttools/distinfo index a8a18cddc697..fcf0db2549ee 100644 --- a/devel/qt5-linguisttools/distinfo +++ b/devel/qt5-linguisttools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941063 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694025474 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/devel/qt5-location/distinfo b/devel/qt5-location/distinfo index 950fbeb64fdd..2f6e1b83725d 100644 --- a/devel/qt5-location/distinfo +++ b/devel/qt5-location/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941064 -SHA256 (KDE/Qt/5.15.8/kde-qtlocation-5.15.8p3.tar.xz) = dbc924b96c949d6155f546ddf85cd02644c3a74da969362576f68e183652ea33 -SIZE (KDE/Qt/5.15.8/kde-qtlocation-5.15.8p3.tar.xz) = 4212352 +TIMESTAMP = 1694022979 +SHA256 (KDE/Qt/5.15.10/kde-qtlocation-5.15.10p4.tar.xz) = cf578dd0ea4662fb86fe12a95d49d4528902162a7a05212fce968af5b40a480d +SIZE (KDE/Qt/5.15.10/kde-qtlocation-5.15.10p4.tar.xz) = 4211688 diff --git a/devel/qt5-location/pkg-plist b/devel/qt5-location/pkg-plist index 3698410d16b9..4db56139292f 100644 --- a/devel/qt5-location/pkg-plist +++ b/devel/qt5-location/pkg-plist @@ -359,10 +359,6 @@ %%DEBUG%%%%QT_PLUGINDIR%%/position/libqtposition_positionpoll.so.debug %%QT_PLUGINDIR%%/position/libqtposition_serialnmea.so %%DEBUG%%%%QT_PLUGINDIR%%/position/libqtposition_serialnmea.so.debug -%%QT_QMLDIR%%/Qt/labs/location/liblocationlabsplugin.so -%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/location/liblocationlabsplugin.so.debug -%%QT_QMLDIR%%/Qt/labs/location/plugins.qmltypes -%%QT_QMLDIR%%/Qt/labs/location/qmldir %%QT_QMLDIR%%/QtLocation/libdeclarative_location.so %%DEBUG%%%%QT_QMLDIR%%/QtLocation/libdeclarative_location.so.debug %%QT_QMLDIR%%/QtLocation/plugins.qmltypes diff --git a/devel/qt5-qdbus/distinfo b/devel/qt5-qdbus/distinfo index 0ffbba988fb6..3d47eb40bf02 100644 --- a/devel/qt5-qdbus/distinfo +++ b/devel/qt5-qdbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941065 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694025491 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/devel/qt5-qdbusviewer/distinfo b/devel/qt5-qdbusviewer/distinfo index 8f6f1bf4d219..bfe45b91a6a1 100644 --- a/devel/qt5-qdbusviewer/distinfo +++ b/devel/qt5-qdbusviewer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941066 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694025503 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/devel/qt5-qdoc-data/distinfo b/devel/qt5-qdoc-data/distinfo index 2bd47deff9b8..7b3426bf68a2 100644 --- a/devel/qt5-qdoc-data/distinfo +++ b/devel/qt5-qdoc-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941072 -SHA256 (KDE/Qt/5.15.8/qtbase-everywhere-opensource-src-5.15.8.tar.xz) = bfb11126c7f3abc3fdf86425ce912988b864a7e79a606d77325cffdbacb4be9c -SIZE (KDE/Qt/5.15.8/qtbase-everywhere-opensource-src-5.15.8.tar.xz) = 50259432 +TIMESTAMP = 1694025560 +SHA256 (KDE/Qt/5.15.10/qtbase-everywhere-opensource-src-5.15.10.tar.xz) = c0d06cb18d20f10bf7ad53552099e097ec39362d30a5d6f104724f55fa1c8fb9 +SIZE (KDE/Qt/5.15.10/qtbase-everywhere-opensource-src-5.15.10.tar.xz) = 50422688 diff --git a/devel/qt5-qdoc/distinfo b/devel/qt5-qdoc/distinfo index 3a1593d60b46..81dd0ae552ef 100644 --- a/devel/qt5-qdoc/distinfo +++ b/devel/qt5-qdoc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941067 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694025574 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/devel/qt5-qmake/Makefile b/devel/qt5-qmake/Makefile index 548114ce4014..147f7b17cb93 100644 --- a/devel/qt5-qmake/Makefile +++ b/devel/qt5-qmake/Makefile @@ -1,6 +1,5 @@ PORTNAME= qmake PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-qmake/distinfo b/devel/qt5-qmake/distinfo index 852bfea81f23..5be7169b23e7 100644 --- a/devel/qt5-qmake/distinfo +++ b/devel/qt5-qmake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941073 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785657 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/devel/qt5-remoteobjects/distinfo b/devel/qt5-remoteobjects/distinfo index 09ea0624239f..f35f8a9906aa 100644 --- a/devel/qt5-remoteobjects/distinfo +++ b/devel/qt5-remoteobjects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941074 -SHA256 (KDE/Qt/5.15.8/kde-qtremoteobjects-5.15.8p0.tar.xz) = 2e7a73d84c8a22f1f1a3bf096095afc763dc07a597f6a8d47862d8f155f2d95c -SIZE (KDE/Qt/5.15.8/kde-qtremoteobjects-5.15.8p0.tar.xz) = 352880 +TIMESTAMP = 1694023806 +SHA256 (KDE/Qt/5.15.10/kde-qtremoteobjects-5.15.10p0.tar.xz) = 08aac41741c04d0df08c1a4ac24c1232e59f2c21e5098ed2c580d7c342534a44 +SIZE (KDE/Qt/5.15.10/kde-qtremoteobjects-5.15.10p0.tar.xz) = 352500 diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile index 1293837a31ee..8454e5172ae0 100644 --- a/devel/qt5-script/Makefile +++ b/devel/qt5-script/Makefile @@ -20,4 +20,9 @@ post-patch: @${REINPLACE_CMD} -e '/scripttools/ d' \ ${WRKSRC}/src/src.pro +# Fix version mismatches for CMake +post-configure: + @${REINPLACE_CMD} -e '/${QT5_VERSION} $${_Qt5Script_FIND_VERSION_EXACT}/s|${QT5_VERSION}|'"$$(${MAKE} -C ../qt5-core -VQT5_VERSION)"'|' \ + ${WRKSRC}/lib/cmake/Qt5Script/Qt5ScriptConfig.cmake + .include <bsd.port.mk> diff --git a/devel/qt5-script/distinfo b/devel/qt5-script/distinfo index 0ab9d95a95c2..5eef53d8c720 100644 --- a/devel/qt5-script/distinfo +++ b/devel/qt5-script/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672311694 -SHA256 (KDE/Qt/5.15.11/kde-qtscript-5.15.11p0.tar.xz) = 62029a7a1dbdc1507d434330721a743849241482d8f5e4bb6a7b8974f275975b -SIZE (KDE/Qt/5.15.11/kde-qtscript-5.15.11p0.tar.xz) = 2623576 +TIMESTAMP = 1694686642 +SHA256 (KDE/Qt/5.15.15/kde-qtscript-5.15.15p0.tar.xz) = 7d121deeedd5463aa732a572dc9d0da7640e4c81ebc837122bc3c6d356819f31 +SIZE (KDE/Qt/5.15.15/kde-qtscript-5.15.15p0.tar.xz) = 2624008 diff --git a/devel/qt5-scripttools/Makefile b/devel/qt5-scripttools/Makefile index 8e6b71eb30c0..a9dec4b9e764 100644 --- a/devel/qt5-scripttools/Makefile +++ b/devel/qt5-scripttools/Makefile @@ -19,4 +19,9 @@ QT5_VERSION= ${_KDE_script_VERSION} # Link in QtScript port _QT5_ADDITIONAL_LINK= script +# Fix version mismatches for CMake +post-configure: + @${REINPLACE_CMD} -e '/${QT5_VERSION} $${_Qt5ScriptTools_FIND_VERSION_EXACT}/s|${QT5_VERSION}|'"$$(${MAKE} -C ../qt5-core -VQT5_VERSION)"'|' \ + ${WRKSRC}/lib/cmake/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake + .include <bsd.port.mk> diff --git a/devel/qt5-scripttools/distinfo b/devel/qt5-scripttools/distinfo index f88d8f547000..5eef53d8c720 100644 --- a/devel/qt5-scripttools/distinfo +++ b/devel/qt5-scripttools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672473080 -SHA256 (KDE/Qt/5.15.11/kde-qtscript-5.15.11p0.tar.xz) = 62029a7a1dbdc1507d434330721a743849241482d8f5e4bb6a7b8974f275975b -SIZE (KDE/Qt/5.15.11/kde-qtscript-5.15.11p0.tar.xz) = 2623576 +TIMESTAMP = 1694686642 +SHA256 (KDE/Qt/5.15.15/kde-qtscript-5.15.15p0.tar.xz) = 7d121deeedd5463aa732a572dc9d0da7640e4c81ebc837122bc3c6d356819f31 +SIZE (KDE/Qt/5.15.15/kde-qtscript-5.15.15p0.tar.xz) = 2624008 diff --git a/devel/qt5-scxml/distinfo b/devel/qt5-scxml/distinfo index a21588a1735a..608a61b109c2 100644 --- a/devel/qt5-scxml/distinfo +++ b/devel/qt5-scxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941077 -SHA256 (KDE/Qt/5.15.8/kde-qtscxml-5.15.8p0.tar.xz) = 76de55d34f4836b581ab25a49aa8b6e9a6c3e26968aefa364bb6157d37dc2508 -SIZE (KDE/Qt/5.15.8/kde-qtscxml-5.15.8p0.tar.xz) = 409404 +TIMESTAMP = 1694023877 +SHA256 (KDE/Qt/5.15.10/kde-qtscxml-5.15.10p0.tar.xz) = 30a88631f3d9c10904e39a5fe870a82ca1a45f8950cc8c4863bc45115124c161 +SIZE (KDE/Qt/5.15.10/kde-qtscxml-5.15.10p0.tar.xz) = 409096 diff --git a/devel/qt5-testlib/distinfo b/devel/qt5-testlib/distinfo index 2eea487ce9cf..04a4503457d1 100644 --- a/devel/qt5-testlib/distinfo +++ b/devel/qt5-testlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941078 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785661 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/devel/qt5-uitools/distinfo b/devel/qt5-uitools/distinfo index c3a75871691b..6d989a264e7a 100644 --- a/devel/qt5-uitools/distinfo +++ b/devel/qt5-uitools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941079 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694025602 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/devel/qt5/Makefile b/devel/qt5/Makefile index e2bc2d5f217e..c29af0dfa1f3 100644 --- a/devel/qt5/Makefile +++ b/devel/qt5/Makefile @@ -1,6 +1,5 @@ PORTNAME= qt5 DISTVERSION= ${QT5_VERSION} -PORTREVISION= 4 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org diff --git a/devel/qt5/files/create_kde-qt_release.sh b/devel/qt5/files/create_kde-qt_release.sh index d46e4bd088d8..a255ea5e79f7 100644 --- a/devel/qt5/files/create_kde-qt_release.sh +++ b/devel/qt5/files/create_kde-qt_release.sh @@ -10,15 +10,13 @@ BASE_DIRECTORY="$2" # Version of Qt we want VERSION="$3" ORIGIN_TAG="$4" +BRANCH="$5" # Remote KDE git repository REPO="https://invent.kde.org/qt/qt/${PROJECT}.git" # Local checkout CHECKOUT="${BASE_DIRECTORY}/${PROJECT}" -# KDE-Qt branch -BRANCH=kde/5.15 - # Make sure we can use ${BASE_DIRECTORY} if [ ! -d "${BASE_DIRECTORY}" ] || [ ! -w "${BASE_DIRECTORY}" ] ; then echo "Directory '${BASE_DIRECTORY}' does not exist" @@ -27,11 +25,14 @@ fi # Init a new git checkout if it is missing if [ ! -d "${CHECKOUT}" ] ; then - git -C "${BASE_DIRECTORY}" clone "${REPO}" + git -C "${BASE_DIRECTORY}" clone --recurse-submodules --no-remote-submodules "${REPO}" fi # Update the checkout of the required branch -git -C "${CHECKOUT}" checkout "${BRANCH}" && git -C "${CHECKOUT}" pull --ff-only --rebase --autostash +git -C "${CHECKOUT}" checkout "${BRANCH}" && \ +git -C "${CHECKOUT}" pull --ff-only --rebase --autostash && \ +git -C "${CHECKOUT}" submodule update + if [ $? -ne 0 ] ; then echo "Failed to update ${CHECKOUT}" exit 1 @@ -40,16 +41,20 @@ fi # Count number of patches added by KDE PATCH_COUNT=$(git -C ${CHECKOUT} rev-list --count ${ORIGIN_TAG}..origin/${BRANCH}) -# Setup information for the distfile +# Set up information for the distfile DISTNAME="kde-${PROJECT}-${VERSION}p${PATCH_COUNT}" -DISTFILE="${BASE_DIRECTORY}/${DISTNAME}.tar.xz" +DISTFILE_TAR="${BASE_DIRECTORY}/${DISTNAME}.tar" +DISTFILE="${DISTFILE_TAR}.xz" # Tar and compress distfile -git -C ${CHECKOUT} archive --format=tar --prefix="${DISTNAME}/" HEAD | xz > "${DISTFILE}" +git -C ${CHECKOUT} archive --format=tar --prefix="${DISTNAME}/" HEAD --output ${DISTFILE_TAR} && \ +git -C ${CHECKOUT} submodule foreach --recursive "git archive --prefix="${DISTNAME}"/\$path/ --output=${BASE_DIRECTORY}/\$sha1.tar HEAD && tar -r --file=${DISTFILE_TAR} @${BASE_DIRECTORY}/\$sha1.tar && rm ${BASE_DIRECTORY}/\$sha1.tar" && \ +xz ${DISTFILE_TAR} + if [ $? -ne 0 ] ; then echo "Failed to create tarball ${DISTFILE}" exit 1 fi -# Printout information required in qt-dist.mk +# Print out information required in qt-dist.mk echo -e "Distfile:\t${DISTFILE}\n_KDE_${DIST}=\t${PATCH_COUNT}" diff --git a/devel/shiboken2/Makefile b/devel/shiboken2/Makefile index 737e40260540..7ba5bdd6d1b6 100644 --- a/devel/shiboken2/Makefile +++ b/devel/shiboken2/Makefile @@ -1,6 +1,5 @@ PORTNAME= shiboken2 -DISTVERSION= 5.15.2 -PORTREVISION= 5 +DISTVERSION= 5.15.10 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/shiboken2/distinfo b/devel/shiboken2/distinfo index 8a93b4704d79..fa17cedad77f 100644 --- a/devel/shiboken2/distinfo +++ b/devel/shiboken2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606807809 -SHA256 (pyside-setup-opensource-src-5.15.2.tar.xz) = b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418 -SIZE (pyside-setup-opensource-src-5.15.2.tar.xz) = 3472624 +TIMESTAMP = 1694807915 +SHA256 (pyside-setup-opensource-src-5.15.10.tar.xz) = 2af691d3613a41f83a60439b46568fc2c696dbfae42f7cd7b07152d115ead33a +SIZE (pyside-setup-opensource-src-5.15.10.tar.xz) = 3583764 diff --git a/devel/shiboken2/pkg-plist b/devel/shiboken2/pkg-plist index 757275ef2f8b..50636d1daa85 100644 --- a/devel/shiboken2/pkg-plist +++ b/devel/shiboken2/pkg-plist @@ -7,7 +7,6 @@ include/shiboken2/gilstate.h include/shiboken2/helper.h include/shiboken2/pep384impl.h include/shiboken2/python25compat.h -include/shiboken2/qapp_macro.h include/shiboken2/sbkarrayconverter.h include/shiboken2/sbkconverter.h include/shiboken2/sbkdbg.h @@ -25,16 +24,15 @@ include/shiboken2/signature_p.h include/shiboken2/threadstatesaver.h include/shiboken2/typespec.h include/shiboken2/voidptr.h -lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Config%%PYVERSTR%%.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Config.cmake +lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Config%%PYVERSTR%%.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2ConfigVersion.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/shiboken_helpers.cmake lib/libshiboken2%%PYVERSTR%%.so -lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%% lib/libshiboken2%%PYVERSTR%%.so.5.15 -libdata/pkgconfig/shiboken2.pc +lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/shiboken2/__init__.py %%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/__init__%%PYVERSTR%%.pyc @@ -44,12 +42,12 @@ libdata/pkgconfig/shiboken2.pc %%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_git_shiboken_module_version%%PYVERSTR%%.pyc %%PYTHON_SITELIBDIR%%/shiboken2/_config.py %%PYTHON_SITELIBDIR%%/shiboken2/_git_shiboken_module_version.py -%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__feature__.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__init__.py -%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__feature__%%PYVERSTR%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__feature__%%PYVERSTR%%.pyc %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__init__%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/feature%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/feature%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/feature.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__init__.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/__init__%%PYVERSTR%%.pyc @@ -90,3 +88,4 @@ libdata/pkgconfig/shiboken2.pc %%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_git_shiboken_generator_version%%PYVERSTR%%.pyc %%PYTHON_SITELIBDIR%%/shiboken2_generator/_config.py %%PYTHON_SITELIBDIR%%/shiboken2_generator/_git_shiboken_generator_version.py +libdata/pkgconfig/shiboken2.pc diff --git a/graphics/qt5-3d/distinfo b/graphics/qt5-3d/distinfo index 05f244fc7542..b61e4a7a14bd 100644 --- a/graphics/qt5-3d/distinfo +++ b/graphics/qt5-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941081 -SHA256 (KDE/Qt/5.15.8/kde-qt3d-5.15.8p0.tar.xz) = c579e8a2ed45356c910a1d12e3c379da8dedc8c5caf7fde2a96aa3fc7cd5c2fb -SIZE (KDE/Qt/5.15.8/kde-qt3d-5.15.8p0.tar.xz) = 80724576 +TIMESTAMP = 1694022270 +SHA256 (KDE/Qt/5.15.10/kde-qt3d-5.15.10p0.tar.xz) = ee8c6a4f294b0adeee58e3994ebe964a5923c696ff47722d2a094b0caccf8751 +SIZE (KDE/Qt/5.15.10/kde-qt3d-5.15.10p0.tar.xz) = 80722300 diff --git a/graphics/qt5-graphicaleffects/distinfo b/graphics/qt5-graphicaleffects/distinfo index b08a7be85965..7a55362ca9af 100644 --- a/graphics/qt5-graphicaleffects/distinfo +++ b/graphics/qt5-graphicaleffects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941082 -SHA256 (KDE/Qt/5.15.8/kde-qtgraphicaleffects-5.15.8p0.tar.xz) = 3f7a7658a840b6223c4e67f57726cd058b0d1a04e61925dd515ca54245246436 -SIZE (KDE/Qt/5.15.8/kde-qtgraphicaleffects-5.15.8p0.tar.xz) = 14019204 +TIMESTAMP = 1694022863 +SHA256 (KDE/Qt/5.15.10/kde-qtgraphicaleffects-5.15.10p0.tar.xz) = 5c3bc4f6ee87a17b2d16967c9b7ca028d03d1901aef50c0d634f3b235cae6f4a +SIZE (KDE/Qt/5.15.10/kde-qtgraphicaleffects-5.15.10p0.tar.xz) = 14019252 diff --git a/graphics/qt5-imageformats/Makefile b/graphics/qt5-imageformats/Makefile index 1b4c57bca0d8..104cded4f688 100644 --- a/graphics/qt5-imageformats/Makefile +++ b/graphics/qt5-imageformats/Makefile @@ -1,6 +1,5 @@ PORTNAME= imageformats PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-imageformats/distinfo b/graphics/qt5-imageformats/distinfo index 2cd565d6e0de..e542d89f23ac 100644 --- a/graphics/qt5-imageformats/distinfo +++ b/graphics/qt5-imageformats/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941083 -SHA256 (KDE/Qt/5.15.8/kde-qtimageformats-5.15.8p6.tar.xz) = 1b45059f3d3b9eaea7bb72369fd4577a96ab9219d7a949de188dc77130d34a24 -SIZE (KDE/Qt/5.15.8/kde-qtimageformats-5.15.8p6.tar.xz) = 1822068 +TIMESTAMP = 1694022899 +SHA256 (KDE/Qt/5.15.10/kde-qtimageformats-5.15.10p9.tar.xz) = f618c937edeaa3a10b658e4f9b275865b68827fff3cf227977ff804178c49162 +SIZE (KDE/Qt/5.15.10/kde-qtimageformats-5.15.10p9.tar.xz) = 1824112 diff --git a/graphics/qt5-opengl/distinfo b/graphics/qt5-opengl/distinfo index 1cbd694b7199..4dcc319391d5 100644 --- a/graphics/qt5-opengl/distinfo +++ b/graphics/qt5-opengl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941084 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785666 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/graphics/qt5-pixeltool/distinfo b/graphics/qt5-pixeltool/distinfo index 35436c00f539..988edc06ed98 100644 --- a/graphics/qt5-pixeltool/distinfo +++ b/graphics/qt5-pixeltool/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941085 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694025666 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/graphics/qt5-svg/distinfo b/graphics/qt5-svg/distinfo index 99add8f295fd..fa391e9d9b49 100644 --- a/graphics/qt5-svg/distinfo +++ b/graphics/qt5-svg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941086 -SHA256 (KDE/Qt/5.15.8/kde-qtsvg-5.15.8p8.tar.xz) = ff5d049deb5d9b5703b0c1e681d846d8ddc8a8437944ac7d7614ed1cf599f6f5 -SIZE (KDE/Qt/5.15.8/kde-qtsvg-5.15.8p8.tar.xz) = 1864992 +TIMESTAMP = 1694024039 +SHA256 (KDE/Qt/5.15.10/kde-qtsvg-5.15.10p8.tar.xz) = b5eb5de480889f4c96f22ed83affb9d6d06484f8138a1bf669b466d5edf98c2f +SIZE (KDE/Qt/5.15.10/kde-qtsvg-5.15.10p8.tar.xz) = 1865064 diff --git a/graphics/qt5-wayland/distinfo b/graphics/qt5-wayland/distinfo index a49e68a6ee72..b49b4711fef3 100644 --- a/graphics/qt5-wayland/distinfo +++ b/graphics/qt5-wayland/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941087 -SHA256 (KDE/Qt/5.15.8/kde-qtwayland-5.15.8p57.tar.xz) = c420bafab4ac950fae11970e0f13561fde694917c9474d5c07d363e70b9438f1 -SIZE (KDE/Qt/5.15.8/kde-qtwayland-5.15.8p57.tar.xz) = 537384 +TIMESTAMP = 1694024497 +SHA256 (KDE/Qt/5.15.10/kde-qtwayland-5.15.10p57.tar.xz) = 16eaf54d35dc4feaf8ea98c5abe40a06389be03203c2e511457e6ef4fb150a50 +SIZE (KDE/Qt/5.15.10/kde-qtwayland-5.15.10p57.tar.xz) = 537880 diff --git a/misc/qt5-examples/distinfo b/misc/qt5-examples/distinfo index 71c34b982e5f..09d878fe821b 100644 --- a/misc/qt5-examples/distinfo +++ b/misc/qt5-examples/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941133 -SHA256 (KDE/Qt/5.15.8/qt-everywhere-opensource-src-5.15.8.tar.xz) = 776a9302c336671f9406a53bd30b8e36f825742b2ec44a57c08217bff0fa86b9 -SIZE (KDE/Qt/5.15.8/qt-everywhere-opensource-src-5.15.8.tar.xz) = 660018080 +TIMESTAMP = 1694026152 +SHA256 (KDE/Qt/5.15.10/qt-everywhere-opensource-src-5.15.10.tar.xz) = b545cb83c60934adc9a6bbd27e2af79e5013de77d46f5b9f5bb2a3c762bf55ca +SIZE (KDE/Qt/5.15.10/qt-everywhere-opensource-src-5.15.10.tar.xz) = 659711492 diff --git a/misc/qt5-examples/pkg-plist b/misc/qt5-examples/pkg-plist index 191fae9be09c..89ef8dd59555 100644 --- a/misc/qt5-examples/pkg-plist +++ b/misc/qt5-examples/pkg-plist @@ -6028,6 +6028,7 @@ %%QT_EXAMPLEDIR%%/tutorials/alarms/AlarmModel.qml %%QT_EXAMPLEDIR%%/tutorials/alarms/TumblerDelegate.qml %%QT_EXAMPLEDIR%%/tutorials/alarms/alarms.pro +%%QT_EXAMPLEDIR%%/tutorials/alarms/controls_conf.qrc %%QT_EXAMPLEDIR%%/tutorials/alarms/main.cpp %%QT_EXAMPLEDIR%%/tutorials/alarms/main.qml %%QT_EXAMPLEDIR%%/tutorials/alarms/qml.qrc diff --git a/misc/qt5-l10n/distinfo b/misc/qt5-l10n/distinfo index 0a8dbaf8f885..1084f1e5addc 100644 --- a/misc/qt5-l10n/distinfo +++ b/misc/qt5-l10n/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941133 -SHA256 (KDE/Qt/5.15.8/kde-qttranslations-5.15.8p0.tar.xz) = 6f694895b14de09508ef030586561005246e19e9c3417415e912f67b647ddcb1 -SIZE (KDE/Qt/5.15.8/kde-qttranslations-5.15.8p0.tar.xz) = 1610812 +TIMESTAMP = 1694024407 +SHA256 (KDE/Qt/5.15.10/kde-qttranslations-5.15.10p0.tar.xz) = 242abe8134d7a3b63560df2de4c83048778e55f58d502187a4dc5750b7b85f48 +SIZE (KDE/Qt/5.15.10/kde-qttranslations-5.15.10p0.tar.xz) = 1610640 diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile index 05670a32c836..c0517ed54392 100644 --- a/multimedia/qt5-multimedia/Makefile +++ b/multimedia/qt5-multimedia/Makefile @@ -1,6 +1,5 @@ PORTNAME= multimedia PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- diff --git a/multimedia/qt5-multimedia/distinfo b/multimedia/qt5-multimedia/distinfo index acaee0e148b0..88239df1f6f4 100644 --- a/multimedia/qt5-multimedia/distinfo +++ b/multimedia/qt5-multimedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941135 -SHA256 (KDE/Qt/5.15.8/kde-qtmultimedia-5.15.8p1.tar.xz) = 30c3052439db3e25b842bbb0a37886e2435c9a1c8a0dffa9e47e432ef9d86059 -SIZE (KDE/Qt/5.15.8/kde-qtmultimedia-5.15.8p1.tar.xz) = 3791556 +TIMESTAMP = 1694023042 +SHA256 (KDE/Qt/5.15.10/kde-qtmultimedia-5.15.10p3.tar.xz) = 44318b12b9afb4008fd7e023b8b9e88664afde16ff78cdc516a687c81105c20f +SIZE (KDE/Qt/5.15.10/kde-qtmultimedia-5.15.10p3.tar.xz) = 3788984 diff --git a/net/qt5-network/distinfo b/net/qt5-network/distinfo index 3068e103d22c..bcddb4143786 100644 --- a/net/qt5-network/distinfo +++ b/net/qt5-network/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941136 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785696 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/net/qt5-networkauth/distinfo b/net/qt5-networkauth/distinfo index 0a4aa523dea6..85e30df8c30c 100644 --- a/net/qt5-networkauth/distinfo +++ b/net/qt5-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941137 -SHA256 (KDE/Qt/5.15.8/kde-qtnetworkauth-5.15.8p0.tar.xz) = a0aa59d2b348f4044871cf5d93626730118aae6d38f602d6ed9604957727a3bf -SIZE (KDE/Qt/5.15.8/kde-qtnetworkauth-5.15.8p0.tar.xz) = 119944 +TIMESTAMP = 1694023089 +SHA256 (KDE/Qt/5.15.10/kde-qtnetworkauth-5.15.10p0.tar.xz) = dc547dce77d0a55c82fa8f0c85df817fac778b094b4371ec084814821e4fa678 +SIZE (KDE/Qt/5.15.10/kde-qtnetworkauth-5.15.10p0.tar.xz) = 119860 diff --git a/print/qt5-printsupport/distinfo b/print/qt5-printsupport/distinfo index 47a39d27b7ae..d68335686adf 100644 --- a/print/qt5-printsupport/distinfo +++ b/print/qt5-printsupport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941138 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785698 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/sysutils/qt5-qtdiag/distinfo b/sysutils/qt5-qtdiag/distinfo index 4d866b5252b0..5b45053d2c42 100644 --- a/sysutils/qt5-qtdiag/distinfo +++ b/sysutils/qt5-qtdiag/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941139 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694026643 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/sysutils/qt5-qtpaths/distinfo b/sysutils/qt5-qtpaths/distinfo index 98164f5a3d3d..d70b5d427422 100644 --- a/sysutils/qt5-qtpaths/distinfo +++ b/sysutils/qt5-qtpaths/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941140 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694026654 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/sysutils/qt5-qtplugininfo/distinfo b/sysutils/qt5-qtplugininfo/distinfo index d38630959b65..6e2346ab34e9 100644 --- a/sysutils/qt5-qtplugininfo/distinfo +++ b/sysutils/qt5-qtplugininfo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941141 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694026663 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/textproc/qt5-xml/distinfo b/textproc/qt5-xml/distinfo index cd154820b7bf..722b8f7f14f2 100644 --- a/textproc/qt5-xml/distinfo +++ b/textproc/qt5-xml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941142 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785702 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/textproc/qt5-xmlpatterns/distinfo b/textproc/qt5-xmlpatterns/distinfo index c5e6b6e6090f..f9c273c83f84 100644 --- a/textproc/qt5-xmlpatterns/distinfo +++ b/textproc/qt5-xmlpatterns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941143 -SHA256 (KDE/Qt/5.15.8/kde-qtxmlpatterns-5.15.8p0.tar.xz) = b713442691acfa62e936fb9b2b8d0eadea6954230753e1e4d9f4657abd6f8664 -SIZE (KDE/Qt/5.15.8/kde-qtxmlpatterns-5.15.8p0.tar.xz) = 1375764 +TIMESTAMP = 1694024791 +SHA256 (KDE/Qt/5.15.10/kde-qtxmlpatterns-5.15.10p0.tar.xz) = 3a0c1c58118a1332f2e1a74f06494fcb88e406ce319daeae452bbbc5de7655c6 +SIZE (KDE/Qt/5.15.10/kde-qtxmlpatterns-5.15.10p0.tar.xz) = 1375908 diff --git a/www/qt5-webchannel/distinfo b/www/qt5-webchannel/distinfo index 9f1358b25cdb..273b5e0da3b8 100644 --- a/www/qt5-webchannel/distinfo +++ b/www/qt5-webchannel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941145 -SHA256 (KDE/Qt/5.15.8/kde-qtwebchannel-5.15.8p3.tar.xz) = 163e8d0259c60d4c49fea35e7230f9816510ce0a407ebc51f7310cdcf08943d5 -SIZE (KDE/Qt/5.15.8/kde-qtwebchannel-5.15.8p3.tar.xz) = 188688 +TIMESTAMP = 1694024533 +SHA256 (KDE/Qt/5.15.10/kde-qtwebchannel-5.15.10p3.tar.xz) = f3ea8c98b245864b2660881709bcc09e9310acf46af9365074a8dfc0d4c48de1 +SIZE (KDE/Qt/5.15.10/kde-qtwebchannel-5.15.10p3.tar.xz) = 188580 diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index c782f72dcff8..9913c92faa68 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -18,8 +18,7 @@ # MAX_FILES_qt5_webengine=4096 to /usr/local/etc/poudriere.conf PORTNAME= webengine -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 6 +DISTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -49,7 +48,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libwebp.so:graphics/webp DISTINFO_FILE= ${.CURDIR}/distinfo -QT5_VERSION= 5.15.8 +QT5_VERSION= ${_KDE_webengine_VERSION} # Add extra-patch-no-mempcpy-nasm only when there's no mempcpy() in base. # Nested variable expansion avoids executing the test when not needed for @@ -58,8 +57,6 @@ QT5_VERSION= 5.15.8 EXTRA_PATCHES+= ${"${:!${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h \ || ${TRUE}!}" == "":?${PATCHDIR}/extra-patch-no-mempcpy-nasm:} -WRKSRC= ${WRKDIR}/qtwebengine-everywhere-src-${DISTVERSION} - OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_DEFAULT= ALSA @@ -168,4 +165,11 @@ pre-configure: # Rerun syncqt.pl -- otherwise the resulting package misses some forwarding headers. cd ${WRKSRC} && ${QT_BINDIR}/syncqt.pl -version ${QT5_VERSION} +# Fix version mismatches for CMake +post-build: +.for module in Pdf PdfWidgets WebEngine WebEngineCore WebEngineWidgets + @${REINPLACE_CMD} -e '/${QT5_VERSION} $${_Qt5${module}_FIND_VERSION_EXACT}/s|${QT5_VERSION}|'"$$(${MAKE} -C ../../devel/qt5-core -VQT5_VERSION)"'|' \ + ${BUILD_WRKSRC}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake +.endfor + .include <bsd.port.post.mk> diff --git a/www/qt5-webengine/distinfo b/www/qt5-webengine/distinfo index 40537861d0f6..29cf9116a9e9 100644 --- a/www/qt5-webengine/distinfo +++ b/www/qt5-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673702204 -SHA256 (KDE/Qt/5.15.8/qtwebengine-everywhere-opensource-src-5.15.8.tar.xz) = 4f56dcab592a8e44c93951fb9d4840b5f73fd80ec2776979d38e42abca2b61e3 -SIZE (KDE/Qt/5.15.8/qtwebengine-everywhere-opensource-src-5.15.8.tar.xz) = 316379144 +TIMESTAMP = 1694754981 +SHA256 (KDE/Qt/5.15.15/kde-qtwebengine-5.15.15p0.tar.xz) = 1251d3fb06033483b4252ff43f1a5a11edfa00ec0746dd89787a8ce15654e442 +SIZE (KDE/Qt/5.15.15/kde-qtwebengine-5.15.15p0.tar.xz) = 315062708 diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h index a849c519e8df..5c880f2805c2 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h @@ -1,25 +1,20 @@ ---- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2020-05-31 18:04:09 UTC +--- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2022-04-06 13:32:17 UTC +++ src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -@@ -988,9 +988,7 @@ SI F approx_powf(F x, F y) { +@@ -980,7 +980,7 @@ SI F from_half(U16 h) { SI F from_half(U16 h) { #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -- __fp16 fp16; -- memcpy(&fp16, &h, sizeof(U16)); -- return float(fp16); -+ return vcvt_f32_f16(h); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) - return _mm256_cvtph_ps(h); -@@ -1011,10 +1009,7 @@ SI F from_half(U16 h) { +-#if defined(SK_BUILD_FOR_MAC) ++#if defined(SK_BUILD_FOR_MAC) || defined(__FreeBSD__) + return vcvt_f32_f16(h); + #else + __fp16 fp16; +@@ -1006,7 +1006,7 @@ SI U16 to_half(F f) { SI U16 to_half(F f) { #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -- __fp16 fp16 = __fp16(f); -- U16 u16; -- memcpy(&u16, &fp16, sizeof(U16)); -- return u16; -+ return vcvt_f16_f32(f); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) - return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION); +-#if defined(SK_BUILD_FOR_MAC) ++#if defined(SK_BUILD_FOR_MAC) || defined(__FreeBSD__) + return vcvt_f16_f32(f); + #else + __fp16 fp16 = __fp16(f); diff --git a/www/qt5-webengine/files/patch-src_pdfwidgets_configure.json b/www/qt5-webengine/files/patch-src_pdfwidgets_configure.json new file mode 100644 index 000000000000..4549b0bfd765 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_pdfwidgets_configure.json @@ -0,0 +1,11 @@ +--- src/pdfwidgets/configure.json.orig 2023-09-13 10:52:34 UTC ++++ src/pdfwidgets/configure.json +@@ -13,7 +13,7 @@ + "pdf-widgets": { + "label": "Support Qt PDF Widgets", + "purpose": "Provides Qt PDF Widgets support.", +- "condition": "features.widgets", ++ "condition": "module.widgets", + "output": [ "privateFeature" ] + } + }, diff --git a/www/qt5-webengine/files/patch-src_webenginewidgets_configure.json b/www/qt5-webengine/files/patch-src_webenginewidgets_configure.json new file mode 100644 index 000000000000..9f19fcfd5c72 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_webenginewidgets_configure.json @@ -0,0 +1,11 @@ +--- src/webenginewidgets/configure.json.orig 2023-09-13 10:51:59 UTC ++++ src/webenginewidgets/configure.json +@@ -13,7 +13,7 @@ + "webengine-widgets": { + "label": "Support Qt WebEngine Widgets", + "purpose": "Provides WebEngine Widgets support.", +- "condition": "features.widgets", ++ "condition": "module.widgets", + "output": [ "privateFeature" ] + } + }, diff --git a/www/qt5-webglplugin/distinfo b/www/qt5-webglplugin/distinfo index 6c0e5bb72466..19bfc37a5006 100644 --- a/www/qt5-webglplugin/distinfo +++ b/www/qt5-webglplugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941149 -SHA256 (KDE/Qt/5.15.8/kde-qtwebglplugin-5.15.8p0.tar.xz) = 3f51800364cadbbcab32c6c5206c2298c164fc7be092b3699891e683b28dfb8c -SIZE (KDE/Qt/5.15.8/kde-qtwebglplugin-5.15.8p0.tar.xz) = 53620 +TIMESTAMP = 1694024566 +SHA256 (KDE/Qt/5.15.10/kde-qtwebglplugin-5.15.10p0.tar.xz) = 535b6adb3f811f80b4672aafb64926048a17fb533229e43b1ef0c5e549abd414 +SIZE (KDE/Qt/5.15.10/kde-qtwebglplugin-5.15.10p0.tar.xz) = 53628 diff --git a/www/qt5-websockets-qml/distinfo b/www/qt5-websockets-qml/distinfo index 45e55a9d96ba..fc221371ac78 100644 --- a/www/qt5-websockets-qml/distinfo +++ b/www/qt5-websockets-qml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941152 -SHA256 (KDE/Qt/5.15.8/kde-qtwebsockets-5.15.8p2.tar.xz) = 261e54032c1b92f7881b79b257bff8627944a3aeec9f6cabd2edf250a05997a8 -SIZE (KDE/Qt/5.15.8/kde-qtwebsockets-5.15.8p2.tar.xz) = 237036 +TIMESTAMP = 1694026712 +SHA256 (KDE/Qt/5.15.10/kde-qtwebsockets-5.15.10p2.tar.xz) = 25f114df83343c7edb03684f7dba19043179caa5c9dce8fd0d949896d8a1cc97 +SIZE (KDE/Qt/5.15.10/kde-qtwebsockets-5.15.10p2.tar.xz) = 237040 diff --git a/www/qt5-websockets/distinfo b/www/qt5-websockets/distinfo index ddf43f6fd363..93d568c8f538 100644 --- a/www/qt5-websockets/distinfo +++ b/www/qt5-websockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941151 -SHA256 (KDE/Qt/5.15.8/kde-qtwebsockets-5.15.8p2.tar.xz) = 261e54032c1b92f7881b79b257bff8627944a3aeec9f6cabd2edf250a05997a8 -SIZE (KDE/Qt/5.15.8/kde-qtwebsockets-5.15.8p2.tar.xz) = 237036 +TIMESTAMP = 1694024649 +SHA256 (KDE/Qt/5.15.10/kde-qtwebsockets-5.15.10p2.tar.xz) = 25f114df83343c7edb03684f7dba19043179caa5c9dce8fd0d949896d8a1cc97 +SIZE (KDE/Qt/5.15.10/kde-qtwebsockets-5.15.10p2.tar.xz) = 237040 diff --git a/www/qt5-webview/Makefile b/www/qt5-webview/Makefile index cae306c8e076..86e237fd67d2 100644 --- a/www/qt5-webview/Makefile +++ b/www/qt5-webview/Makefile @@ -1,6 +1,5 @@ PORTNAME= webview PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- diff --git a/www/qt5-webview/distinfo b/www/qt5-webview/distinfo index b0c60e07b9de..e41ae208bb74 100644 --- a/www/qt5-webview/distinfo +++ b/www/qt5-webview/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941153 -SHA256 (KDE/Qt/5.15.8/kde-qtwebview-5.15.8p0.tar.xz) = 3fb9f9b57688fb6c1efd6c924929e34039658e08b18c6102a3699ba1388f14b0 -SIZE (KDE/Qt/5.15.8/kde-qtwebview-5.15.8p0.tar.xz) = 112248 +TIMESTAMP = 1694024668 +SHA256 (KDE/Qt/5.15.10/kde-qtwebview-5.15.10p0.tar.xz) = 69341b34d788ba9940093d08c533ac39fc9609c566296f8f1293dd2f45504484 +SIZE (KDE/Qt/5.15.10/kde-qtwebview-5.15.10p0.tar.xz) = 112324 diff --git a/x11-toolkits/qt5-charts/distinfo b/x11-toolkits/qt5-charts/distinfo index d1464cdffa5a..03c8402809ed 100644 --- a/x11-toolkits/qt5-charts/distinfo +++ b/x11-toolkits/qt5-charts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941155 -SHA256 (KDE/Qt/5.15.8/kde-qtcharts-5.15.8p0.tar.xz) = 27e7eac83cf4f1618f26df6dc235e17f70998317b43e2f9a25aa7c3f614a860c -SIZE (KDE/Qt/5.15.8/kde-qtcharts-5.15.8p0.tar.xz) = 4219012 +TIMESTAMP = 1694022381 +SHA256 (KDE/Qt/5.15.10/kde-qtcharts-5.15.10p0.tar.xz) = 976e4292f5e343f5dc7d52a02a8c7eb1d501f70a13a329c326802a8edb574a2a +SIZE (KDE/Qt/5.15.10/kde-qtcharts-5.15.10p0.tar.xz) = 4219096 diff --git a/x11-toolkits/qt5-datavis3d/distinfo b/x11-toolkits/qt5-datavis3d/distinfo index 5b5f25a65aa4..b14be8d0edfb 100644 --- a/x11-toolkits/qt5-datavis3d/distinfo +++ b/x11-toolkits/qt5-datavis3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941156 -SHA256 (KDE/Qt/5.15.8/kde-qtdatavis3d-5.15.8p0.tar.xz) = fd05d3ac62f03552eea9d2a7cd5024d47cb499ebb5f8ac7815f7b5706122a9cf -SIZE (KDE/Qt/5.15.8/kde-qtdatavis3d-5.15.8p0.tar.xz) = 5159756 +TIMESTAMP = 1694022551 +SHA256 (KDE/Qt/5.15.10/kde-qtdatavis3d-5.15.10p0.tar.xz) = dd89a01f55621d3634670d9b83ec4caa20d2ac9d9bc6ce9b60c6f243f5b95186 +SIZE (KDE/Qt/5.15.10/kde-qtdatavis3d-5.15.10p0.tar.xz) = 5159764 diff --git a/x11-toolkits/qt5-declarative-test/distinfo b/x11-toolkits/qt5-declarative-test/distinfo index 3c9fb438d28d..7b9889bb42db 100644 --- a/x11-toolkits/qt5-declarative-test/distinfo +++ b/x11-toolkits/qt5-declarative-test/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941159 -SHA256 (KDE/Qt/5.15.8/kde-qtdeclarative-5.15.8p21.tar.xz) = a9cc690a5c9cdbe531805d87dc9d272760a882df7b192f47587a31a660d9a0f8 -SIZE (KDE/Qt/5.15.8/kde-qtdeclarative-5.15.8p21.tar.xz) = 19018268 +TIMESTAMP = 1694026758 +SHA256 (KDE/Qt/5.15.10/kde-qtdeclarative-5.15.10p31.tar.xz) = 719c2455a69bbb21d725fe3f4f82c70a751ea401dc0120e96b2ade94713e248b +SIZE (KDE/Qt/5.15.10/kde-qtdeclarative-5.15.10p31.tar.xz) = 19035344 diff --git a/x11-toolkits/qt5-declarative/distinfo b/x11-toolkits/qt5-declarative/distinfo index e01016899961..563472ef3726 100644 --- a/x11-toolkits/qt5-declarative/distinfo +++ b/x11-toolkits/qt5-declarative/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941158 -SHA256 (KDE/Qt/5.15.8/kde-qtdeclarative-5.15.8p21.tar.xz) = a9cc690a5c9cdbe531805d87dc9d272760a882df7b192f47587a31a660d9a0f8 -SIZE (KDE/Qt/5.15.8/kde-qtdeclarative-5.15.8p21.tar.xz) = 19018268 +TIMESTAMP = 1694022721 +SHA256 (KDE/Qt/5.15.10/kde-qtdeclarative-5.15.10p31.tar.xz) = 719c2455a69bbb21d725fe3f4f82c70a751ea401dc0120e96b2ade94713e248b +SIZE (KDE/Qt/5.15.10/kde-qtdeclarative-5.15.10p31.tar.xz) = 19035344 diff --git a/x11-toolkits/qt5-gamepad/distinfo b/x11-toolkits/qt5-gamepad/distinfo index 0d9d06be8198..93c95b80a3d0 100644 --- a/x11-toolkits/qt5-gamepad/distinfo +++ b/x11-toolkits/qt5-gamepad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941160 -SHA256 (KDE/Qt/5.15.8/kde-qtgamepad-5.15.8p0.tar.xz) = 0c99ec5720aae0c4ad85ae1765df8d975db32be7b2e1924d7636272e4d59ceb4 -SIZE (KDE/Qt/5.15.8/kde-qtgamepad-5.15.8p0.tar.xz) = 365400 +TIMESTAMP = 1694022797 +SHA256 (KDE/Qt/5.15.10/kde-qtgamepad-5.15.10p0.tar.xz) = a78863304c8f7147678f881ebc1fb37b83f07082a9486d06d89e8a98df27fc7e +SIZE (KDE/Qt/5.15.10/kde-qtgamepad-5.15.10p0.tar.xz) = 365436 diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index e96e3abbd477..ee7445e79643 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -1,6 +1,5 @@ PORTNAME= gui PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 2 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-gui/distinfo b/x11-toolkits/qt5-gui/distinfo index e2ba7c98435c..6886605d2a7b 100644 --- a/x11-toolkits/qt5-gui/distinfo +++ b/x11-toolkits/qt5-gui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941161 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785715 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/x11-toolkits/qt5-quick3d/distinfo b/x11-toolkits/qt5-quick3d/distinfo index 74658c33d9bd..62cd85f4bc2d 100644 --- a/x11-toolkits/qt5-quick3d/distinfo +++ b/x11-toolkits/qt5-quick3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941162 -SHA256 (KDE/Qt/5.15.8/kde-qtquick3d-5.15.8p1.tar.xz) = 2a9ce51574cae1d2999ea624a5cc80bde106b54a3979504cb40dea6806c4b578 -SIZE (KDE/Qt/5.15.8/kde-qtquick3d-5.15.8p1.tar.xz) = 18255944 +TIMESTAMP = 1694023186 +SHA256 (KDE/Qt/5.15.10/kde-qtquick3d-5.15.10p1.tar.xz) = f3ec9e708706189030075d5d822a13e2d4ca22d53ac8a2587fdce8478b7adade +SIZE (KDE/Qt/5.15.10/kde-qtquick3d-5.15.10p1.tar.xz) = 18255676 diff --git a/x11-toolkits/qt5-quickcontrols/distinfo b/x11-toolkits/qt5-quickcontrols/distinfo index f406b61a509d..451373094f59 100644 --- a/x11-toolkits/qt5-quickcontrols/distinfo +++ b/x11-toolkits/qt5-quickcontrols/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941163 -SHA256 (KDE/Qt/5.15.8/kde-qtquickcontrols-5.15.8p0.tar.xz) = f9f9b5221d0b0a8b7a80ca3ff1916e375cd1e642110739494342ef362bdf5fdb -SIZE (KDE/Qt/5.15.8/kde-qtquickcontrols-5.15.8p0.tar.xz) = 5956600 +TIMESTAMP = 1694023253 +SHA256 (KDE/Qt/5.15.10/kde-qtquickcontrols-5.15.10p0.tar.xz) = c620001a15c332a71fccb477c2701af062d65066e5704ec869c070b96a3ab0cd +SIZE (KDE/Qt/5.15.10/kde-qtquickcontrols-5.15.10p0.tar.xz) = 5956692 diff --git a/x11-toolkits/qt5-quickcontrols2/distinfo b/x11-toolkits/qt5-quickcontrols2/distinfo index c8e532640af4..4e2b80a4e1ea 100644 --- a/x11-toolkits/qt5-quickcontrols2/distinfo +++ b/x11-toolkits/qt5-quickcontrols2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941164 -SHA256 (KDE/Qt/5.15.8/kde-qtquickcontrols2-5.15.8p7.tar.xz) = 87b8be4ea10e2adbe78199bc0e1e532290fae6082c5bbff975ff3be3405eea6f -SIZE (KDE/Qt/5.15.8/kde-qtquickcontrols2-5.15.8p7.tar.xz) = 8248416 +TIMESTAMP = 1694023741 +SHA256 (KDE/Qt/5.15.10/kde-qtquickcontrols2-5.15.10p6.tar.xz) = 3b8b1c6e7417c961cb267e8873798da2cf7cd02f3ad50e72d16a39ef251e6b55 +SIZE (KDE/Qt/5.15.10/kde-qtquickcontrols2-5.15.10p6.tar.xz) = 8249976 diff --git a/x11-toolkits/qt5-quicktimeline/distinfo b/x11-toolkits/qt5-quicktimeline/distinfo index a4f0da42e6db..b2aeb2b15958 100644 --- a/x11-toolkits/qt5-quicktimeline/distinfo +++ b/x11-toolkits/qt5-quicktimeline/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941165 -SHA256 (KDE/Qt/5.15.8/kde-qtquicktimeline-5.15.8p0.tar.xz) = 477fc42ec65d65a0e965989a05730eeba8c56bea01b00529bc249d1b2996a78a -SIZE (KDE/Qt/5.15.8/kde-qtquicktimeline-5.15.8p0.tar.xz) = 82112 +TIMESTAMP = 1694023770 +SHA256 (KDE/Qt/5.15.10/kde-qtquicktimeline-5.15.10p0.tar.xz) = c6dad2bc7690fb4a7c6a9a9b3d517a7d1ac464289a60e779b388485e1a65e2f9 +SIZE (KDE/Qt/5.15.10/kde-qtquicktimeline-5.15.10p0.tar.xz) = 82132 diff --git a/x11-toolkits/qt5-uiplugin/distinfo b/x11-toolkits/qt5-uiplugin/distinfo index 2591ca7cf4e1..032d1c8f1186 100644 --- a/x11-toolkits/qt5-uiplugin/distinfo +++ b/x11-toolkits/qt5-uiplugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941166 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694026778 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/x11-toolkits/qt5-virtualkeyboard/distinfo b/x11-toolkits/qt5-virtualkeyboard/distinfo index 25e8d60b1ddc..e520ca7d6836 100644 --- a/x11-toolkits/qt5-virtualkeyboard/distinfo +++ b/x11-toolkits/qt5-virtualkeyboard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941168 -SHA256 (KDE/Qt/5.15.8/kde-qtvirtualkeyboard-5.15.8p0.tar.xz) = 37c9c20f809be483047e27daae6ff164be518f8bd890b37b8453458c38be03df -SIZE (KDE/Qt/5.15.8/kde-qtvirtualkeyboard-5.15.8p0.tar.xz) = 10926800 +TIMESTAMP = 1694024462 +SHA256 (KDE/Qt/5.15.10/kde-qtvirtualkeyboard-5.15.10p0.tar.xz) = bd21ae632eaede64bd3276ad5fcc2dd62ebf6612eeb4726b193f01ace9c99d07 +SIZE (KDE/Qt/5.15.10/kde-qtvirtualkeyboard-5.15.10p0.tar.xz) = 10924408 diff --git a/x11-toolkits/qt5-widgets/distinfo b/x11-toolkits/qt5-widgets/distinfo index 48467cf6289b..c35fba5708fe 100644 --- a/x11-toolkits/qt5-widgets/distinfo +++ b/x11-toolkits/qt5-widgets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941169 -SHA256 (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = b0e2b86fce2f595d7888ff95a36ac27d36f321eb15977e160990bad19b07ffde -SIZE (KDE/Qt/5.15.8/kde-qtbase-5.15.8p157.tar.xz) = 50137244 +TIMESTAMP = 1694785722 +SHA256 (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 8a25e4365fc27b050a8b9e317cb1745a0c321693d6a0009d16a8400db8c4ef9f +SIZE (KDE/Qt/5.15.10/kde-qtbase-5.15.10p156.tar.xz) = 50198900 diff --git a/x11/qt5-qev/distinfo b/x11/qt5-qev/distinfo index 05237d8eda9f..9725809bd1aa 100644 --- a/x11/qt5-qev/distinfo +++ b/x11/qt5-qev/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941170 -SHA256 (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = be4457a92f2a5450dfa8dc81345067824c1d0184c808d2ba2e3da622ffda6c7e -SIZE (KDE/Qt/5.15.8/kde-qttools-5.15.8p1.tar.xz) = 8844056 +TIMESTAMP = 1694026801 +SHA256 (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 08543fe9bfeb601b5c80802e4733af66426cc5fe29f62f345837ba7c4131fcc6 +SIZE (KDE/Qt/5.15.10/kde-qttools-5.15.10p3.tar.xz) = 8846092 diff --git a/x11/qt5-x11extras/distinfo b/x11/qt5-x11extras/distinfo index 9ec5de3ed6c0..8a6492a07890 100644 --- a/x11/qt5-x11extras/distinfo +++ b/x11/qt5-x11extras/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672941171 -SHA256 (KDE/Qt/5.15.8/kde-qtx11extras-5.15.8p0.tar.xz) = f47eed97cac44951dc841b8b5aaa5469795b52f58afa3b8637b750daa4534040 -SIZE (KDE/Qt/5.15.8/kde-qtx11extras-5.15.8p0.tar.xz) = 123236 +TIMESTAMP = 1694024737 +SHA256 (KDE/Qt/5.15.10/kde-qtx11extras-5.15.10p0.tar.xz) = 7d93f24fe8daaa11ee3c89445300e7d533227561be4a9a6a7c94bf13f5397d63 +SIZE (KDE/Qt/5.15.10/kde-qtx11extras-5.15.10p0.tar.xz) = 123260 |