git: 2a5c778173f1 - main - Qt5: Update to 5.15.10
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 25 Sep 2023 15:38:27 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2a5c778173f13a057551b4284269b82f6faa077f
commit 2a5c778173f13a057551b4284269b82f6faa077f
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-09-18 20:02:30 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-09-25 15:35:16 +0000
Qt5: Update to 5.15.10
Update devel/qt5-script* and www/qt5-webengine to 5.15.15-lts
Update devel/pyside2* and devel/shiboken2 to 5.15.10
Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.10/release-note.md
PR: 273934
Exp-run by: antoine
---
Mk/Uses/qt-dist.mk | 35 ++++++++++++++--------
Mk/Uses/qt.mk | 2 +-
accessibility/qt5-speech/Makefile | 1 -
accessibility/qt5-speech/distinfo | 6 ++--
comms/qt5-connectivity/distinfo | 6 ++--
comms/qt5-connectivity/pkg-plist | 1 -
comms/qt5-sensors/distinfo | 6 ++--
comms/qt5-serialbus/distinfo | 6 ++--
comms/qt5-serialport/distinfo | 6 ++--
databases/qt5-sql/distinfo | 6 ++--
databases/qt5-sqldrivers-ibase/Makefile | 1 -
databases/qt5-sqldrivers-ibase/distinfo | 6 ++--
databases/qt5-sqldrivers-mysql/distinfo | 6 ++--
...ch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp | 10 +++----
databases/qt5-sqldrivers-odbc/distinfo | 6 ++--
databases/qt5-sqldrivers-pgsql/distinfo | 6 ++--
databases/qt5-sqldrivers-sqlite2/distinfo | 6 ++--
databases/qt5-sqldrivers-sqlite3/distinfo | 6 ++--
databases/qt5-sqldrivers-tds/distinfo | 6 ++--
devel/pyside2-tools/Makefile | 3 +-
devel/pyside2-tools/distinfo | 6 ++--
devel/pyside2/Makefile | 3 +-
devel/pyside2/distinfo | 6 ++--
devel/pyside2/pkg-plist | 10 ++++---
devel/qt5-assistant/distinfo | 6 ++--
devel/qt5-buildtools/distinfo | 6 ++--
devel/qt5-concurrent/distinfo | 6 ++--
devel/qt5-core/Makefile | 1 -
devel/qt5-core/distinfo | 6 ++--
devel/qt5-dbus/distinfo | 6 ++--
devel/qt5-designer/distinfo | 6 ++--
devel/qt5-help/distinfo | 6 ++--
devel/qt5-linguist/distinfo | 6 ++--
devel/qt5-linguisttools/distinfo | 6 ++--
devel/qt5-location/distinfo | 6 ++--
devel/qt5-location/pkg-plist | 4 ---
devel/qt5-qdbus/distinfo | 6 ++--
devel/qt5-qdbusviewer/distinfo | 6 ++--
devel/qt5-qdoc-data/distinfo | 6 ++--
devel/qt5-qdoc/distinfo | 6 ++--
devel/qt5-qmake/Makefile | 1 -
devel/qt5-qmake/distinfo | 6 ++--
devel/qt5-remoteobjects/distinfo | 6 ++--
devel/qt5-script/Makefile | 5 ++++
devel/qt5-script/distinfo | 6 ++--
devel/qt5-scripttools/Makefile | 5 ++++
devel/qt5-scripttools/distinfo | 6 ++--
devel/qt5-scxml/distinfo | 6 ++--
devel/qt5-testlib/distinfo | 6 ++--
devel/qt5-uitools/distinfo | 6 ++--
devel/qt5/Makefile | 1 -
devel/qt5/files/create_kde-qt_release.sh | 23 ++++++++------
devel/shiboken2/Makefile | 3 +-
devel/shiboken2/distinfo | 6 ++--
devel/shiboken2/pkg-plist | 13 ++++----
graphics/qt5-3d/distinfo | 6 ++--
graphics/qt5-graphicaleffects/distinfo | 6 ++--
graphics/qt5-imageformats/Makefile | 1 -
graphics/qt5-imageformats/distinfo | 6 ++--
graphics/qt5-opengl/distinfo | 6 ++--
graphics/qt5-pixeltool/distinfo | 6 ++--
graphics/qt5-svg/distinfo | 6 ++--
graphics/qt5-wayland/distinfo | 6 ++--
misc/qt5-examples/distinfo | 6 ++--
misc/qt5-examples/pkg-plist | 1 +
misc/qt5-l10n/distinfo | 6 ++--
multimedia/qt5-multimedia/Makefile | 1 -
multimedia/qt5-multimedia/distinfo | 6 ++--
net/qt5-network/distinfo | 6 ++--
net/qt5-networkauth/distinfo | 6 ++--
print/qt5-printsupport/distinfo | 6 ++--
sysutils/qt5-qtdiag/distinfo | 6 ++--
sysutils/qt5-qtpaths/distinfo | 6 ++--
sysutils/qt5-qtplugininfo/distinfo | 6 ++--
textproc/qt5-xml/distinfo | 6 ++--
textproc/qt5-xmlpatterns/distinfo | 6 ++--
www/qt5-webchannel/distinfo | 6 ++--
www/qt5-webengine/Makefile | 14 +++++----
www/qt5-webengine/distinfo | 6 ++--
...d__party_skia_src_opts_SkRasterPipeline__opts.h | 31 ++++++++-----------
.../files/patch-src_pdfwidgets_configure.json | 11 +++++++
.../patch-src_webenginewidgets_configure.json | 11 +++++++
www/qt5-webglplugin/distinfo | 6 ++--
www/qt5-websockets-qml/distinfo | 6 ++--
www/qt5-websockets/distinfo | 6 ++--
www/qt5-webview/Makefile | 1 -
www/qt5-webview/distinfo | 6 ++--
x11-toolkits/qt5-charts/distinfo | 6 ++--
x11-toolkits/qt5-datavis3d/distinfo | 6 ++--
x11-toolkits/qt5-declarative-test/distinfo | 6 ++--
x11-toolkits/qt5-declarative/distinfo | 6 ++--
x11-toolkits/qt5-gamepad/distinfo | 6 ++--
x11-toolkits/qt5-gui/Makefile | 1 -
x11-toolkits/qt5-gui/distinfo | 6 ++--
x11-toolkits/qt5-quick3d/distinfo | 6 ++--
x11-toolkits/qt5-quickcontrols/distinfo | 6 ++--
x11-toolkits/qt5-quickcontrols2/distinfo | 6 ++--
x11-toolkits/qt5-quicktimeline/distinfo | 6 ++--
x11-toolkits/qt5-uiplugin/distinfo | 6 ++--
x11-toolkits/qt5-virtualkeyboard/distinfo | 6 ++--
x11-toolkits/qt5-widgets/distinfo | 6 ++--
x11/qt5-qev/distinfo | 6 ++--
x11/qt5-x11extras/distinfo | 6 ++--
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
*** 592 LINES SKIPPED ***