Page MenuHomeFreeBSD
Files F141967409

D35619.id.diff
No OneTemporary
Actions

D35619.id.diff
View Options

diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
--- a/Mk/Uses/qt-dist.mk
+++ b/Mk/Uses/qt-dist.mk
@@ -69,44 +69,48 @@
. 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-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
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -22,7 +22,7 @@
# 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 @@
# 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 @@
# 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/devel/qt5-qdoc-data/Makefile
+++ b/devel/qt5-qdoc-data/Makefile
@@ -7,7 +7,8 @@
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 @@
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
--- 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
--- 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
--- 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
--- 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
--- a/devel/qt5-script/Makefile
+++ b/devel/qt5-script/Makefile
@@ -13,6 +13,8 @@
# 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
--- 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
--- a/devel/qt5-scripttools/Makefile
+++ b/devel/qt5-scripttools/Makefile
@@ -12,6 +12,8 @@
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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/misc/qt5-examples/Makefile
+++ b/misc/qt5-examples/Makefile
@@ -5,7 +5,8 @@
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 @@
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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
- q_CRYPTO_free(data, nullptr, 0);
- #else
- q_CRYPTO_free(data);
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
--- a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
+++ b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
@@ -1,36 +1,22 @@
-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/qsslcontext_openssl.cpp.orig 2021-12-07 13:51:35 UTC
+--- src/network/ssl/qsslcontext_openssl.cpp.orig 2022-06-28 10:17:59 UTC
+++ src/network/ssl/qsslcontext_openssl.cpp
-@@ -408,16 +408,28 @@ init_context:
- maxVersion = DTLS1_VERSION;
- break;
- case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
- minVersion = DTLS1_VERSION;
- maxVersion = DTLS_MAX_VERSION;
-+#else
-+ Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
- break;
- case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
- minVersion = DTLS1_2_VERSION;
- maxVersion = DTLS1_2_VERSION;
-+#else
-+ Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
- break;
- case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
- minVersion = DTLS1_2_VERSION;
- maxVersion = DTLS_MAX_VERSION;
+@@ -356,11 +356,15 @@ init_context:
+ q_SSL_CTX_set_security_level(sslContext->ctx, 1);
+
+ const long anyVersion =
++#ifndef TLS_ANY_VERSION
++ 0x1000;
+#else
-+ Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
- break;
- case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +734,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
+ #if QT_CONFIG(dtls)
+ isDtls ? DTLS_ANY_VERSION : TLS_ANY_VERSION;
+ #else
+ TLS_ANY_VERSION;
+ #endif // dtls
++#endif
+ long minVersion = anyVersion;
+ long maxVersion = anyVersion;
+
+@@ -722,6 +726,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
}
#endif // ocsp
@@ -38,7 +24,7 @@
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
if (cctx) {
q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +781,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
+@@ -768,7 +773,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
sslContext->errorCode = QSslError::UnspecifiedError;
}
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl__p.h b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl__p.h
deleted file mode 100644
--- a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl__p.h
+++ /dev/null
@@ -1,17 +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/qsslcontext_openssl_p.h.orig 2020-09-02 10:15:07 UTC
-+++ src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
-
- QT_BEGIN_NAMESPACE
-
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
-
- class QSslContextPrivate;
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp
--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp
+++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp
@@ -1,33 +1,26 @@
-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/qsslsocket_openssl.cpp.orig 2020-10-27 08:02:11 UTC
+--- src/network/ssl/qsslsocket_openssl.cpp.orig 2022-06-28 13:46:41 UTC
+++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -238,7 +238,11 @@ static int q_ssl_psk_use_session_callback(SSL *ssl, co
-
+@@ -239,6 +239,12 @@ static int q_ssl_psk_use_session_callback(SSL *ssl, co
return 1; // need to return 1 or else "the connection setup fails."
}
-+#endif // TLS1_3_VERSION
++#endif // TLS1_3_VERSION
++
+#endif // !OPENSSL_NO_PSK
+
-+#ifdef TLS1_3_VERSION
++#if (!defined(OPENSSL_NO_PSK) || defined(LIBRESSL_VERSION_NUMBER)) \
++ && defined(TLS1_3_VERSION)
int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *session)
{
if (!ssl) {
-@@ -256,8 +260,6 @@ int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *sessi
+@@ -254,9 +260,7 @@ int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *sessi
+ QSslSocketBackendPrivate::s_indexForSSLExtraData));
+ return socketPrivate->handleNewSessionTicket(ssl);
}
- #endif // TLS1_3_VERSION
-
--#endif // !OPENSSL_NO_PSK
+-#endif // TLS1_3_VERSION
-
- #if QT_CONFIG(ocsp)
+-#endif // !OPENSSL_NO_PSK
++#endif
- int qt_OCSP_status_server_callback(SSL *ssl, void *ocspRequest)
-@@ -653,7 +655,7 @@ bool QSslSocketBackendPrivate::initSslContext()
- else if (mode == QSslSocket::SslServerMode)
- q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ #if QT_CONFIG(ocsp)
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
- // Set the client callback for TLSv1.3 PSK
- if (mode == QSslSocket::SslClientMode
- && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
+++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
@@ -1,61 +1,6 @@
-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/qsslsocket_openssl_symbols.cpp.orig 2021-12-07 13:51:35 UTC
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2022-06-28 10:13:07 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -145,18 +145,31 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYA
- DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
-+#ifdef OPENSSL_NO_DEPRECATED_3_0
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
-+#endif // OPENSSL_NO_DEPRECATED_3_0
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL)
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
-+#endif
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
- DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING
- ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
- return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL)
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
- int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
+@@ -355,12 +355,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
@@ -70,49 +15,7 @@
DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -845,17 +866,21 @@ bool q_resolveOpenSslSymbols()
- RESOLVEFUNC(ASN1_STRING_get0_data)
- RESOLVEFUNC(EVP_CIPHER_CTX_reset)
- RESOLVEFUNC(EVP_PKEY_up_ref)
-+#ifdef OPENSSL_NO_DEPRECATED_3_0
- RESOLVEFUNC(EVP_PKEY_CTX_new)
- RESOLVEFUNC(EVP_PKEY_param_check)
- RESOLVEFUNC(EVP_PKEY_CTX_free)
-+#endif // OPENSSL_NO_DEPRECATED_3_0
- RESOLVEFUNC(EVP_PKEY_base_id)
- RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
- RESOLVEFUNC(OPENSSL_sk_new_null)
- RESOLVEFUNC(OPENSSL_sk_push)
- RESOLVEFUNC(OPENSSL_sk_free)
- RESOLVEFUNC(OPENSSL_sk_num)
- RESOLVEFUNC(OPENSSL_sk_pop_free)
- RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
- RESOLVEFUNC(DH_get0_pqg)
- RESOLVEFUNC(SSL_CTX_set_options)
- RESOLVEFUNC(SSL_CTX_get_security_level)
-@@ -898,7 +923,9 @@ bool q_resolveOpenSslSymbols()
-
- RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
- RESOLVEFUNC(DH_bits)
-+#if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL)
- RESOLVEFUNC(DSA_bits)
-+#endif
-
- #if QT_CONFIG(dtls)
- RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +955,9 @@ bool q_resolveOpenSslSymbols()
- RESOLVEFUNC(OCSP_check_validity)
- RESOLVEFUNC(OCSP_cert_to_id)
- RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
- RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
- RESOLVEFUNC(OCSP_basic_sign)
- RESOLVEFUNC(OCSP_response_create)
- RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -1058,12 +1087,14 @@ bool q_resolveOpenSslSymbols()
+@@ -1066,12 +1068,14 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
RESOLVEFUNC(SSL_CTX_get_cert_store);
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
+++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
@@ -1,5 +1,4 @@
-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/qsslsocket_openssl_symbols_p.h.orig 2021-12-07 13:51:35 UTC
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2022-06-28 10:06:55 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
@@ -15,77 +14,7 @@
#if !defined QT_LINKED_OPENSSL
// **************** Shared declarations ******************
// ret func(arg)
-@@ -230,20 +237,43 @@ const unsigned char * q_ASN1_STRING_get0_data(const AS
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
-
-+#if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL)
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
-+#ifdef OPENSSL_NO_DEPRECATED_3_0
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
- void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
-+#endif // OPENSSL_NO_DEPRECATED_3_0
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +299,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
- | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
-
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
-
- #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
- | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +314,11 @@ int q_DH_bits(DH *dh);
- | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
-
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
-
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -497,12 +536,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+@@ -496,12 +503,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
@@ -100,15 +29,3 @@
void q_SSL_free(SSL *a);
STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +769,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisup
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
- ASN1_INTEGER **pserial, OCSP_CERTID *cid);
-
-+#if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL)
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/net/qt5-networkauth/distinfo b/net/qt5-networkauth/distinfo
--- a/net/qt5-networkauth/distinfo
+++ b/net/qt5-networkauth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423902
-SHA256 (KDE/Qt/5.15.2/kde-qtnetworkauth-5.15.2p2.tar.xz) = 73a747463be53741087836abbe07f7ba7cb787721d3a9dad713fd6552ac1068d
-SIZE (KDE/Qt/5.15.2/kde-qtnetworkauth-5.15.2p2.tar.xz) = 119968
+TIMESTAMP = 1656427517
+SHA256 (KDE/Qt/5.15.5/kde-qtnetworkauth-5.15.5p0.tar.xz) = 45b516666fb05419b24d007e617c953080510d5a590eda9bbaba016e59f9a1b6
+SIZE (KDE/Qt/5.15.5/kde-qtnetworkauth-5.15.5p0.tar.xz) = 119968
diff --git a/print/qt5-printsupport/distinfo b/print/qt5-printsupport/distinfo
--- a/print/qt5-printsupport/distinfo
+++ b/print/qt5-printsupport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423903
-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 = 1656427518
+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/sysutils/qt5-qtdiag/distinfo b/sysutils/qt5-qtdiag/distinfo
--- a/sysutils/qt5-qtdiag/distinfo
+++ b/sysutils/qt5-qtdiag/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423904
-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 = 1656427519
+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/sysutils/qt5-qtpaths/distinfo b/sysutils/qt5-qtpaths/distinfo
--- a/sysutils/qt5-qtpaths/distinfo
+++ b/sysutils/qt5-qtpaths/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423905
-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 = 1656427520
+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/sysutils/qt5-qtplugininfo/distinfo b/sysutils/qt5-qtplugininfo/distinfo
--- a/sysutils/qt5-qtplugininfo/distinfo
+++ b/sysutils/qt5-qtplugininfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423906
-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 = 1656427521
+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/textproc/qt5-xml/distinfo b/textproc/qt5-xml/distinfo
--- a/textproc/qt5-xml/distinfo
+++ b/textproc/qt5-xml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423907
-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 = 1656427522
+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/textproc/qt5-xmlpatterns/distinfo b/textproc/qt5-xmlpatterns/distinfo
--- a/textproc/qt5-xmlpatterns/distinfo
+++ b/textproc/qt5-xmlpatterns/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423908
-SHA256 (KDE/Qt/5.15.2/kde-qtxmlpatterns-5.15.2p2.tar.xz) = 519880b344bd108df382437cc987eaafb3fbfb055ea25edeff82d6fb38abd381
-SIZE (KDE/Qt/5.15.2/kde-qtxmlpatterns-5.15.2p2.tar.xz) = 1376128
+TIMESTAMP = 1656427523
+SHA256 (KDE/Qt/5.15.5/kde-qtxmlpatterns-5.15.5p0.tar.xz) = 0f97dd9b0b8f00053bf191c619300b729bd96e7090012f12d89590b8453a1532
+SIZE (KDE/Qt/5.15.5/kde-qtxmlpatterns-5.15.5p0.tar.xz) = 1376604
diff --git a/www/qt5-webchannel/distinfo b/www/qt5-webchannel/distinfo
--- a/www/qt5-webchannel/distinfo
+++ b/www/qt5-webchannel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639423909
-SHA256 (KDE/Qt/5.15.2/kde-qtwebchannel-5.15.2p2.tar.xz) = ec97632456edacb2449ca178750a3fdc03a2561a6ca536c15593d729e33ec9cf
-SIZE (KDE/Qt/5.15.2/kde-qtwebchannel-5.15.2p2.tar.xz) = 187764
+TIMESTAMP = 1656427524
+SHA256 (KDE/Qt/5.15.5/kde-qtwebchannel-5.15.5p3.tar.xz) = 1867e466b5805f12e819b358e7f99a04a990b051e0e679286324acd3974f2778
+SIZE (KDE/Qt/5.15.5/kde-qtwebchannel-5.15.5p3.tar.xz) = 188624
diff --git a/www/qt5-webglplugin/distinfo b/www/qt5-webglplugin/distinfo
--- a/www/qt5-webglplugin/distinfo
+++ b/www/qt5-webglplugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424003
-SHA256 (KDE/Qt/5.15.2/kde-qtwebglplugin-5.15.2p2.tar.xz) = 54d0692ca4fdd487b53959a2895b098c03519965095b510d0750ea0358d71892
-SIZE (KDE/Qt/5.15.2/kde-qtwebglplugin-5.15.2p2.tar.xz) = 53640
+TIMESTAMP = 1656427529
+SHA256 (KDE/Qt/5.15.5/kde-qtwebglplugin-5.15.5p0.tar.xz) = 2fc45c00f8a8c26ad78c30e3c68a1f97e73575a3ba1be8e9fe8b4fb6f762b8c9
+SIZE (KDE/Qt/5.15.5/kde-qtwebglplugin-5.15.5p0.tar.xz) = 53652
diff --git a/www/qt5-websockets-qml/distinfo b/www/qt5-websockets-qml/distinfo
--- a/www/qt5-websockets-qml/distinfo
+++ b/www/qt5-websockets-qml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424005
-SHA256 (KDE/Qt/5.15.2/kde-qtwebsockets-5.15.2p4.tar.xz) = f2c686efc7ecd2943af70d80303e20aecf7b7116cb11cf84fc83ce791552f48e
-SIZE (KDE/Qt/5.15.2/kde-qtwebsockets-5.15.2p4.tar.xz) = 237052
+TIMESTAMP = 1656427532
+SHA256 (KDE/Qt/5.15.5/kde-qtwebsockets-5.15.5p3.tar.xz) = daa41b7c2acb1521d772169fc368f99d32abc99ba3dc968c0b28cb8890ea5bdc
+SIZE (KDE/Qt/5.15.5/kde-qtwebsockets-5.15.5p3.tar.xz) = 237028
diff --git a/www/qt5-websockets/distinfo b/www/qt5-websockets/distinfo
--- a/www/qt5-websockets/distinfo
+++ b/www/qt5-websockets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424004
-SHA256 (KDE/Qt/5.15.2/kde-qtwebsockets-5.15.2p4.tar.xz) = f2c686efc7ecd2943af70d80303e20aecf7b7116cb11cf84fc83ce791552f48e
-SIZE (KDE/Qt/5.15.2/kde-qtwebsockets-5.15.2p4.tar.xz) = 237052
+TIMESTAMP = 1656427531
+SHA256 (KDE/Qt/5.15.5/kde-qtwebsockets-5.15.5p3.tar.xz) = daa41b7c2acb1521d772169fc368f99d32abc99ba3dc968c0b28cb8890ea5bdc
+SIZE (KDE/Qt/5.15.5/kde-qtwebsockets-5.15.5p3.tar.xz) = 237028
diff --git a/www/qt5-webview/distinfo b/www/qt5-webview/distinfo
--- a/www/qt5-webview/distinfo
+++ b/www/qt5-webview/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424006
-SHA256 (KDE/Qt/5.15.2/kde-qtwebview-5.15.2p2.tar.xz) = 6750b8d0ce61d900a56b2ca9fa4cb1bca25a728ddffce22c3037f38a3cf47e9c
-SIZE (KDE/Qt/5.15.2/kde-qtwebview-5.15.2p2.tar.xz) = 112016
+TIMESTAMP = 1656427532
+SHA256 (KDE/Qt/5.15.5/kde-qtwebview-5.15.5p0.tar.xz) = 0423fc1a84e30347a42d59ee45956b004e02ad16051c2ab3b486bec34c3009e5
+SIZE (KDE/Qt/5.15.5/kde-qtwebview-5.15.5p0.tar.xz) = 112224
diff --git a/x11-toolkits/qt5-charts/distinfo b/x11-toolkits/qt5-charts/distinfo
--- a/x11-toolkits/qt5-charts/distinfo
+++ b/x11-toolkits/qt5-charts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424007
-SHA256 (KDE/Qt/5.15.2/kde-qtcharts-5.15.2p2.tar.xz) = bcc66d1f67d4be893aa1e952657735c63780ac2bcc49d6ec981c38612466b934
-SIZE (KDE/Qt/5.15.2/kde-qtcharts-5.15.2p2.tar.xz) = 4218592
+TIMESTAMP = 1656427534
+SHA256 (KDE/Qt/5.15.5/kde-qtcharts-5.15.5p1.tar.xz) = 58e5a2ceeca1a34b56e7458c497330d3cbfb42a4e708e846a46e8859ba2611a3
+SIZE (KDE/Qt/5.15.5/kde-qtcharts-5.15.5p1.tar.xz) = 4219036
diff --git a/x11-toolkits/qt5-datavis3d/distinfo b/x11-toolkits/qt5-datavis3d/distinfo
--- a/x11-toolkits/qt5-datavis3d/distinfo
+++ b/x11-toolkits/qt5-datavis3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424008
-SHA256 (KDE/Qt/5.15.2/kde-qtdatavis3d-5.15.2p2.tar.xz) = 48c33c37c3a8053403169a00c93bb9ddebfdcfda65ee736c25d6ef355c2b24ce
-SIZE (KDE/Qt/5.15.2/kde-qtdatavis3d-5.15.2p2.tar.xz) = 5159608
+TIMESTAMP = 1656427535
+SHA256 (KDE/Qt/5.15.5/kde-qtdatavis3d-5.15.5p0.tar.xz) = 312ef813d9068b46237b3feeba35a396332fcfa4cc73ef775e83725bea9bdcdd
+SIZE (KDE/Qt/5.15.5/kde-qtdatavis3d-5.15.5p0.tar.xz) = 5159760
diff --git a/x11-toolkits/qt5-declarative-test/distinfo b/x11-toolkits/qt5-declarative-test/distinfo
--- a/x11-toolkits/qt5-declarative-test/distinfo
+++ b/x11-toolkits/qt5-declarative-test/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424011
-SHA256 (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 67821e7f3ae5aac78bc82001394b2bef6f952c9607d281dd4a33e3c040d652ec
-SIZE (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 18992128
+TIMESTAMP = 1656427538
+SHA256 (KDE/Qt/5.15.5/kde-qtdeclarative-5.15.5p19.tar.xz) = 0c206dcd2aade48d9679b70bb03aa3a192d62dc6507434302dd0bc21a0956afc
+SIZE (KDE/Qt/5.15.5/kde-qtdeclarative-5.15.5p19.tar.xz) = 19008008
diff --git a/x11-toolkits/qt5-declarative/distinfo b/x11-toolkits/qt5-declarative/distinfo
--- a/x11-toolkits/qt5-declarative/distinfo
+++ b/x11-toolkits/qt5-declarative/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424010
-SHA256 (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 67821e7f3ae5aac78bc82001394b2bef6f952c9607d281dd4a33e3c040d652ec
-SIZE (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 18992128
+TIMESTAMP = 1656427537
+SHA256 (KDE/Qt/5.15.5/kde-qtdeclarative-5.15.5p19.tar.xz) = 0c206dcd2aade48d9679b70bb03aa3a192d62dc6507434302dd0bc21a0956afc
+SIZE (KDE/Qt/5.15.5/kde-qtdeclarative-5.15.5p19.tar.xz) = 19008008
diff --git a/x11-toolkits/qt5-gamepad/distinfo b/x11-toolkits/qt5-gamepad/distinfo
--- a/x11-toolkits/qt5-gamepad/distinfo
+++ b/x11-toolkits/qt5-gamepad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424012
-SHA256 (KDE/Qt/5.15.2/kde-qtgamepad-5.15.2p2.tar.xz) = 96b18f044fbd38fd81422f2386c084ccf180f999d46f24b361bec1d8a7b0dfa7
-SIZE (KDE/Qt/5.15.2/kde-qtgamepad-5.15.2p2.tar.xz) = 365384
+TIMESTAMP = 1656427539
+SHA256 (KDE/Qt/5.15.5/kde-qtgamepad-5.15.5p0.tar.xz) = 2d7bdeaea79d7789c609715fb96a6f4ac6ee3c862de79358a229488748881e19
+SIZE (KDE/Qt/5.15.5/kde-qtgamepad-5.15.5p0.tar.xz) = 365416
diff --git a/x11-toolkits/qt5-gui/distinfo b/x11-toolkits/qt5-gui/distinfo
--- a/x11-toolkits/qt5-gui/distinfo
+++ b/x11-toolkits/qt5-gui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424013
-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 = 1656427540
+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/x11-toolkits/qt5-quick3d/distinfo b/x11-toolkits/qt5-quick3d/distinfo
--- a/x11-toolkits/qt5-quick3d/distinfo
+++ b/x11-toolkits/qt5-quick3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424014
-SHA256 (KDE/Qt/5.15.2/kde-qtquick3d-5.15.2p19.tar.xz) = 40c9ec702df6f1ce429144c78b53210e876590318b6a463855269c8d98071b6a
-SIZE (KDE/Qt/5.15.2/kde-qtquick3d-5.15.2p19.tar.xz) = 18253072
+TIMESTAMP = 1656427541
+SHA256 (KDE/Qt/5.15.5/kde-qtquick3d-5.15.5p1.tar.xz) = 091ce29286e0645fb2a822d41ffc3b265d3049e1c8c0ad75a6ec7a473458e507
+SIZE (KDE/Qt/5.15.5/kde-qtquick3d-5.15.5p1.tar.xz) = 18255516
diff --git a/x11-toolkits/qt5-quick3d/pkg-plist b/x11-toolkits/qt5-quick3d/pkg-plist
--- a/x11-toolkits/qt5-quick3d/pkg-plist
+++ b/x11-toolkits/qt5-quick3d/pkg-plist
@@ -474,9 +474,18 @@
%%QT_QMLDIR%%/QtQuick3D/designer/images/group.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/group16.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/group@2x.png
-%%QT_QMLDIR%%/QtQuick3D/designer/images/light.png
-%%QT_QMLDIR%%/QtQuick3D/designer/images/light16.png
-%%QT_QMLDIR%%/QtQuick3D/designer/images/light@2x.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightarea.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightarea16.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightarea@2x.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightdirectional.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightdirectional16.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightdirectional@2x.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightpoint.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightpoint16.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightpoint@2x.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightspot.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightspot16.png
+%%QT_QMLDIR%%/QtQuick3D/designer/images/lightspot@2x.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/material.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/material16.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/material@2x.png
diff --git a/x11-toolkits/qt5-quickcontrols/distinfo b/x11-toolkits/qt5-quickcontrols/distinfo
--- a/x11-toolkits/qt5-quickcontrols/distinfo
+++ b/x11-toolkits/qt5-quickcontrols/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424015
-SHA256 (KDE/Qt/5.15.2/kde-qtquickcontrols-5.15.2p3.tar.xz) = c70376eded8bf247d3bc6575a8b1eecf509a40f9e0a2e425c999c26ae83cbf40
-SIZE (KDE/Qt/5.15.2/kde-qtquickcontrols-5.15.2p3.tar.xz) = 5956452
+TIMESTAMP = 1656427542
+SHA256 (KDE/Qt/5.15.5/kde-qtquickcontrols-5.15.5p0.tar.xz) = 038fd300e58a922e1e202b634039ab78088e4d06ffd623690dae6c4bc88eca29
+SIZE (KDE/Qt/5.15.5/kde-qtquickcontrols-5.15.5p0.tar.xz) = 5956356
diff --git a/x11-toolkits/qt5-quickcontrols2/distinfo b/x11-toolkits/qt5-quickcontrols2/distinfo
--- a/x11-toolkits/qt5-quickcontrols2/distinfo
+++ b/x11-toolkits/qt5-quickcontrols2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424016
-SHA256 (KDE/Qt/5.15.2/kde-qtquickcontrols2-5.15.2p8.tar.xz) = b250a5c0755fd5f0a6692e3272e6e82525991a5fdfea0a73a9457d88da1117e5
-SIZE (KDE/Qt/5.15.2/kde-qtquickcontrols2-5.15.2p8.tar.xz) = 8242136
+TIMESTAMP = 1656427543
+SHA256 (KDE/Qt/5.15.5/kde-qtquickcontrols2-5.15.5p5.tar.xz) = b418760858b1fedc14516f651c07ea6bdb806ec5c443ab10d2de54aafe504624
+SIZE (KDE/Qt/5.15.5/kde-qtquickcontrols2-5.15.5p5.tar.xz) = 8246240
diff --git a/x11-toolkits/qt5-quickcontrols2/pkg-plist b/x11-toolkits/qt5-quickcontrols2/pkg-plist
--- a/x11-toolkits/qt5-quickcontrols2/pkg-plist
+++ b/x11-toolkits/qt5-quickcontrols2/pkg-plist
@@ -27,6 +27,7 @@
%%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2-config.h
%%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2global.h
%%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2version.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qaccessiblequickpage_p.h
%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickabstractbutton_p.h
%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickabstractbutton_p_p.h
%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickaction_p.h
@@ -351,8 +352,8 @@
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ToolSeparator.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ToolTip.qml
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Tumbler.qml
-%%QT_QMLDIR%%/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so
-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so.debug
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/libqqc2materialstyleplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls.2/Material/libqqc2materialstyleplugin.so.debug
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/plugins.qmltypes
%%QT_QMLDIR%%/QtQuick/Controls.2/Material/qmldir
%%QT_QMLDIR%%/QtQuick/Controls.2/Menu.qml
diff --git a/x11-toolkits/qt5-quicktimeline/distinfo b/x11-toolkits/qt5-quicktimeline/distinfo
--- a/x11-toolkits/qt5-quicktimeline/distinfo
+++ b/x11-toolkits/qt5-quicktimeline/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424017
-SHA256 (KDE/Qt/5.15.2/kde-qtquicktimeline-5.15.2p3.tar.xz) = 5170b45bf2ef94d27eb5363376817baabffb720c3f864ce2f61fd27452d812b0
-SIZE (KDE/Qt/5.15.2/kde-qtquicktimeline-5.15.2p3.tar.xz) = 82136
+TIMESTAMP = 1656427544
+SHA256 (KDE/Qt/5.15.5/kde-qtquicktimeline-5.15.5p0.tar.xz) = a7f5b364dc54f938aa0d0706d2337ffba400a85b7652993cab9fcea61a8934b1
+SIZE (KDE/Qt/5.15.5/kde-qtquicktimeline-5.15.5p0.tar.xz) = 82116
diff --git a/x11-toolkits/qt5-uiplugin/distinfo b/x11-toolkits/qt5-uiplugin/distinfo
--- a/x11-toolkits/qt5-uiplugin/distinfo
+++ b/x11-toolkits/qt5-uiplugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424018
-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 = 1656427545
+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/x11-toolkits/qt5-virtualkeyboard/distinfo b/x11-toolkits/qt5-virtualkeyboard/distinfo
--- a/x11-toolkits/qt5-virtualkeyboard/distinfo
+++ b/x11-toolkits/qt5-virtualkeyboard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424019
-SHA256 (KDE/Qt/5.15.2/kde-qtvirtualkeyboard-5.15.2p4.tar.xz) = c310615cd5be3f4e89716ab4f92225f73a1ed21e0c3238b3db37f752ef031028
-SIZE (KDE/Qt/5.15.2/kde-qtvirtualkeyboard-5.15.2p4.tar.xz) = 10929208
+TIMESTAMP = 1656427546
+SHA256 (KDE/Qt/5.15.5/kde-qtvirtualkeyboard-5.15.5p3.tar.xz) = 20d507f40ab83b66e4dc72ccf63434da02b5e5f13d5b6b2ffb9ed54b70f0ef09
+SIZE (KDE/Qt/5.15.5/kde-qtvirtualkeyboard-5.15.5p3.tar.xz) = 10921480
diff --git a/x11-toolkits/qt5-widgets/distinfo b/x11-toolkits/qt5-widgets/distinfo
--- a/x11-toolkits/qt5-widgets/distinfo
+++ b/x11-toolkits/qt5-widgets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424021
-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 = 1656427547
+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/x11/qt5-qev/distinfo b/x11/qt5-qev/distinfo
--- a/x11/qt5-qev/distinfo
+++ b/x11/qt5-qev/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424022
-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 = 1656427548
+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/x11/qt5-x11extras/distinfo b/x11/qt5-x11extras/distinfo
--- a/x11/qt5-x11extras/distinfo
+++ b/x11/qt5-x11extras/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639424023
-SHA256 (KDE/Qt/5.15.2/kde-qtx11extras-5.15.2p1.tar.xz) = 6e22063b26a86c59dd577bfd34d9f9b49e11ba3c7fb50e2a5509b8e2bac2b8f5
-SIZE (KDE/Qt/5.15.2/kde-qtx11extras-5.15.2p1.tar.xz) = 123360
+TIMESTAMP = 1656427549
+SHA256 (KDE/Qt/5.15.5/kde-qtx11extras-5.15.5p0.tar.xz) = cabd2b354b892ac91e4a1eb24c7218785b38ffb9d2233d8e89005892d8957980
+SIZE (KDE/Qt/5.15.5/kde-qtx11extras-5.15.5p0.tar.xz) = 123280

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 15, 7:33 AM (13 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27645435
Default Alt Text
D35619.id.diff (74 KB)

Event Timeline