git: 787e501e3d8f - main - qt5: Update Qt to 5.15.5 (KDE patched)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Jul 2022 07:32:12 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=787e501e3d8fdc162dc019f352b280298b192b0a
commit 787e501e3d8fdc162dc019f352b280298b192b0a
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2022-06-28 08:08:18 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-07-04 07:31:38 +0000
qt5: Update Qt to 5.15.5 (KDE patched)
- update patch-collection diff to be at the highest patch-level
- update patch-collection diff to be against 5.15.5 instead of 5.15.2
- update devel/qt5-script to 5.15.10
- libressl support by Felix Palmen <felix@palmen-it.de>
PR: 264944
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D35619
---
Mk/Uses/qt-dist.mk | 74 ++++++++-------
Mk/Uses/qt.mk | 6 +-
accessibility/qt5-speech/distinfo | 6 +-
comms/qt5-connectivity/distinfo | 6 +-
comms/qt5-sensors/distinfo | 6 +-
comms/qt5-serialbus/distinfo | 6 +-
comms/qt5-serialport/distinfo | 6 +-
databases/qt5-sql/distinfo | 6 +-
databases/qt5-sqldrivers-ibase/distinfo | 6 +-
databases/qt5-sqldrivers-mysql/distinfo | 6 +-
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/qt5-assistant/distinfo | 6 +-
devel/qt5-buildtools/distinfo | 6 +-
devel/qt5-concurrent/distinfo | 6 +-
devel/qt5-core/distinfo | 6 +-
.../files/patch-CVE-2022-25255-qprocess5-15.diff | 63 -------------
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-qdbus/distinfo | 6 +-
devel/qt5-qdbusviewer/distinfo | 6 +-
devel/qt5-qdoc-data/Makefile | 7 +-
devel/qt5-qdoc-data/distinfo | 6 +-
devel/qt5-qdoc/distinfo | 6 +-
devel/qt5-qmake/distinfo | 6 +-
devel/qt5-remoteobjects/distinfo | 6 +-
devel/qt5-script/Makefile | 2 +
devel/qt5-script/distinfo | 6 +-
devel/qt5-scripttools/Makefile | 2 +
devel/qt5-scripttools/distinfo | 6 +-
devel/qt5-scxml/distinfo | 6 +-
devel/qt5-testlib/distinfo | 6 +-
devel/qt5-uitools/distinfo | 6 +-
devel/qt5/files/create_kde-qt_release.sh | 7 +-
graphics/qt5-3d/distinfo | 6 +-
graphics/qt5-graphicaleffects/distinfo | 6 +-
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 +-
graphics/qt5-wayland/files/patch-libglvnd | 38 --------
misc/qt5-examples/Makefile | 5 +-
misc/qt5-examples/distinfo | 6 +-
misc/qt5-examples/pkg-plist | 2 +
misc/qt5-l10n/distinfo | 6 +-
multimedia/qt5-multimedia/distinfo | 6 +-
net/qt5-network/distinfo | 6 +-
...ch-src_network_ssl_qsslcertificate__openssl.cpp | 12 ---
.../patch-src_network_ssl_qsslcontext__openssl.cpp | 50 ++++------
...patch-src_network_ssl_qsslcontext__openssl__p.h | 17 ----
.../patch-src_network_ssl_qsslsocket__openssl.cpp | 33 +++----
...rc_network_ssl_qsslsocket__openssl__symbols.cpp | 103 +--------------------
...c_network_ssl_qsslsocket__openssl__symbols__p.h | 87 +----------------
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-webglplugin/distinfo | 6 +-
www/qt5-websockets-qml/distinfo | 6 +-
www/qt5-websockets/distinfo | 6 +-
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/distinfo | 6 +-
x11-toolkits/qt5-quick3d/distinfo | 6 +-
x11-toolkits/qt5-quick3d/pkg-plist | 15 ++-
x11-toolkits/qt5-quickcontrols/distinfo | 6 +-
x11-toolkits/qt5-quickcontrols2/distinfo | 6 +-
x11-toolkits/qt5-quickcontrols2/pkg-plist | 5 +-
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 +-
90 files changed, 327 insertions(+), 633 deletions(-)
diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
index 40b109ee4a9e..d644f0b44d58 100644
--- a/Mk/Uses/qt-dist.mk
+++ b/Mk/Uses/qt-dist.mk
@@ -69,44 +69,48 @@ DESTDIRNAME= INSTALL_ROOT
. if ${_QT_VER:M5}
# KDE maintains a repository with a patched Qt5 distribution.
-_KDE_3d= 39
-_KDE_base= 263
-_KDE_charts= 2
-_KDE_connectivity= 1
-_KDE_datavis3d= 2
-_KDE_declarative= 41
-_KDE_gamepad= 2
-_KDE_graphicaleffects= 2
+_KDE_3d= 15
+_KDE_base= 165
+_KDE_charts= 1
+_KDE_connectivity= 5
+_KDE_datavis3d= 0
+_KDE_declarative= 19
+_KDE_gamepad= 0
+_KDE_graphicaleffects= 0
_KDE_imageformats= 3
-_KDE_location= 6
-_KDE_multimedia= 3
-_KDE_networkauth= 2
-_KDE_quick3d= 19
-_KDE_quickcontrols= 3
-_KDE_quickcontrols2= 8
-_KDE_quicktimeline= 3
-_KDE_remoteobjects= 3
-_KDE_script= 4
-_KDE_scxml= 1
-_KDE_sensors= 2
-_KDE_serialbus= 2
-_KDE_serialport= 2
-_KDE_speech= 2
-_KDE_svg= 13
-_KDE_tools= 17
-_KDE_translations= 22
-_KDE_virtualkeyboard= 4
-_KDE_wayland= 37
-_KDE_webchannel= 2
-_KDE_webglplugin= 2
-_KDE_websockets= 4
-_KDE_webview= 2
-_KDE_x11extras= 1
-_KDE_xmlpatterns= 2
+_KDE_location= 3
+_KDE_multimedia= 1
+_KDE_networkauth= 0
+_KDE_quick3d= 1
+_KDE_quickcontrols= 0
+_KDE_quickcontrols2= 5
+_KDE_quicktimeline= 0
+_KDE_remoteobjects= 0
+_KDE_script= 0
+_KDE_script_ORIGIN_TAG= v5.15.10-lts
+_KDE_script_VERSION= 5.15.10
+_KDE_scxml= 0
+_KDE_sensors= 0
+_KDE_serialbus= 0
+_KDE_serialport= 0
+_KDE_speech= 1
+_KDE_svg= 10
+_KDE_tools= 1
+_KDE_translations= 2
+_KDE_virtualkeyboard= 3
+_KDE_wayland= 39
+_KDE_webchannel= 3
+_KDE_webglplugin= 0
+_KDE_websockets= 3
+_KDE_webview= 0
+_KDE_x11extras= 0
+_KDE_xmlpatterns= 0
. if defined(_KDE_${_QT_DIST})
# KDE patched Qt parts
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
MASTER_SITES= LOCAL/tcberner/KDE/Qt/${_QT_VERSION}
DISTNAME= ${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVERSION},}
COMMENT+= (KDE patched)
@@ -460,6 +464,8 @@ qt-post-install:
qt-create-kde-distfile:
${SH} ${PORTSDIR}/devel/${_QT_RELNAME}/files/create_kde-qt_release.sh \
${_QT_DIST} \
- ${DISTDIR}/${DIST_SUBDIR}
+ ${DISTDIR}/${DIST_SUBDIR} \
+ ${_KDE_${_QT_DIST}_VERSION} \
+ ${_KDE_${_QT_DIST}_ORIGIN_TAG}
.endif # defined(_QT_DIST_MK_INCLUDED)
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index 7cecb91cb169..659dda05c8c8 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -22,7 +22,7 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5
-QT5_VERSION?= 5.15.2
+QT5_VERSION?= 5.15.5
# We accept the Qt version to be passed by either or all of the three mk files.
. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
@@ -154,7 +154,7 @@ qt-assistant_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/assistant
# Always build with *this* version's buildtools
qt-buildtools_PORT= devel/${_QT_RELNAME}-buildtools
-qt-buildtools_PATH= ${_QT_RELNAME}-buildtools>=${_QT_VERSION}
+qt-buildtools_PATH= ${_QT_RELNAME}-buildtools>=${_QT_VERSION:R}
qt-charts_PORT= x11-toolkits/${_QT_RELNAME}-charts
qt-charts_LIB= libQt${_QT_LIBVER}Charts.so
@@ -263,7 +263,7 @@ qt-qev_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qev
# Always build with *this* version's qmake
qt-qmake_PORT= devel/${_QT_RELNAME}-qmake
-qt-qmake_PATH= ${_QT_RELNAME}-qmake>=${_QT_VERSION}
+qt-qmake_PATH= ${_QT_RELNAME}-qmake>=${_QT_VERSION:R}
qt-quick3d_PORT= x11-toolkits/${_QT_RELNAME}-quick3d
qt-quick3d_LIB= libQt${_QT_LIBVER}Quick3D.so
diff --git a/accessibility/qt5-speech/distinfo b/accessibility/qt5-speech/distinfo
index dc27ac3c85c7..6c6adc0ee36e 100644
--- a/accessibility/qt5-speech/distinfo
+++ b/accessibility/qt5-speech/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423750
-SHA256 (KDE/Qt/5.15.2/kde-qtspeech-5.15.2p2.tar.xz) = 83f3543ef261b7603615fd07a3f9d938ba1377aa2a955e449b0cc87efd543989
-SIZE (KDE/Qt/5.15.2/kde-qtspeech-5.15.2p2.tar.xz) = 80208
+TIMESTAMP = 1656427309
+SHA256 (KDE/Qt/5.15.5/kde-qtspeech-5.15.5p1.tar.xz) = 46ac06e9a8761375e0588ef79b201147ce9129e5614160f59081f91a6342da13
+SIZE (KDE/Qt/5.15.5/kde-qtspeech-5.15.5p1.tar.xz) = 80124
diff --git a/comms/qt5-connectivity/distinfo b/comms/qt5-connectivity/distinfo
index bd6f9d81063d..19157b7ba938 100644
--- a/comms/qt5-connectivity/distinfo
+++ b/comms/qt5-connectivity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423751
-SHA256 (KDE/Qt/5.15.2/kde-qtconnectivity-5.15.2p1.tar.xz) = 768324678b18c535c34d10a304124352b6befc7be6f0496bbb7b6ed6376f382e
-SIZE (KDE/Qt/5.15.2/kde-qtconnectivity-5.15.2p1.tar.xz) = 2784408
+TIMESTAMP = 1656427310
+SHA256 (KDE/Qt/5.15.5/kde-qtconnectivity-5.15.5p5.tar.xz) = 5b35c05bdd556b38674e81910532bc1f7a9d61fecb19548a0b7dfce0ae4589b4
+SIZE (KDE/Qt/5.15.5/kde-qtconnectivity-5.15.5p5.tar.xz) = 2784836
diff --git a/comms/qt5-sensors/distinfo b/comms/qt5-sensors/distinfo
index 30da2f69b490..c2115e1346ff 100644
--- a/comms/qt5-sensors/distinfo
+++ b/comms/qt5-sensors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423751
-SHA256 (KDE/Qt/5.15.2/kde-qtsensors-5.15.2p2.tar.xz) = ad17bde11441d00f5a0db4ecf87a40833953981ac3a8039243c8de1b0d2122de
-SIZE (KDE/Qt/5.15.2/kde-qtsensors-5.15.2p2.tar.xz) = 2030628
+TIMESTAMP = 1656427311
+SHA256 (KDE/Qt/5.15.5/kde-qtsensors-5.15.5p0.tar.xz) = dc57096ab2b6f6167b12c89961378b10fe9c2b1a263da8a8b9cda54c8788f870
+SIZE (KDE/Qt/5.15.5/kde-qtsensors-5.15.5p0.tar.xz) = 2030764
diff --git a/comms/qt5-serialbus/distinfo b/comms/qt5-serialbus/distinfo
index ae74f66d9194..0e2e0d4e7059 100644
--- a/comms/qt5-serialbus/distinfo
+++ b/comms/qt5-serialbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423752
-SHA256 (KDE/Qt/5.15.2/kde-qtserialbus-5.15.2p2.tar.xz) = 0d0befb361f18e4b46a3f8ed6ceebc94d34c3266a609720e3ff980a459e26715
-SIZE (KDE/Qt/5.15.2/kde-qtserialbus-5.15.2p2.tar.xz) = 333156
+TIMESTAMP = 1656427312
+SHA256 (KDE/Qt/5.15.5/kde-qtserialbus-5.15.5p0.tar.xz) = d2ebde3c16cd8c7d4fa38280acd17cf6a3d0e1580142992cd95760723c1040aa
+SIZE (KDE/Qt/5.15.5/kde-qtserialbus-5.15.5p0.tar.xz) = 333616
diff --git a/comms/qt5-serialport/distinfo b/comms/qt5-serialport/distinfo
index fb41f11fd71e..d032a83a2867 100644
--- a/comms/qt5-serialport/distinfo
+++ b/comms/qt5-serialport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423754
-SHA256 (KDE/Qt/5.15.2/kde-qtserialport-5.15.2p2.tar.xz) = 767e7b817b01ad747346c2c9bcccd26a652d8ca73915c68dd47386815eef445b
-SIZE (KDE/Qt/5.15.2/kde-qtserialport-5.15.2p2.tar.xz) = 300200
+TIMESTAMP = 1656427313
+SHA256 (KDE/Qt/5.15.5/kde-qtserialport-5.15.5p0.tar.xz) = ff96cf4b00336018a6827f8a6cc1860fb73e0b93c7902d5c40c6ef80d780a1c9
+SIZE (KDE/Qt/5.15.5/kde-qtserialport-5.15.5p0.tar.xz) = 300224
diff --git a/databases/qt5-sql/distinfo b/databases/qt5-sql/distinfo
index bcdb973c77d3..42008ea24ac2 100644
--- a/databases/qt5-sql/distinfo
+++ b/databases/qt5-sql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423756
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427314
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/databases/qt5-sqldrivers-ibase/distinfo b/databases/qt5-sqldrivers-ibase/distinfo
index edd4b2c0b72c..07e1b050e6e1 100644
--- a/databases/qt5-sqldrivers-ibase/distinfo
+++ b/databases/qt5-sqldrivers-ibase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423854
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427315
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/databases/qt5-sqldrivers-mysql/distinfo b/databases/qt5-sqldrivers-mysql/distinfo
index dd3005449d03..2b6f29875da5 100644
--- a/databases/qt5-sqldrivers-mysql/distinfo
+++ b/databases/qt5-sqldrivers-mysql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423852
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427317
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/databases/qt5-sqldrivers-odbc/distinfo b/databases/qt5-sqldrivers-odbc/distinfo
index b86d11580e62..0244ba3b7e63 100644
--- a/databases/qt5-sqldrivers-odbc/distinfo
+++ b/databases/qt5-sqldrivers-odbc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423853
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427318
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/databases/qt5-sqldrivers-pgsql/distinfo b/databases/qt5-sqldrivers-pgsql/distinfo
index edd4b2c0b72c..6ee8ef592f65 100644
--- a/databases/qt5-sqldrivers-pgsql/distinfo
+++ b/databases/qt5-sqldrivers-pgsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423854
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427319
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/databases/qt5-sqldrivers-sqlite2/distinfo b/databases/qt5-sqldrivers-sqlite2/distinfo
index 742bb0954b08..51da39b223c0 100644
--- a/databases/qt5-sqldrivers-sqlite2/distinfo
+++ b/databases/qt5-sqldrivers-sqlite2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423856
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427320
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/databases/qt5-sqldrivers-sqlite3/distinfo b/databases/qt5-sqldrivers-sqlite3/distinfo
index 9e2135710150..6b9e8f7bd5b4 100644
--- a/databases/qt5-sqldrivers-sqlite3/distinfo
+++ b/databases/qt5-sqldrivers-sqlite3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423857
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427322
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/databases/qt5-sqldrivers-tds/distinfo b/databases/qt5-sqldrivers-tds/distinfo
index d9b36e06ab9c..87a7976430d3 100644
--- a/databases/qt5-sqldrivers-tds/distinfo
+++ b/databases/qt5-sqldrivers-tds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423858
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427323
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/devel/qt5-assistant/distinfo b/devel/qt5-assistant/distinfo
index 0d4531b45bb2..d92fe0f338ed 100644
--- a/devel/qt5-assistant/distinfo
+++ b/devel/qt5-assistant/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423860
-SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a
-SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464
+TIMESTAMP = 1656427324
+SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
+SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608
diff --git a/devel/qt5-buildtools/distinfo b/devel/qt5-buildtools/distinfo
index ad7fd12014dd..26474a458fef 100644
--- a/devel/qt5-buildtools/distinfo
+++ b/devel/qt5-buildtools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423861
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427325
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/devel/qt5-concurrent/distinfo b/devel/qt5-concurrent/distinfo
index 5c3758be8f88..48cdaadfa2e7 100644
--- a/devel/qt5-concurrent/distinfo
+++ b/devel/qt5-concurrent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423862
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427326
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/devel/qt5-core/distinfo b/devel/qt5-core/distinfo
index afc62138a969..7f2e89b20551 100644
--- a/devel/qt5-core/distinfo
+++ b/devel/qt5-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423864
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427327
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/devel/qt5-core/files/patch-CVE-2022-25255-qprocess5-15.diff b/devel/qt5-core/files/patch-CVE-2022-25255-qprocess5-15.diff
deleted file mode 100644
index 538ab4ead6db..000000000000
--- a/devel/qt5-core/files/patch-CVE-2022-25255-qprocess5-15.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-This is the patch linked from the announcement
- https://lists.qt-project.org/pipermail/announce/2022-February/000333.html
-with two changes: in our sources, the copyright year for the
-Qt Company is 2016, the upstream patch says 2021. Changed that
-to make the patch apply. The upstream patch is fetched with
-CRLF line-endings, changed to plain LF.
-
---- src/corelib/io/qprocess_unix.cpp
-+++ src/corelib/io/qprocess_unix.cpp
-@@ -1,7 +1,7 @@
- /****************************************************************************
- **
- ** Copyright (C) 2016 The Qt Company Ltd.
--** Copyright (C) 2016 Intel Corporation.
-+** Copyright (C) 2022 Intel Corporation.
- ** Contact: https://www.qt.io/licensing/
- **
- ** This file is part of the QtCore module of the Qt Toolkit.
-@@ -422,14 +422,15 @@ void QProcessPrivate::startProcess()
- // Add the program name to the argument list.
- argv[0] = nullptr;
- if (!program.contains(QLatin1Char('/'))) {
-+ // findExecutable() returns its argument if it's an absolute path,
-+ // otherwise it searches $PATH; returns empty if not found (we handle
-+ // that case much later)
- const QString &exeFilePath = QStandardPaths::findExecutable(program);
-- if (!exeFilePath.isEmpty()) {
-- const QByteArray &tmp = QFile::encodeName(exeFilePath);
-- argv[0] = ::strdup(tmp.constData());
-- }
-- }
-- if (!argv[0])
-+ const QByteArray &tmp = QFile::encodeName(exeFilePath);
-+ argv[0] = ::strdup(tmp.constData());
-+ } else {
- argv[0] = ::strdup(encodedProgramName.constData());
-+ }
-
- // Add every argument to the list
- for (int i = 0; i < arguments.count(); ++i)
-@@ -983,15 +984,16 @@ bool QProcessPrivate::startDetached(qint64 *pid)
- envp = _q_dupEnvironment(environment.d.constData()->vars, &envc);
- }
-
-- QByteArray tmp;
- if (!program.contains(QLatin1Char('/'))) {
-+ // findExecutable() returns its argument if it's an absolute path,
-+ // otherwise it searches $PATH; returns empty if not found (we handle
-+ // that case much later)
- const QString &exeFilePath = QStandardPaths::findExecutable(program);
-- if (!exeFilePath.isEmpty())
-- tmp = QFile::encodeName(exeFilePath);
-+ const QByteArray &tmp = QFile::encodeName(exeFilePath);
-+ argv[0] = ::strdup(tmp.constData());
-+ } else {
-+ argv[0] = ::strdup(QFile::encodeName(program));
- }
-- if (tmp.isEmpty())
-- tmp = QFile::encodeName(program);
-- argv[0] = tmp.data();
-
- if (envp)
- qt_safe_execve(argv[0], argv, envp);
diff --git a/devel/qt5-dbus/distinfo b/devel/qt5-dbus/distinfo
index 0e99e5287fd0..6b2aacd9f809 100644
--- a/devel/qt5-dbus/distinfo
+++ b/devel/qt5-dbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423865
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427329
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/devel/qt5-designer/distinfo b/devel/qt5-designer/distinfo
index 3bf6e6575462..d883545b03a5 100644
--- a/devel/qt5-designer/distinfo
+++ b/devel/qt5-designer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423866
-SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a
-SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464
+TIMESTAMP = 1656427330
+SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
+SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608
diff --git a/devel/qt5-help/distinfo b/devel/qt5-help/distinfo
index 18887f18a435..669f766daf6b 100644
--- a/devel/qt5-help/distinfo
+++ b/devel/qt5-help/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423867
-SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a
-SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464
+TIMESTAMP = 1656427331
+SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
+SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608
diff --git a/devel/qt5-linguist/distinfo b/devel/qt5-linguist/distinfo
index 984afb95baa4..a72677509e5d 100644
--- a/devel/qt5-linguist/distinfo
+++ b/devel/qt5-linguist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423868
-SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a
-SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464
+TIMESTAMP = 1656427332
+SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
+SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608
diff --git a/devel/qt5-linguisttools/distinfo b/devel/qt5-linguisttools/distinfo
index f1d1ebf9f91a..e0ec4da77582 100644
--- a/devel/qt5-linguisttools/distinfo
+++ b/devel/qt5-linguisttools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423869
-SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a
-SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464
+TIMESTAMP = 1656427333
+SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
+SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608
diff --git a/devel/qt5-location/distinfo b/devel/qt5-location/distinfo
index 705ae54f3698..9f00202adc75 100644
--- a/devel/qt5-location/distinfo
+++ b/devel/qt5-location/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423870
-SHA256 (KDE/Qt/5.15.2/kde-qtlocation-5.15.2p6.tar.xz) = 82bcf791ce0651b24c43a2875e629a1500f7a9a29378d49100ea5050cd2fa076
-SIZE (KDE/Qt/5.15.2/kde-qtlocation-5.15.2p6.tar.xz) = 4212420
+TIMESTAMP = 1656427334
+SHA256 (KDE/Qt/5.15.5/kde-qtlocation-5.15.5p3.tar.xz) = 72417611720a1a6a19b8aa01aaad3ce39e1ad4d4a4d78fc6afb7045adae7fad6
+SIZE (KDE/Qt/5.15.5/kde-qtlocation-5.15.5p3.tar.xz) = 4212176
diff --git a/devel/qt5-qdbus/distinfo b/devel/qt5-qdbus/distinfo
index a9b350ab4e08..fbde38f1eac6 100644
--- a/devel/qt5-qdbus/distinfo
+++ b/devel/qt5-qdbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423871
-SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a
-SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464
+TIMESTAMP = 1656427335
+SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
+SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608
diff --git a/devel/qt5-qdbusviewer/distinfo b/devel/qt5-qdbusviewer/distinfo
index 551e04498568..d9aa1cc5f3a0 100644
--- a/devel/qt5-qdbusviewer/distinfo
+++ b/devel/qt5-qdbusviewer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423872
-SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a
-SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464
+TIMESTAMP = 1656427336
+SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
+SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608
diff --git a/devel/qt5-qdoc-data/Makefile b/devel/qt5-qdoc-data/Makefile
index ae92b05fa7ac..d52eca24405a 100644
--- a/devel/qt5-qdoc-data/Makefile
+++ b/devel/qt5-qdoc-data/Makefile
@@ -7,7 +7,8 @@ DISTVERSION= ${QT5_VERSION}
CATEGORIES= devel textproc
MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/submodules/
PKGNAMEPREFIX= qt5-
-DISTNAME= qtbase-everywhere-src-${QT5_VERSION}
+DISTNAME= qtbase-everywhere-opensource-src-${QT5_VERSION}
+WRKSRC= ${WRKDIR}/qtbase-everywhere-src-${QT5_VERSION}
DIST_SUBDIR= KDE/Qt/${QT5_VERSION}
MAINTAINER= kde@FreeBSD.org
@@ -19,8 +20,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.FDL
USES= qt:5 tar:xz
USE_QT= # empty
-EXTRACT_AFTER_ARGS= --include ${DISTNAME}/LICENSE.FDL \
- --include ${DISTNAME}/doc
+EXTRACT_AFTER_ARGS= --include ${DISTNAME:S/-opensource//}/LICENSE.FDL \
+ --include ${DISTNAME:S/-opensource//}/doc
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/qt5-qdoc-data/distinfo b/devel/qt5-qdoc-data/distinfo
index 69871b4e830c..f96723437e5f 100644
--- a/devel/qt5-qdoc-data/distinfo
+++ b/devel/qt5-qdoc-data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639505201
-SHA256 (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8
-SIZE (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 50179672
+TIMESTAMP = 1656430132
+SHA256 (KDE/Qt/5.15.5/qtbase-everywhere-opensource-src-5.15.5.tar.xz) = 0c42c799aa7c89e479a07c451bf5a301e291266ba789e81afc18f95049524edc
+SIZE (KDE/Qt/5.15.5/qtbase-everywhere-opensource-src-5.15.5.tar.xz) = 50247388
diff --git a/devel/qt5-qdoc/distinfo b/devel/qt5-qdoc/distinfo
index 79fad251e6a4..e08085493d5b 100644
--- a/devel/qt5-qdoc/distinfo
+++ b/devel/qt5-qdoc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423873
-SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a
-SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464
+TIMESTAMP = 1656427337
+SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
+SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608
diff --git a/devel/qt5-qmake/distinfo b/devel/qt5-qmake/distinfo
index 526e93f5af27..ed87e0c74335 100644
--- a/devel/qt5-qmake/distinfo
+++ b/devel/qt5-qmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639421182
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427420
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/devel/qt5-remoteobjects/distinfo b/devel/qt5-remoteobjects/distinfo
index 640350bfd20f..bb5f698fbd9a 100644
--- a/devel/qt5-remoteobjects/distinfo
+++ b/devel/qt5-remoteobjects/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423876
-SHA256 (KDE/Qt/5.15.2/kde-qtremoteobjects-5.15.2p3.tar.xz) = f1c2d5d2346fdac017b2a40be80468d9ed50c50bfbdefc7e57f88ea1d111e6dd
-SIZE (KDE/Qt/5.15.2/kde-qtremoteobjects-5.15.2p3.tar.xz) = 350464
+TIMESTAMP = 1656427421
+SHA256 (KDE/Qt/5.15.5/kde-qtremoteobjects-5.15.5p0.tar.xz) = 9697cb392dc2301bd4c882344eb71c50a74729e83917082a9ee06128723e3a38
+SIZE (KDE/Qt/5.15.5/kde-qtremoteobjects-5.15.5p0.tar.xz) = 351708
diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile
index 20419d33b32a..1959ca52be7f 100644
--- a/devel/qt5-script/Makefile
+++ b/devel/qt5-script/Makefile
@@ -13,6 +13,8 @@ USE_QT= core buildtools_build
# doesn't work).
MAKE_ENV= MAKEOBJDIR=.
+QT5_VERSION= 5.15.10
+
post-patch:
@${REINPLACE_CMD} -e '/scripttools/ d' \
${WRKSRC}/src/src.pro
diff --git a/devel/qt5-script/distinfo b/devel/qt5-script/distinfo
index e1fc1ff6c2fc..7029d5192b2e 100644
--- a/devel/qt5-script/distinfo
+++ b/devel/qt5-script/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423877
-SHA256 (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 66671e9516df5b099cef4f0440db97d96d07990665c9311321ccfaaf0687b129
-SIZE (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 2623560
+TIMESTAMP = 1656428746
+SHA256 (KDE/Qt/5.15.10/kde-qtscript-5.15.10p0.tar.xz) = 35b2053c7e92b6af4a1a30dc1089cc433b05866be36f5133c1bce170f63793a7
+SIZE (KDE/Qt/5.15.10/kde-qtscript-5.15.10p0.tar.xz) = 2624152
diff --git a/devel/qt5-scripttools/Makefile b/devel/qt5-scripttools/Makefile
index 0f03a044087a..6ca53d33c143 100644
--- a/devel/qt5-scripttools/Makefile
+++ b/devel/qt5-scripttools/Makefile
@@ -12,6 +12,8 @@ USE_QT= core gui script widgets buildtools_build
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}
+QT5_VERSION= 5.15.10
+
# Link in QtScript port
_QT5_ADDITIONAL_LINK= script
diff --git a/devel/qt5-scripttools/distinfo b/devel/qt5-scripttools/distinfo
index ac9463e8ab1d..63c829b8eff7 100644
--- a/devel/qt5-scripttools/distinfo
+++ b/devel/qt5-scripttools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423878
-SHA256 (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 66671e9516df5b099cef4f0440db97d96d07990665c9311321ccfaaf0687b129
-SIZE (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 2623560
+TIMESTAMP = 1656433524
+SHA256 (KDE/Qt/5.15.10/kde-qtscript-5.15.10p0.tar.xz) = 35b2053c7e92b6af4a1a30dc1089cc433b05866be36f5133c1bce170f63793a7
+SIZE (KDE/Qt/5.15.10/kde-qtscript-5.15.10p0.tar.xz) = 2624152
diff --git a/devel/qt5-scxml/distinfo b/devel/qt5-scxml/distinfo
index 00cf9c478371..e73cd42659be 100644
--- a/devel/qt5-scxml/distinfo
+++ b/devel/qt5-scxml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423879
-SHA256 (KDE/Qt/5.15.2/kde-qtscxml-5.15.2p1.tar.xz) = e99d34a972c0bf84ad692edac47b4928e89053d692950a153535c7fc17011f4b
-SIZE (KDE/Qt/5.15.2/kde-qtscxml-5.15.2p1.tar.xz) = 408532
+TIMESTAMP = 1656427424
+SHA256 (KDE/Qt/5.15.5/kde-qtscxml-5.15.5p0.tar.xz) = 36c0acc4c85ead9bb8eb192b6d47c57c24384d352c923ab83148b17c2cc9feaf
+SIZE (KDE/Qt/5.15.5/kde-qtscxml-5.15.5p0.tar.xz) = 409372
diff --git a/devel/qt5-testlib/distinfo b/devel/qt5-testlib/distinfo
index 38f97651ea3c..b97bb89ce593 100644
--- a/devel/qt5-testlib/distinfo
+++ b/devel/qt5-testlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423880
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427425
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/devel/qt5-uitools/distinfo b/devel/qt5-uitools/distinfo
index 74e7ddfd2617..fc8190b9165f 100644
--- a/devel/qt5-uitools/distinfo
+++ b/devel/qt5-uitools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423881
-SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a
-SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464
+TIMESTAMP = 1656427426
+SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
+SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608
diff --git a/devel/qt5/files/create_kde-qt_release.sh b/devel/qt5/files/create_kde-qt_release.sh
index 8624cd456ac8..d46e4bd088d8 100644
--- a/devel/qt5/files/create_kde-qt_release.sh
+++ b/devel/qt5/files/create_kde-qt_release.sh
@@ -7,14 +7,15 @@
DIST="$1"
PROJECT=qt"${DIST}"
BASE_DIRECTORY="$2"
+# Version of Qt we want
+VERSION="$3"
+ORIGIN_TAG="$4"
# Remote KDE git repository
REPO="https://invent.kde.org/qt/qt/${PROJECT}.git"
# Local checkout
CHECKOUT="${BASE_DIRECTORY}/${PROJECT}"
-# Version of Qt we want
-VERSION=5.15.2
# KDE-Qt branch
BRANCH=kde/5.15
@@ -37,7 +38,7 @@ if [ $? -ne 0 ] ; then
fi
# Count number of patches added by KDE
-PATCH_COUNT=$(git -C ${CHECKOUT} rev-list --count origin/${VERSION}..origin/${BRANCH})
+PATCH_COUNT=$(git -C ${CHECKOUT} rev-list --count ${ORIGIN_TAG}..origin/${BRANCH})
# Setup information for the distfile
DISTNAME="kde-${PROJECT}-${VERSION}p${PATCH_COUNT}"
diff --git a/graphics/qt5-3d/distinfo b/graphics/qt5-3d/distinfo
index 01c40a8f40b0..df5af44ec4c7 100644
--- a/graphics/qt5-3d/distinfo
+++ b/graphics/qt5-3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639431403
-SHA256 (KDE/Qt/5.15.2/kde-qt3d-5.15.2p39.tar.xz) = 9a3f92cb460eb5e36d80624a177cf073a56ae189aed7ac615e8940286c56c8b8
-SIZE (KDE/Qt/5.15.2/kde-qt3d-5.15.2p39.tar.xz) = 81860360
+TIMESTAMP = 1656427428
+SHA256 (KDE/Qt/5.15.5/kde-qt3d-5.15.5p15.tar.xz) = 84234da187474d2469c68d32422be4355a63313f069a11c3cedb5a84e55a62b5
+SIZE (KDE/Qt/5.15.5/kde-qt3d-5.15.5p15.tar.xz) = 81852048
diff --git a/graphics/qt5-graphicaleffects/distinfo b/graphics/qt5-graphicaleffects/distinfo
index 928ff72ea78b..e218ace5d706 100644
--- a/graphics/qt5-graphicaleffects/distinfo
+++ b/graphics/qt5-graphicaleffects/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423883
-SHA256 (KDE/Qt/5.15.2/kde-qtgraphicaleffects-5.15.2p2.tar.xz) = 36786c7aaa7e0418a6c5c45771821c5b037c42aadcba332151b41a0dd68a71c1
-SIZE (KDE/Qt/5.15.2/kde-qtgraphicaleffects-5.15.2p2.tar.xz) = 14019160
+TIMESTAMP = 1656427429
+SHA256 (KDE/Qt/5.15.5/kde-qtgraphicaleffects-5.15.5p0.tar.xz) = 5fda551c3ca666909548480c31b92bdf162145a0a8ba858e65d0301bb43dcdeb
+SIZE (KDE/Qt/5.15.5/kde-qtgraphicaleffects-5.15.5p0.tar.xz) = 14019140
diff --git a/graphics/qt5-imageformats/distinfo b/graphics/qt5-imageformats/distinfo
index d693ee9069a1..65c6fffefcad 100644
--- a/graphics/qt5-imageformats/distinfo
+++ b/graphics/qt5-imageformats/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423884
-SHA256 (KDE/Qt/5.15.2/kde-qtimageformats-5.15.2p3.tar.xz) = a55d3cbd1f51550d1c8ed3924567e095e88c7a323793d1978803350e3223549e
-SIZE (KDE/Qt/5.15.2/kde-qtimageformats-5.15.2p3.tar.xz) = 1788056
+TIMESTAMP = 1656427430
+SHA256 (KDE/Qt/5.15.5/kde-qtimageformats-5.15.5p3.tar.xz) = 5b1a03276a44540e7edafd37ca58274cf25100678f7a19d7b0b61f2eeaf8d4fb
+SIZE (KDE/Qt/5.15.5/kde-qtimageformats-5.15.5p3.tar.xz) = 1805008
diff --git a/graphics/qt5-opengl/distinfo b/graphics/qt5-opengl/distinfo
index 0e177b2b97d3..fab223c86997 100644
--- a/graphics/qt5-opengl/distinfo
+++ b/graphics/qt5-opengl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423885
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427431
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/graphics/qt5-pixeltool/distinfo b/graphics/qt5-pixeltool/distinfo
index 266df2e5461c..df2c98ffb8d5 100644
--- a/graphics/qt5-pixeltool/distinfo
+++ b/graphics/qt5-pixeltool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423887
-SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a
-SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464
+TIMESTAMP = 1656427432
+SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
+SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608
diff --git a/graphics/qt5-svg/distinfo b/graphics/qt5-svg/distinfo
index c81459068f62..a129f4c81273 100644
--- a/graphics/qt5-svg/distinfo
+++ b/graphics/qt5-svg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423888
-SHA256 (KDE/Qt/5.15.2/kde-qtsvg-5.15.2p13.tar.xz) = 665a35b4916d9406c221709d11529dc5bbeed6b674abd1c99cb48db1ad205d6c
-SIZE (KDE/Qt/5.15.2/kde-qtsvg-5.15.2p13.tar.xz) = 1864320
+TIMESTAMP = 1656427433
+SHA256 (KDE/Qt/5.15.5/kde-qtsvg-5.15.5p10.tar.xz) = 90a21c3e96d296b4374eaa992f5ebc7b1f93ecdf59aafbf15f9bd7cb8a4fa95c
+SIZE (KDE/Qt/5.15.5/kde-qtsvg-5.15.5p10.tar.xz) = 1865000
diff --git a/graphics/qt5-wayland/distinfo b/graphics/qt5-wayland/distinfo
index a5cfd67bc6b4..a91a00e9cc91 100644
--- a/graphics/qt5-wayland/distinfo
+++ b/graphics/qt5-wayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423889
-SHA256 (KDE/Qt/5.15.2/kde-qtwayland-5.15.2p37.tar.xz) = de116b90858923bd96e6fa541170dbfb208c845263a3301e861086a3b93f5467
-SIZE (KDE/Qt/5.15.2/kde-qtwayland-5.15.2p37.tar.xz) = 533864
+TIMESTAMP = 1656427434
+SHA256 (KDE/Qt/5.15.5/kde-qtwayland-5.15.5p39.tar.xz) = 0d0a4d9bc914c33e1707b13a94afda7fb30a60864c45c7d7e5d6a6d28b9355d6
+SIZE (KDE/Qt/5.15.5/kde-qtwayland-5.15.5p39.tar.xz) = 535820
diff --git a/graphics/qt5-wayland/files/patch-libglvnd b/graphics/qt5-wayland/files/patch-libglvnd
deleted file mode 100644
index 50e4c25ca511..000000000000
--- a/graphics/qt5-wayland/files/patch-libglvnd
+++ /dev/null
@@ -1,38 +0,0 @@
-drm_*.h are part of kernel DRM API, installed under /usr/include on Linux.
-FreeBSD (drm-kmod) doesn't install those anywhere, relying on libdrm copies.
-libglvnd replaces libEGL from Mesa, so libdrm dependency needs to be explicit.
-
---- src/client/configure.json.orig 2020-10-27 08:02:11 UTC
-+++ src/client/configure.json
-@@ -149,8 +149,7 @@
- "#endif"
- ]
- },
-- "libs": "-ldrm",
-- "use": "egl"
-+ "use": "egl drm"
- },
- "vulkan-server-buffer": {
- "label": "Vulkan Buffer Sharing",
---- src/compositor/configure.json.orig 2020-10-27 08:02:11 UTC
-+++ src/compositor/configure.json
-@@ -151,8 +151,7 @@
- "#endif"
- ]
- },
-- "libs": "-ldrm",
-- "use": "egl"
-+ "use": "egl drm"
- },
- "dmabuf-client-buffer": {
- "label": "Linux Client dma-buf Buffer Sharing",
-@@ -176,8 +175,7 @@
- "return 0;"
- ]
- },
-- "libs": "-ldrm",
-- "use": "egl"
-+ "use": "egl drm"
- },
- "vulkan-server-buffer": {
- "label": "Vulkan Buffer Sharing",
diff --git a/misc/qt5-examples/Makefile b/misc/qt5-examples/Makefile
index 940fe5715eb3..d34a02d9289c 100644
--- a/misc/qt5-examples/Makefile
+++ b/misc/qt5-examples/Makefile
@@ -5,7 +5,8 @@ PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH}
CATEGORIES= misc
MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/single
PKGNAMEPREFIX= qt5-
-DISTNAME= qt-everywhere-src-${QT5_VERSION}
+DISTNAME= qt-everywhere-opensource-src-${QT5_VERSION}
+WRKSRC= ${WRKDIR}/qt-everywhere-src-${QT5_VERSION}
DIST_SUBDIR= KDE/Qt/${QT5_VERSION}
MAINTAINER= kde@FreeBSD.org
@@ -36,7 +37,7 @@ _QT_DISTS= 3d activeqt androidextras base charts connectivity datavis3d \
EXAMPLES= ${_QT_DISTS:C/^/qt/}
.for example in ${EXAMPLES}
-EXTRACT_AFTER_ARGS+= ${DISTNAME}/${example}/examples
+EXTRACT_AFTER_ARGS+= ${DISTNAME:S/-opensource//}/${example}/examples
.endfor
do-install:
diff --git a/misc/qt5-examples/distinfo b/misc/qt5-examples/distinfo
index ea977fb7e974..2c1679e698b5 100644
--- a/misc/qt5-examples/distinfo
+++ b/misc/qt5-examples/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605899661
-SHA256 (KDE/Qt/5.15.2/qt-everywhere-src-5.15.2.tar.xz) = 3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240
-SIZE (KDE/Qt/5.15.2/qt-everywhere-src-5.15.2.tar.xz) = 586690220
+TIMESTAMP = 1656427609
+SHA256 (KDE/Qt/5.15.5/qt-everywhere-opensource-src-5.15.5.tar.xz) = 5a97827bdf9fd515f43bc7651defaf64fecb7a55e051c79b8f80510d0e990f06
+SIZE (KDE/Qt/5.15.5/qt-everywhere-opensource-src-5.15.5.tar.xz) = 623305668
diff --git a/misc/qt5-examples/pkg-plist b/misc/qt5-examples/pkg-plist
index 108aa8553ad3..91b026295755 100644
--- a/misc/qt5-examples/pkg-plist
+++ b/misc/qt5-examples/pkg-plist
@@ -5276,6 +5276,7 @@
%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/cert.qrc
%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/client.crt
%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/client.key
+%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/readme
%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/rootCA.key
%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/rootCA.pem
%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/rootCA.srl
@@ -5291,6 +5292,7 @@
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/cert.qrc
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/client.crt
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/client.key
+%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/readme
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.key
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.pem
%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.srl
diff --git a/misc/qt5-l10n/distinfo b/misc/qt5-l10n/distinfo
index cac011b27486..209b7c3457c3 100644
--- a/misc/qt5-l10n/distinfo
+++ b/misc/qt5-l10n/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423897
-SHA256 (KDE/Qt/5.15.2/kde-qttranslations-5.15.2p22.tar.xz) = 4293399b69dfc98026925d9acecbeafe1e2df180857f67d180534fde91b2105d
-SIZE (KDE/Qt/5.15.2/kde-qttranslations-5.15.2p22.tar.xz) = 1594464
+TIMESTAMP = 1656427514
+SHA256 (KDE/Qt/5.15.5/kde-qttranslations-5.15.5p2.tar.xz) = ec445ead922ceb1c3ac3875c44559d93d64c47ead61e95bd2f9b543ec8f4565c
+SIZE (KDE/Qt/5.15.5/kde-qttranslations-5.15.5p2.tar.xz) = 1594492
diff --git a/multimedia/qt5-multimedia/distinfo b/multimedia/qt5-multimedia/distinfo
index 8c0134e6959c..0f5bd7288b68 100644
--- a/multimedia/qt5-multimedia/distinfo
+++ b/multimedia/qt5-multimedia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423899
-SHA256 (KDE/Qt/5.15.2/kde-qtmultimedia-5.15.2p3.tar.xz) = 4eee6b7d15d88a0bff9285687196a2e7703f18927995443c1de7fb82c47f03ec
-SIZE (KDE/Qt/5.15.2/kde-qtmultimedia-5.15.2p3.tar.xz) = 3788908
+TIMESTAMP = 1656427515
+SHA256 (KDE/Qt/5.15.5/kde-qtmultimedia-5.15.5p1.tar.xz) = 5154ddbc15b1e7ad5034012bbdfaf80209a91a571ed4cf63f3802f5fc2c5d4a4
+SIZE (KDE/Qt/5.15.5/kde-qtmultimedia-5.15.5p1.tar.xz) = 3790144
diff --git a/net/qt5-network/distinfo b/net/qt5-network/distinfo
index bb17af30e4b6..38647d7ef3dc 100644
--- a/net/qt5-network/distinfo
+++ b/net/qt5-network/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423900
-SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
-SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
+TIMESTAMP = 1656427516
+SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
+SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp
deleted file mode 100644
index 41377f6f1735..000000000000
--- a/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Patch based on Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch?id=c60b2b11bd17afca9bbe546db12918f789b57e25
---- src/network/ssl/qsslcertificate_openssl.cpp.orig 2021-12-07 13:51:35 UTC
-+++ src/network/ssl/qsslcertificate_openssl.cpp
-@@ -691,7 +691,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Na
- unsigned char *data = nullptr;
- int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
- info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
*** 716 LINES SKIPPED ***