Attachment #234985 for bug #264944

View | Details | Raw Unified | Return to bug 264944
Collapse All | Expand All




.  if ${_QT_VER:M5}

# KDE maintains a repository with a patched Qt5 distribution.
_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=		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)

qt-create-kde-distfile:
	${SH} ${PORTSDIR}/devel/${_QT_RELNAME}/files/create_kde-qt_release.sh \
		${_QT_DIST} \
		${DISTDIR}/${DIST_SUBDIR} \
		${_KDE_${_QT_DIST}_VERSION} \
		${_KDE_${_QT_DIST}_ORIGIN_TAG}

.endif # defined(_QT_DIST_MK_INCLUDED)





# Qt versions currently supported by the framework.
_QT_SUPPORTED?=		5
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)


# Always build with *this* version's buildtools
qt-buildtools_PORT=	devel/${_QT_RELNAME}-buildtools
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


# Always build with *this* version's qmake
qt-qmake_PORT=		devel/${_QT_RELNAME}-qmake
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

Lines 1-3 Link Here

(-)b/accessibility/qt5-speech/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423750	1	TIMESTAMP = 1656427309
2	SHA256 (KDE/Qt/5.15.2/kde-qtspeech-5.15.2p2.tar.xz) = 83f3543ef261b7603615fd07a3f9d938ba1377aa2a955e449b0cc87efd543989	2	SHA256 (KDE/Qt/5.15.5/kde-qtspeech-5.15.5p1.tar.xz) = 46ac06e9a8761375e0588ef79b201147ce9129e5614160f59081f91a6342da13
3	SIZE (KDE/Qt/5.15.2/kde-qtspeech-5.15.2p2.tar.xz) = 80208	3	SIZE (KDE/Qt/5.15.5/kde-qtspeech-5.15.5p1.tar.xz) = 80124

Lines 1-3 Link Here

(-)b/comms/qt5-connectivity/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423751	1	TIMESTAMP = 1656427310
2	SHA256 (KDE/Qt/5.15.2/kde-qtconnectivity-5.15.2p1.tar.xz) = 768324678b18c535c34d10a304124352b6befc7be6f0496bbb7b6ed6376f382e	2	SHA256 (KDE/Qt/5.15.5/kde-qtconnectivity-5.15.5p5.tar.xz) = 5b35c05bdd556b38674e81910532bc1f7a9d61fecb19548a0b7dfce0ae4589b4
3	SIZE (KDE/Qt/5.15.2/kde-qtconnectivity-5.15.2p1.tar.xz) = 2784408	3	SIZE (KDE/Qt/5.15.5/kde-qtconnectivity-5.15.5p5.tar.xz) = 2784836

Lines 1-3 Link Here

(-)b/comms/qt5-sensors/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423751	1	TIMESTAMP = 1656427311
2	SHA256 (KDE/Qt/5.15.2/kde-qtsensors-5.15.2p2.tar.xz) = ad17bde11441d00f5a0db4ecf87a40833953981ac3a8039243c8de1b0d2122de	2	SHA256 (KDE/Qt/5.15.5/kde-qtsensors-5.15.5p0.tar.xz) = dc57096ab2b6f6167b12c89961378b10fe9c2b1a263da8a8b9cda54c8788f870
3	SIZE (KDE/Qt/5.15.2/kde-qtsensors-5.15.2p2.tar.xz) = 2030628	3	SIZE (KDE/Qt/5.15.5/kde-qtsensors-5.15.5p0.tar.xz) = 2030764

Lines 1-3 Link Here

(-)b/comms/qt5-serialbus/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423752	1	TIMESTAMP = 1656427312
2	SHA256 (KDE/Qt/5.15.2/kde-qtserialbus-5.15.2p2.tar.xz) = 0d0befb361f18e4b46a3f8ed6ceebc94d34c3266a609720e3ff980a459e26715	2	SHA256 (KDE/Qt/5.15.5/kde-qtserialbus-5.15.5p0.tar.xz) = d2ebde3c16cd8c7d4fa38280acd17cf6a3d0e1580142992cd95760723c1040aa
3	SIZE (KDE/Qt/5.15.2/kde-qtserialbus-5.15.2p2.tar.xz) = 333156	3	SIZE (KDE/Qt/5.15.5/kde-qtserialbus-5.15.5p0.tar.xz) = 333616

Lines 1-3 Link Here

(-)b/comms/qt5-serialport/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423754	1	TIMESTAMP = 1656427313
2	SHA256 (KDE/Qt/5.15.2/kde-qtserialport-5.15.2p2.tar.xz) = 767e7b817b01ad747346c2c9bcccd26a652d8ca73915c68dd47386815eef445b	2	SHA256 (KDE/Qt/5.15.5/kde-qtserialport-5.15.5p0.tar.xz) = ff96cf4b00336018a6827f8a6cc1860fb73e0b93c7902d5c40c6ef80d780a1c9
3	SIZE (KDE/Qt/5.15.2/kde-qtserialport-5.15.2p2.tar.xz) = 300200	3	SIZE (KDE/Qt/5.15.5/kde-qtserialport-5.15.5p0.tar.xz) = 300224

Lines 1-3 Link Here

(-)b/databases/qt5-sql/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423756	1	TIMESTAMP = 1656427314
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/databases/qt5-sqldrivers-ibase/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423854	1	TIMESTAMP = 1656427315
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/databases/qt5-sqldrivers-mysql/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423852	1	TIMESTAMP = 1656427317
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/databases/qt5-sqldrivers-odbc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423853	1	TIMESTAMP = 1656427318
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/databases/qt5-sqldrivers-pgsql/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423854	1	TIMESTAMP = 1656427319
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/databases/qt5-sqldrivers-sqlite2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423856	1	TIMESTAMP = 1656427320
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/databases/qt5-sqldrivers-sqlite3/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423857	1	TIMESTAMP = 1656427322
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/databases/qt5-sqldrivers-tds/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423858	1	TIMESTAMP = 1656427323
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/devel/qt5-assistant/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423860	1	TIMESTAMP = 1656427324
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/devel/qt5-buildtools/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423861	1	TIMESTAMP = 1656427325
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/devel/qt5-concurrent/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423862	1	TIMESTAMP = 1656427326
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/devel/qt5-core/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423864	1	TIMESTAMP = 1656427327
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880




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);

Lines 1-3 Link Here

(-)b/devel/qt5-dbus/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423865	1	TIMESTAMP = 1656427329
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/devel/qt5-designer/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423866	1	TIMESTAMP = 1656427330
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/devel/qt5-help/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423867	1	TIMESTAMP = 1656427331
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/devel/qt5-linguist/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423868	1	TIMESTAMP = 1656427332
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/devel/qt5-linguisttools/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423869	1	TIMESTAMP = 1656427333
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/devel/qt5-location/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423870	1	TIMESTAMP = 1656427334
2	SHA256 (KDE/Qt/5.15.2/kde-qtlocation-5.15.2p6.tar.xz) = 82bcf791ce0651b24c43a2875e629a1500f7a9a29378d49100ea5050cd2fa076	2	SHA256 (KDE/Qt/5.15.5/kde-qtlocation-5.15.5p3.tar.xz) = 72417611720a1a6a19b8aa01aaad3ce39e1ad4d4a4d78fc6afb7045adae7fad6
3	SIZE (KDE/Qt/5.15.2/kde-qtlocation-5.15.2p6.tar.xz) = 4212420	3	SIZE (KDE/Qt/5.15.5/kde-qtlocation-5.15.5p3.tar.xz) = 4212176

Lines 1-3 Link Here

(-)b/devel/qt5-qdbus/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423871	1	TIMESTAMP = 1656427335
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/devel/qt5-qdbusviewer/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423872	1	TIMESTAMP = 1656427336
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608




CATEGORIES=	devel textproc
MASTER_SITES=	QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/submodules/
PKGNAMEPREFIX=	qt5-
DISTNAME=	qtbase-everywhere-opensource-src-${QT5_VERSION}
WRKSRC=		${WRKDIR}/qtbase-everywhere-src-${QT5_VERSION}
DIST_SUBDIR=	KDE/Qt/${QT5_VERSION}

MAINTAINER=	kde@FreeBSD.org

USES=		qt:5 tar:xz
USE_QT=		# empty

EXTRACT_AFTER_ARGS=	--include ${DISTNAME:S/-opensource//}/LICENSE.FDL \
			--include ${DISTNAME:S/-opensource//}/doc

NO_ARCH=	yes
NO_BUILD=	yes

Lines 1-3 Link Here

(-)b/devel/qt5-qdoc-data/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639505201	1	TIMESTAMP = 1656430132
2	SHA256 (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8	2	SHA256 (KDE/Qt/5.15.5/qtbase-everywhere-opensource-src-5.15.5.tar.xz) = 0c42c799aa7c89e479a07c451bf5a301e291266ba789e81afc18f95049524edc
3	SIZE (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 50179672	3	SIZE (KDE/Qt/5.15.5/qtbase-everywhere-opensource-src-5.15.5.tar.xz) = 50247388

Lines 1-3 Link Here

(-)b/devel/qt5-qdoc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423873	1	TIMESTAMP = 1656427337
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/devel/qt5-qmake/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639421182	1	TIMESTAMP = 1656427420
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/devel/qt5-remoteobjects/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423876	1	TIMESTAMP = 1656427421
2	SHA256 (KDE/Qt/5.15.2/kde-qtremoteobjects-5.15.2p3.tar.xz) = f1c2d5d2346fdac017b2a40be80468d9ed50c50bfbdefc7e57f88ea1d111e6dd	2	SHA256 (KDE/Qt/5.15.5/kde-qtremoteobjects-5.15.5p0.tar.xz) = 9697cb392dc2301bd4c882344eb71c50a74729e83917082a9ee06128723e3a38
3	SIZE (KDE/Qt/5.15.2/kde-qtremoteobjects-5.15.2p3.tar.xz) = 350464	3	SIZE (KDE/Qt/5.15.5/kde-qtremoteobjects-5.15.5p0.tar.xz) = 351708

Lines 13-18 USE_QT= core buildtools_build Link Here

(-)b/devel/qt5-script/Makefile (+2 lines)
13	# doesn't work).	13	# doesn't work).
14	MAKE_ENV= MAKEOBJDIR=.	14	MAKE_ENV= MAKEOBJDIR=.
15		15
		16	QT5_VERSION= 5.15.10
		17
16	post-patch:	18	post-patch:
17	@${REINPLACE_CMD} -e '/scripttools/ d' \	19	@${REINPLACE_CMD} -e '/scripttools/ d' \
18	${WRKSRC}/src/src.pro	20	${WRKSRC}/src/src.pro

Lines 1-3 Link Here

(-)b/devel/qt5-script/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423877	1	TIMESTAMP = 1656428746
2	SHA256 (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 66671e9516df5b099cef4f0440db97d96d07990665c9311321ccfaaf0687b129	2	SHA256 (KDE/Qt/5.15.10/kde-qtscript-5.15.10p0.tar.xz) = 35b2053c7e92b6af4a1a30dc1089cc433b05866be36f5133c1bce170f63793a7
3	SIZE (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 2623560	3	SIZE (KDE/Qt/5.15.10/kde-qtscript-5.15.10p0.tar.xz) = 2624152

Lines 12-17 USE_QT= core gui script widgets buildtools_build Link Here

(-)b/devel/qt5-scripttools/Makefile (+2 lines)
12	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}	12	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
13	INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}	13	INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}
14		14
		15	QT5_VERSION= 5.15.10
		16
15	# Link in QtScript port	17	# Link in QtScript port
16	_QT5_ADDITIONAL_LINK= script	18	_QT5_ADDITIONAL_LINK= script
17		19

Lines 1-3 Link Here

(-)b/devel/qt5-scripttools/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423878	1	TIMESTAMP = 1656433524
2	SHA256 (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 66671e9516df5b099cef4f0440db97d96d07990665c9311321ccfaaf0687b129	2	SHA256 (KDE/Qt/5.15.10/kde-qtscript-5.15.10p0.tar.xz) = 35b2053c7e92b6af4a1a30dc1089cc433b05866be36f5133c1bce170f63793a7
3	SIZE (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 2623560	3	SIZE (KDE/Qt/5.15.10/kde-qtscript-5.15.10p0.tar.xz) = 2624152

Lines 1-3 Link Here

(-)b/devel/qt5-scxml/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423879	1	TIMESTAMP = 1656427424
2	SHA256 (KDE/Qt/5.15.2/kde-qtscxml-5.15.2p1.tar.xz) = e99d34a972c0bf84ad692edac47b4928e89053d692950a153535c7fc17011f4b	2	SHA256 (KDE/Qt/5.15.5/kde-qtscxml-5.15.5p0.tar.xz) = 36c0acc4c85ead9bb8eb192b6d47c57c24384d352c923ab83148b17c2cc9feaf
3	SIZE (KDE/Qt/5.15.2/kde-qtscxml-5.15.2p1.tar.xz) = 408532	3	SIZE (KDE/Qt/5.15.5/kde-qtscxml-5.15.5p0.tar.xz) = 409372

Lines 1-3 Link Here

(-)b/devel/qt5-testlib/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423880	1	TIMESTAMP = 1656427425
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/devel/qt5-uitools/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423881	1	TIMESTAMP = 1656427426
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608




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


fi

# Count number of patches added by KDE
PATCH_COUNT=$(git -C ${CHECKOUT} rev-list --count ${ORIGIN_TAG}..origin/${BRANCH})

# Setup information for the distfile
DISTNAME="kde-${PROJECT}-${VERSION}p${PATCH_COUNT}"

Lines 1-3 Link Here

(-)b/graphics/qt5-3d/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639431403	1	TIMESTAMP = 1656427428
2	SHA256 (KDE/Qt/5.15.2/kde-qt3d-5.15.2p39.tar.xz) = 9a3f92cb460eb5e36d80624a177cf073a56ae189aed7ac615e8940286c56c8b8	2	SHA256 (KDE/Qt/5.15.5/kde-qt3d-5.15.5p15.tar.xz) = 84234da187474d2469c68d32422be4355a63313f069a11c3cedb5a84e55a62b5
3	SIZE (KDE/Qt/5.15.2/kde-qt3d-5.15.2p39.tar.xz) = 81860360	3	SIZE (KDE/Qt/5.15.5/kde-qt3d-5.15.5p15.tar.xz) = 81852048

Lines 1-3 Link Here

(-)b/graphics/qt5-graphicaleffects/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423883	1	TIMESTAMP = 1656427429
2	SHA256 (KDE/Qt/5.15.2/kde-qtgraphicaleffects-5.15.2p2.tar.xz) = 36786c7aaa7e0418a6c5c45771821c5b037c42aadcba332151b41a0dd68a71c1	2	SHA256 (KDE/Qt/5.15.5/kde-qtgraphicaleffects-5.15.5p0.tar.xz) = 5fda551c3ca666909548480c31b92bdf162145a0a8ba858e65d0301bb43dcdeb
3	SIZE (KDE/Qt/5.15.2/kde-qtgraphicaleffects-5.15.2p2.tar.xz) = 14019160	3	SIZE (KDE/Qt/5.15.5/kde-qtgraphicaleffects-5.15.5p0.tar.xz) = 14019140

Lines 1-3 Link Here

(-)b/graphics/qt5-imageformats/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423884	1	TIMESTAMP = 1656427430
2	SHA256 (KDE/Qt/5.15.2/kde-qtimageformats-5.15.2p3.tar.xz) = a55d3cbd1f51550d1c8ed3924567e095e88c7a323793d1978803350e3223549e	2	SHA256 (KDE/Qt/5.15.5/kde-qtimageformats-5.15.5p3.tar.xz) = 5b1a03276a44540e7edafd37ca58274cf25100678f7a19d7b0b61f2eeaf8d4fb
3	SIZE (KDE/Qt/5.15.2/kde-qtimageformats-5.15.2p3.tar.xz) = 1788056	3	SIZE (KDE/Qt/5.15.5/kde-qtimageformats-5.15.5p3.tar.xz) = 1805008

Lines 1-3 Link Here

(-)b/graphics/qt5-opengl/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423885	1	TIMESTAMP = 1656427431
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/graphics/qt5-pixeltool/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423887	1	TIMESTAMP = 1656427432
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/graphics/qt5-svg/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423888	1	TIMESTAMP = 1656427433
2	SHA256 (KDE/Qt/5.15.2/kde-qtsvg-5.15.2p13.tar.xz) = 665a35b4916d9406c221709d11529dc5bbeed6b674abd1c99cb48db1ad205d6c	2	SHA256 (KDE/Qt/5.15.5/kde-qtsvg-5.15.5p10.tar.xz) = 90a21c3e96d296b4374eaa992f5ebc7b1f93ecdf59aafbf15f9bd7cb8a4fa95c
3	SIZE (KDE/Qt/5.15.2/kde-qtsvg-5.15.2p13.tar.xz) = 1864320	3	SIZE (KDE/Qt/5.15.5/kde-qtsvg-5.15.5p10.tar.xz) = 1865000

Lines 1-3 Link Here

(-)b/graphics/qt5-wayland/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423889	1	TIMESTAMP = 1656427434
2	SHA256 (KDE/Qt/5.15.2/kde-qtwayland-5.15.2p37.tar.xz) = de116b90858923bd96e6fa541170dbfb208c845263a3301e861086a3b93f5467	2	SHA256 (KDE/Qt/5.15.5/kde-qtwayland-5.15.5p39.tar.xz) = 0d0a4d9bc914c33e1707b13a94afda7fb30a60864c45c7d7e5d6a6d28b9355d6
3	SIZE (KDE/Qt/5.15.2/kde-qtwayland-5.15.2p37.tar.xz) = 533864	3	SIZE (KDE/Qt/5.15.5/kde-qtwayland-5.15.5p39.tar.xz) = 535820




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",

Lines 5-11 PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} Link Here

(-)b/misc/qt5-examples/Makefile (-2 / +3 lines)
5	CATEGORIES= misc	5	CATEGORIES= misc
6	MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/single	6	MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/single
7	PKGNAMEPREFIX= qt5-	7	PKGNAMEPREFIX= qt5-
8	DISTNAME= qt-everywhere-src-${QT5_VERSION}	8	DISTNAME= qt-everywhere-opensource-src-${QT5_VERSION}
		9	WRKSRC= ${WRKDIR}/qt-everywhere-src-${QT5_VERSION}
9	DIST_SUBDIR= KDE/Qt/${QT5_VERSION}	10	DIST_SUBDIR= KDE/Qt/${QT5_VERSION}
10		11
11	MAINTAINER= kde@FreeBSD.org	12	MAINTAINER= kde@FreeBSD.org
Lines 36-42 _QT_DISTS= 3d activeqt androidextras base charts connectivity datavis3d \ Link Here
36	EXAMPLES= ${_QT_DISTS:C/^/qt/}	37	EXAMPLES= ${_QT_DISTS:C/^/qt/}
37		38
38	.for example in ${EXAMPLES}	39	.for example in ${EXAMPLES}
39	EXTRACT_AFTER_ARGS+= ${DISTNAME}/${example}/examples	40	EXTRACT_AFTER_ARGS+= ${DISTNAME:S/-opensource//}/${example}/examples
40	.endfor	41	.endfor
41		42
42	do-install:	43	do-install:

Lines 1-3 Link Here

(-)b/misc/qt5-examples/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1605899661	1	TIMESTAMP = 1656427609
2	SHA256 (KDE/Qt/5.15.2/qt-everywhere-src-5.15.2.tar.xz) = 3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240	2	SHA256 (KDE/Qt/5.15.5/qt-everywhere-opensource-src-5.15.5.tar.xz) = 5a97827bdf9fd515f43bc7651defaf64fecb7a55e051c79b8f80510d0e990f06
3	SIZE (KDE/Qt/5.15.2/qt-everywhere-src-5.15.2.tar.xz) = 586690220	3	SIZE (KDE/Qt/5.15.5/qt-everywhere-opensource-src-5.15.5.tar.xz) = 623305668

Lines 1-3 Link Here

(-)b/misc/qt5-l10n/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423897	1	TIMESTAMP = 1656427514
2	SHA256 (KDE/Qt/5.15.2/kde-qttranslations-5.15.2p22.tar.xz) = 4293399b69dfc98026925d9acecbeafe1e2df180857f67d180534fde91b2105d	2	SHA256 (KDE/Qt/5.15.5/kde-qttranslations-5.15.5p2.tar.xz) = ec445ead922ceb1c3ac3875c44559d93d64c47ead61e95bd2f9b543ec8f4565c
3	SIZE (KDE/Qt/5.15.2/kde-qttranslations-5.15.2p22.tar.xz) = 1594464	3	SIZE (KDE/Qt/5.15.5/kde-qttranslations-5.15.5p2.tar.xz) = 1594492

Lines 1-3 Link Here

(-)b/multimedia/qt5-multimedia/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423899	1	TIMESTAMP = 1656427515
2	SHA256 (KDE/Qt/5.15.2/kde-qtmultimedia-5.15.2p3.tar.xz) = 4eee6b7d15d88a0bff9285687196a2e7703f18927995443c1de7fb82c47f03ec	2	SHA256 (KDE/Qt/5.15.5/kde-qtmultimedia-5.15.5p1.tar.xz) = 5154ddbc15b1e7ad5034012bbdfaf80209a91a571ed4cf63f3802f5fc2c5d4a4
3	SIZE (KDE/Qt/5.15.2/kde-qtmultimedia-5.15.2p3.tar.xz) = 3788908	3	SIZE (KDE/Qt/5.15.5/kde-qtmultimedia-5.15.5p1.tar.xz) = 3790144

Lines 1-3 Link Here

(-)b/net/qt5-network/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423900	1	TIMESTAMP = 1656427516
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880




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);




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
@@ -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;
+#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
     }
 #endif // ocsp
 
+#ifndef LIBRESSL_VERSION_NUMBER
     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
             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
             sslContext->errorCode = QSslError::UnspecifiedError;
         }
-    } else {
+    } else
+#endif // LIBRESSL_VERSION_NUMBER
+    {
         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
         sslContext->errorCode = QSslError::UnspecifiedError;
     }




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;




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
@@ -238,7 +238,11 @@ 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 // !OPENSSL_NO_PSK
+
+#ifdef 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
 }
 #endif // TLS1_3_VERSION
 
-#endif // !OPENSSL_NO_PSK
-
 #if QT_CONFIG(ocsp)
 
 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 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) {




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
@@ -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
 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)
+#ifndef LIBRESSL_VERSION_NUMBER
 DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
 DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
 DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
 DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
 DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
 DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
+#endif
 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()
     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
     RESOLVEFUNC(SSL_CTX_get_cert_store);
+#ifndef LIBRESSL_VERSION_NUMBER
     RESOLVEFUNC(SSL_CONF_CTX_new);
     RESOLVEFUNC(SSL_CONF_CTX_free);
     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
     RESOLVEFUNC(SSL_CONF_CTX_finish);
     RESOLVEFUNC(SSL_CONF_cmd);
+#endif
     RESOLVEFUNC(SSL_accept)
     RESOLVEFUNC(SSL_clear)
     RESOLVEFUNC(SSL_connect)




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
@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
 
 #define DUMMYARG
 
+#ifdef LIBRESSL_VERSION_NUMBER
+typedef _STACK STACK;
+typedef STACK OPENSSL_STACK;
+typedef void OPENSSL_INIT_SETTINGS;
+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
+#endif
+
 #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);
 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);
+#ifndef LIBRESSL_VERSION_NUMBER
 SSL_CONF_CTX *q_SSL_CONF_CTX_new();
 void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
 void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
 unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
 int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
 int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
+#endif
 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);

Lines 1-3 Link Here

(-)b/net/qt5-networkauth/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423902	1	TIMESTAMP = 1656427517
2	SHA256 (KDE/Qt/5.15.2/kde-qtnetworkauth-5.15.2p2.tar.xz) = 73a747463be53741087836abbe07f7ba7cb787721d3a9dad713fd6552ac1068d	2	SHA256 (KDE/Qt/5.15.5/kde-qtnetworkauth-5.15.5p0.tar.xz) = 45b516666fb05419b24d007e617c953080510d5a590eda9bbaba016e59f9a1b6
3	SIZE (KDE/Qt/5.15.2/kde-qtnetworkauth-5.15.2p2.tar.xz) = 119968	3	SIZE (KDE/Qt/5.15.5/kde-qtnetworkauth-5.15.5p0.tar.xz) = 119968

Lines 1-3 Link Here

(-)b/print/qt5-printsupport/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423903	1	TIMESTAMP = 1656427518
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/sysutils/qt5-qtdiag/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423904	1	TIMESTAMP = 1656427519
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/sysutils/qt5-qtpaths/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423905	1	TIMESTAMP = 1656427520
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/sysutils/qt5-qtplugininfo/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423906	1	TIMESTAMP = 1656427521
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/textproc/qt5-xml/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423907	1	TIMESTAMP = 1656427522
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/textproc/qt5-xmlpatterns/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423908	1	TIMESTAMP = 1656427523
2	SHA256 (KDE/Qt/5.15.2/kde-qtxmlpatterns-5.15.2p2.tar.xz) = 519880b344bd108df382437cc987eaafb3fbfb055ea25edeff82d6fb38abd381	2	SHA256 (KDE/Qt/5.15.5/kde-qtxmlpatterns-5.15.5p0.tar.xz) = 0f97dd9b0b8f00053bf191c619300b729bd96e7090012f12d89590b8453a1532
3	SIZE (KDE/Qt/5.15.2/kde-qtxmlpatterns-5.15.2p2.tar.xz) = 1376128	3	SIZE (KDE/Qt/5.15.5/kde-qtxmlpatterns-5.15.5p0.tar.xz) = 1376604

Lines 1-3 Link Here

(-)b/www/qt5-webchannel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639423909	1	TIMESTAMP = 1656427524
2	SHA256 (KDE/Qt/5.15.2/kde-qtwebchannel-5.15.2p2.tar.xz) = ec97632456edacb2449ca178750a3fdc03a2561a6ca536c15593d729e33ec9cf	2	SHA256 (KDE/Qt/5.15.5/kde-qtwebchannel-5.15.5p3.tar.xz) = 1867e466b5805f12e819b358e7f99a04a990b051e0e679286324acd3974f2778
3	SIZE (KDE/Qt/5.15.2/kde-qtwebchannel-5.15.2p2.tar.xz) = 187764	3	SIZE (KDE/Qt/5.15.5/kde-qtwebchannel-5.15.5p3.tar.xz) = 188624

Lines 1-3 Link Here

(-)b/www/qt5-webglplugin/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424003	1	TIMESTAMP = 1656427529
2	SHA256 (KDE/Qt/5.15.2/kde-qtwebglplugin-5.15.2p2.tar.xz) = 54d0692ca4fdd487b53959a2895b098c03519965095b510d0750ea0358d71892	2	SHA256 (KDE/Qt/5.15.5/kde-qtwebglplugin-5.15.5p0.tar.xz) = 2fc45c00f8a8c26ad78c30e3c68a1f97e73575a3ba1be8e9fe8b4fb6f762b8c9
3	SIZE (KDE/Qt/5.15.2/kde-qtwebglplugin-5.15.2p2.tar.xz) = 53640	3	SIZE (KDE/Qt/5.15.5/kde-qtwebglplugin-5.15.5p0.tar.xz) = 53652

Lines 1-3 Link Here

(-)b/www/qt5-websockets-qml/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424005	1	TIMESTAMP = 1656427532
2	SHA256 (KDE/Qt/5.15.2/kde-qtwebsockets-5.15.2p4.tar.xz) = f2c686efc7ecd2943af70d80303e20aecf7b7116cb11cf84fc83ce791552f48e	2	SHA256 (KDE/Qt/5.15.5/kde-qtwebsockets-5.15.5p3.tar.xz) = daa41b7c2acb1521d772169fc368f99d32abc99ba3dc968c0b28cb8890ea5bdc
3	SIZE (KDE/Qt/5.15.2/kde-qtwebsockets-5.15.2p4.tar.xz) = 237052	3	SIZE (KDE/Qt/5.15.5/kde-qtwebsockets-5.15.5p3.tar.xz) = 237028

Lines 1-3 Link Here

(-)b/www/qt5-websockets/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424004	1	TIMESTAMP = 1656427531
2	SHA256 (KDE/Qt/5.15.2/kde-qtwebsockets-5.15.2p4.tar.xz) = f2c686efc7ecd2943af70d80303e20aecf7b7116cb11cf84fc83ce791552f48e	2	SHA256 (KDE/Qt/5.15.5/kde-qtwebsockets-5.15.5p3.tar.xz) = daa41b7c2acb1521d772169fc368f99d32abc99ba3dc968c0b28cb8890ea5bdc
3	SIZE (KDE/Qt/5.15.2/kde-qtwebsockets-5.15.2p4.tar.xz) = 237052	3	SIZE (KDE/Qt/5.15.5/kde-qtwebsockets-5.15.5p3.tar.xz) = 237028

Lines 1-3 Link Here

(-)b/www/qt5-webview/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424006	1	TIMESTAMP = 1656427532
2	SHA256 (KDE/Qt/5.15.2/kde-qtwebview-5.15.2p2.tar.xz) = 6750b8d0ce61d900a56b2ca9fa4cb1bca25a728ddffce22c3037f38a3cf47e9c	2	SHA256 (KDE/Qt/5.15.5/kde-qtwebview-5.15.5p0.tar.xz) = 0423fc1a84e30347a42d59ee45956b004e02ad16051c2ab3b486bec34c3009e5
3	SIZE (KDE/Qt/5.15.2/kde-qtwebview-5.15.2p2.tar.xz) = 112016	3	SIZE (KDE/Qt/5.15.5/kde-qtwebview-5.15.5p0.tar.xz) = 112224

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-charts/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424007	1	TIMESTAMP = 1656427534
2	SHA256 (KDE/Qt/5.15.2/kde-qtcharts-5.15.2p2.tar.xz) = bcc66d1f67d4be893aa1e952657735c63780ac2bcc49d6ec981c38612466b934	2	SHA256 (KDE/Qt/5.15.5/kde-qtcharts-5.15.5p1.tar.xz) = 58e5a2ceeca1a34b56e7458c497330d3cbfb42a4e708e846a46e8859ba2611a3
3	SIZE (KDE/Qt/5.15.2/kde-qtcharts-5.15.2p2.tar.xz) = 4218592	3	SIZE (KDE/Qt/5.15.5/kde-qtcharts-5.15.5p1.tar.xz) = 4219036

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-datavis3d/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424008	1	TIMESTAMP = 1656427535
2	SHA256 (KDE/Qt/5.15.2/kde-qtdatavis3d-5.15.2p2.tar.xz) = 48c33c37c3a8053403169a00c93bb9ddebfdcfda65ee736c25d6ef355c2b24ce	2	SHA256 (KDE/Qt/5.15.5/kde-qtdatavis3d-5.15.5p0.tar.xz) = 312ef813d9068b46237b3feeba35a396332fcfa4cc73ef775e83725bea9bdcdd
3	SIZE (KDE/Qt/5.15.2/kde-qtdatavis3d-5.15.2p2.tar.xz) = 5159608	3	SIZE (KDE/Qt/5.15.5/kde-qtdatavis3d-5.15.5p0.tar.xz) = 5159760

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-declarative-test/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424011	1	TIMESTAMP = 1656427538
2	SHA256 (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 67821e7f3ae5aac78bc82001394b2bef6f952c9607d281dd4a33e3c040d652ec	2	SHA256 (KDE/Qt/5.15.5/kde-qtdeclarative-5.15.5p19.tar.xz) = 0c206dcd2aade48d9679b70bb03aa3a192d62dc6507434302dd0bc21a0956afc
3	SIZE (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 18992128	3	SIZE (KDE/Qt/5.15.5/kde-qtdeclarative-5.15.5p19.tar.xz) = 19008008

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-declarative/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424010	1	TIMESTAMP = 1656427537
2	SHA256 (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 67821e7f3ae5aac78bc82001394b2bef6f952c9607d281dd4a33e3c040d652ec	2	SHA256 (KDE/Qt/5.15.5/kde-qtdeclarative-5.15.5p19.tar.xz) = 0c206dcd2aade48d9679b70bb03aa3a192d62dc6507434302dd0bc21a0956afc
3	SIZE (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 18992128	3	SIZE (KDE/Qt/5.15.5/kde-qtdeclarative-5.15.5p19.tar.xz) = 19008008

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-gamepad/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424012	1	TIMESTAMP = 1656427539
2	SHA256 (KDE/Qt/5.15.2/kde-qtgamepad-5.15.2p2.tar.xz) = 96b18f044fbd38fd81422f2386c084ccf180f999d46f24b361bec1d8a7b0dfa7	2	SHA256 (KDE/Qt/5.15.5/kde-qtgamepad-5.15.5p0.tar.xz) = 2d7bdeaea79d7789c609715fb96a6f4ac6ee3c862de79358a229488748881e19
3	SIZE (KDE/Qt/5.15.2/kde-qtgamepad-5.15.2p2.tar.xz) = 365384	3	SIZE (KDE/Qt/5.15.5/kde-qtgamepad-5.15.5p0.tar.xz) = 365416

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-gui/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424013	1	TIMESTAMP = 1656427540
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-quick3d/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424014	1	TIMESTAMP = 1656427541
2	SHA256 (KDE/Qt/5.15.2/kde-qtquick3d-5.15.2p19.tar.xz) = 40c9ec702df6f1ce429144c78b53210e876590318b6a463855269c8d98071b6a	2	SHA256 (KDE/Qt/5.15.5/kde-qtquick3d-5.15.5p1.tar.xz) = 091ce29286e0645fb2a822d41ffc3b265d3049e1c8c0ad75a6ec7a473458e507
3	SIZE (KDE/Qt/5.15.2/kde-qtquick3d-5.15.2p19.tar.xz) = 18253072	3	SIZE (KDE/Qt/5.15.5/kde-qtquick3d-5.15.5p1.tar.xz) = 18255516




%%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/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

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-quickcontrols/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424015	1	TIMESTAMP = 1656427542
2	SHA256 (KDE/Qt/5.15.2/kde-qtquickcontrols-5.15.2p3.tar.xz) = c70376eded8bf247d3bc6575a8b1eecf509a40f9e0a2e425c999c26ae83cbf40	2	SHA256 (KDE/Qt/5.15.5/kde-qtquickcontrols-5.15.5p0.tar.xz) = 038fd300e58a922e1e202b634039ab78088e4d06ffd623690dae6c4bc88eca29
3	SIZE (KDE/Qt/5.15.2/kde-qtquickcontrols-5.15.2p3.tar.xz) = 5956452	3	SIZE (KDE/Qt/5.15.5/kde-qtquickcontrols-5.15.5p0.tar.xz) = 5956356

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-quickcontrols2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424016	1	TIMESTAMP = 1656427543
2	SHA256 (KDE/Qt/5.15.2/kde-qtquickcontrols2-5.15.2p8.tar.xz) = b250a5c0755fd5f0a6692e3272e6e82525991a5fdfea0a73a9457d88da1117e5	2	SHA256 (KDE/Qt/5.15.5/kde-qtquickcontrols2-5.15.5p5.tar.xz) = b418760858b1fedc14516f651c07ea6bdb806ec5c443ab10d2de54aafe504624
3	SIZE (KDE/Qt/5.15.2/kde-qtquickcontrols2-5.15.2p8.tar.xz) = 8242136	3	SIZE (KDE/Qt/5.15.5/kde-qtquickcontrols2-5.15.5p5.tar.xz) = 8246240

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-quicktimeline/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424017	1	TIMESTAMP = 1656427544
2	SHA256 (KDE/Qt/5.15.2/kde-qtquicktimeline-5.15.2p3.tar.xz) = 5170b45bf2ef94d27eb5363376817baabffb720c3f864ce2f61fd27452d812b0	2	SHA256 (KDE/Qt/5.15.5/kde-qtquicktimeline-5.15.5p0.tar.xz) = a7f5b364dc54f938aa0d0706d2337ffba400a85b7652993cab9fcea61a8934b1
3	SIZE (KDE/Qt/5.15.2/kde-qtquicktimeline-5.15.2p3.tar.xz) = 82136	3	SIZE (KDE/Qt/5.15.5/kde-qtquicktimeline-5.15.5p0.tar.xz) = 82116

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-uiplugin/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424018	1	TIMESTAMP = 1656427545
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-virtualkeyboard/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424019	1	TIMESTAMP = 1656427546
2	SHA256 (KDE/Qt/5.15.2/kde-qtvirtualkeyboard-5.15.2p4.tar.xz) = c310615cd5be3f4e89716ab4f92225f73a1ed21e0c3238b3db37f752ef031028	2	SHA256 (KDE/Qt/5.15.5/kde-qtvirtualkeyboard-5.15.5p3.tar.xz) = 20d507f40ab83b66e4dc72ccf63434da02b5e5f13d5b6b2ffb9ed54b70f0ef09
3	SIZE (KDE/Qt/5.15.2/kde-qtvirtualkeyboard-5.15.2p4.tar.xz) = 10929208	3	SIZE (KDE/Qt/5.15.5/kde-qtvirtualkeyboard-5.15.5p3.tar.xz) = 10921480

Lines 1-3 Link Here

(-)b/x11-toolkits/qt5-widgets/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424021	1	TIMESTAMP = 1656427547
2	SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e	2	SHA256 (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 255ec301cb24ab2f76d7606ce3e96c418fa0f83cc12b1120d377c08480b4ef0c
3	SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048	3	SIZE (KDE/Qt/5.15.5/kde-qtbase-5.15.5p165.tar.xz) = 49898880

Lines 1-3 Link Here

(-)b/x11/qt5-qev/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639424022	1	TIMESTAMP = 1656427548
2	SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a	2	SHA256 (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 7380a63bd1e0d4aa7bd29c8eebf1d0de7c4ce53667f30fe548f34a8931b02a02
3	SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464	3	SIZE (KDE/Qt/5.15.5/kde-qttools-5.15.5p1.tar.xz) = 8843608

Lines 1-3 Link Here

(-)b/x11/qt5-x11extras/distinfo (-4 / +3 lines)
1	TIMESTAMP = 1639424023	1	TIMESTAMP = 1656427549
2	SHA256 (KDE/Qt/5.15.2/kde-qtx11extras-5.15.2p1.tar.xz) = 6e22063b26a86c59dd577bfd34d9f9b49e11ba3c7fb50e2a5509b8e2bac2b8f5	2	SHA256 (KDE/Qt/5.15.5/kde-qtx11extras-5.15.5p0.tar.xz) = cabd2b354b892ac91e4a1eb24c7218785b38ffb9d2233d8e89005892d8957980
3	SIZE (KDE/Qt/5.15.2/kde-qtx11extras-5.15.2p1.tar.xz) = 123360	3	SIZE (KDE/Qt/5.15.5/kde-qtx11extras-5.15.5p0.tar.xz) = 123280
4	-

Return to bug 264944

Lines 69-112 DESTDIRNAME= INSTALL_ROOT Link Here

(-)b/Mk/Uses/qt-dist.mk (-34 / +40 lines)
69	. if ${_QT_VER:M5}	69	. if ${_QT_VER:M5}
70		70
71	# KDE maintains a repository with a patched Qt5 distribution.	71	# KDE maintains a repository with a patched Qt5 distribution.
72	_KDE_3d= 39	72	_KDE_3d= 15
73	_KDE_base= 263	73	_KDE_base= 165
74	_KDE_charts= 2	74	_KDE_charts= 1
75	_KDE_connectivity= 1	75	_KDE_connectivity= 5
76	_KDE_datavis3d= 2	76	_KDE_datavis3d= 0
77	_KDE_declarative= 41	77	_KDE_declarative= 19
78	_KDE_gamepad= 2	78	_KDE_gamepad= 0
79	_KDE_graphicaleffects= 2	79	_KDE_graphicaleffects= 0
80	_KDE_imageformats= 3	80	_KDE_imageformats= 3
81	_KDE_location= 6	81	_KDE_location= 3
82	_KDE_multimedia= 3	82	_KDE_multimedia= 1
83	_KDE_networkauth= 2	83	_KDE_networkauth= 0
84	_KDE_quick3d= 19	84	_KDE_quick3d= 1
85	_KDE_quickcontrols= 3	85	_KDE_quickcontrols= 0
86	_KDE_quickcontrols2= 8	86	_KDE_quickcontrols2= 5
87	_KDE_quicktimeline= 3	87	_KDE_quicktimeline= 0
88	_KDE_remoteobjects= 3	88	_KDE_remoteobjects= 0
89	_KDE_script= 4	89	_KDE_script= 0
90	_KDE_scxml= 1	90	_KDE_script_ORIGIN_TAG= v5.15.10-lts
91	_KDE_sensors= 2	91	_KDE_script_VERSION= 5.15.10
92	_KDE_serialbus= 2	92	_KDE_scxml= 0
93	_KDE_serialport= 2	93	_KDE_sensors= 0
94	_KDE_speech= 2	94	_KDE_serialbus= 0
95	_KDE_svg= 13	95	_KDE_serialport= 0
96	_KDE_tools= 17	96	_KDE_speech= 1
97	_KDE_translations= 22	97	_KDE_svg= 10
98	_KDE_virtualkeyboard= 4	98	_KDE_tools= 1
99	_KDE_wayland= 37	99	_KDE_translations= 2
100	_KDE_webchannel= 2	100	_KDE_virtualkeyboard= 3
101	_KDE_webglplugin= 2	101	_KDE_wayland= 39
102	_KDE_websockets= 4	102	_KDE_webchannel= 3
103	_KDE_webview= 2	103	_KDE_webglplugin= 0
104	_KDE_x11extras= 1	104	_KDE_websockets= 3
105	_KDE_xmlpatterns= 2	105	_KDE_webview= 0
		106	_KDE_x11extras= 0
		107	_KDE_xmlpatterns= 0
106		108
107	. if defined(_KDE_${_QT_DIST})	109	. if defined(_KDE_${_QT_DIST})
108	# KDE patched Qt parts	110	# KDE patched Qt parts
109	QT5_KDE_PATCH= p${_KDE_${_QT_DIST}}	111	QT5_KDE_PATCH= p${_KDE_${_QT_DIST}}
		112	_KDE_${_QT_DIST}_VERSION?= ${_QT_VERSION}
		113	_KDE_${_QT_DIST}_ORIGIN_TAG?= v${_KDE_${_QT_DIST}_VERSION}-lts-lgpl
110	MASTER_SITES= LOCAL/tcberner/KDE/Qt/${_QT_VERSION}	114	MASTER_SITES= LOCAL/tcberner/KDE/Qt/${_QT_VERSION}
111	DISTNAME= ${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVERSION},}	115	DISTNAME= ${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVERSION},}
112	COMMENT+= (KDE patched)	116	COMMENT+= (KDE patched)
Lines 460-465 qt-post-install: Link Here
460	qt-create-kde-distfile:	464	qt-create-kde-distfile:
461	${SH} ${PORTSDIR}/devel/${_QT_RELNAME}/files/create_kde-qt_release.sh \	465	${SH} ${PORTSDIR}/devel/${_QT_RELNAME}/files/create_kde-qt_release.sh \
462	${_QT_DIST} \	466	${_QT_DIST} \
463	${DISTDIR}/${DIST_SUBDIR}	467	${DISTDIR}/${DIST_SUBDIR} \
		468	${_KDE_${_QT_DIST}_VERSION} \
		469	${_KDE_${_QT_DIST}_ORIGIN_TAG}
464		470
465	.endif # defined(_QT_DIST_MK_INCLUDED)	471	.endif # defined(_QT_DIST_MK_INCLUDED)

Lines 22-28 _QT_MK_INCLUDED= qt.mk Link Here

(-)b/Mk/Uses/qt.mk (-3 / +3 lines)
22		22
23	# Qt versions currently supported by the framework.	23	# Qt versions currently supported by the framework.
24	_QT_SUPPORTED?= 5	24	_QT_SUPPORTED?= 5
25	QT5_VERSION?= 5.15.2	25	QT5_VERSION?= 5.15.5
26		26
27	# We accept the Qt version to be passed by either or all of the three mk files.	27	# We accept the Qt version to be passed by either or all of the three mk files.
28	. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)	28	. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
Lines 154-160 qt-assistant_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/assistant Link Here
154		154
155	# Always build with this version's buildtools	155	# Always build with this version's buildtools
156	qt-buildtools_PORT= devel/${_QT_RELNAME}-buildtools	156	qt-buildtools_PORT= devel/${_QT_RELNAME}-buildtools
157	qt-buildtools_PATH= ${_QT_RELNAME}-buildtools>=${_QT_VERSION}	157	qt-buildtools_PATH= ${_QT_RELNAME}-buildtools>=${_QT_VERSION:R}
158		158
159	qt-charts_PORT= x11-toolkits/${_QT_RELNAME}-charts	159	qt-charts_PORT= x11-toolkits/${_QT_RELNAME}-charts
160	qt-charts_LIB= libQt${_QT_LIBVER}Charts.so	160	qt-charts_LIB= libQt${_QT_LIBVER}Charts.so
Lines 263-269 qt-qev_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qev Link Here
263		263
264	# Always build with this version's qmake	264	# Always build with this version's qmake
265	qt-qmake_PORT= devel/${_QT_RELNAME}-qmake	265	qt-qmake_PORT= devel/${_QT_RELNAME}-qmake
266	qt-qmake_PATH= ${_QT_RELNAME}-qmake>=${_QT_VERSION}	266	qt-qmake_PATH= ${_QT_RELNAME}-qmake>=${_QT_VERSION:R}
267		267
268	qt-quick3d_PORT= x11-toolkits/${_QT_RELNAME}-quick3d	268	qt-quick3d_PORT= x11-toolkits/${_QT_RELNAME}-quick3d
269	qt-quick3d_LIB= libQt${_QT_LIBVER}Quick3D.so	269	qt-quick3d_LIB= libQt${_QT_LIBVER}Quick3D.so

Removed Link Here

(-)a/devel/qt5-core/files/patch-CVE-2022-25255-qprocess5-15.diff (-63 lines)
1	This is the patch linked from the announcement
2	https://lists.qt-project.org/pipermail/announce/2022-February/000333.html
3	with two changes: in our sources, the copyright year for the
4	Qt Company is 2016, the upstream patch says 2021. Changed that
5	to make the patch apply. The upstream patch is fetched with
6	CRLF line-endings, changed to plain LF.
7
8	--- src/corelib/io/qprocess_unix.cpp
9	+++ src/corelib/io/qprocess_unix.cpp
10	@@ -1,7 +1,7 @@
11	/****************************************************************************
12	**
13	** Copyright (C) 2016 The Qt Company Ltd.
14	-** Copyright (C) 2016 Intel Corporation.
15	+** Copyright (C) 2022 Intel Corporation.
16	** Contact: https://www.qt.io/licensing/
17	**
18	** This file is part of the QtCore module of the Qt Toolkit.
19	@@ -422,14 +422,15 @@ void QProcessPrivate::startProcess()
20	// Add the program name to the argument list.
21	argv[0] = nullptr;
22	if (!program.contains(QLatin1Char('/'))) {
23	+ // findExecutable() returns its argument if it's an absolute path,
24	+ // otherwise it searches $PATH; returns empty if not found (we handle
25	+ // that case much later)
26	const QString &exeFilePath = QStandardPaths::findExecutable(program);
27	- if (!exeFilePath.isEmpty()) {
28	- const QByteArray &tmp = QFile::encodeName(exeFilePath);
29	- argv[0] = ::strdup(tmp.constData());
30	- }
31	- }
32	- if (!argv[0])
33	+ const QByteArray &tmp = QFile::encodeName(exeFilePath);
34	+ argv[0] = ::strdup(tmp.constData());
35	+ } else {
36	argv[0] = ::strdup(encodedProgramName.constData());
37	+ }
38
39	// Add every argument to the list
40	for (int i = 0; i < arguments.count(); ++i)
41	@@ -983,15 +984,16 @@ bool QProcessPrivate::startDetached(qint64 *pid)
42	envp = _q_dupEnvironment(environment.d.constData()->vars, &envc);
43	}
44
45	- QByteArray tmp;
46	if (!program.contains(QLatin1Char('/'))) {
47	+ // findExecutable() returns its argument if it's an absolute path,
48	+ // otherwise it searches $PATH; returns empty if not found (we handle
49	+ // that case much later)
50	const QString &exeFilePath = QStandardPaths::findExecutable(program);
51	- if (!exeFilePath.isEmpty())
52	- tmp = QFile::encodeName(exeFilePath);
53	+ const QByteArray &tmp = QFile::encodeName(exeFilePath);
54	+ argv[0] = ::strdup(tmp.constData());
55	+ } else {
56	+ argv[0] = ::strdup(QFile::encodeName(program));
57	}
58	- if (tmp.isEmpty())
59	- tmp = QFile::encodeName(program);
60	- argv[0] = tmp.data();
61
62	if (envp)
63	qt_safe_execve(argv[0], argv, envp);

Lines 7-13 DISTVERSION= ${QT5_VERSION} Link Here

(-)b/devel/qt5-qdoc-data/Makefile (-3 / +4 lines)
7	CATEGORIES= devel textproc	7	CATEGORIES= devel textproc
8	MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/submodules/	8	MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/submodules/
9	PKGNAMEPREFIX= qt5-	9	PKGNAMEPREFIX= qt5-
10	DISTNAME= qtbase-everywhere-src-${QT5_VERSION}	10	DISTNAME= qtbase-everywhere-opensource-src-${QT5_VERSION}
		11	WRKSRC= ${WRKDIR}/qtbase-everywhere-src-${QT5_VERSION}
11	DIST_SUBDIR= KDE/Qt/${QT5_VERSION}	12	DIST_SUBDIR= KDE/Qt/${QT5_VERSION}
12		13
13	MAINTAINER= kde@FreeBSD.org	14	MAINTAINER= kde@FreeBSD.org
Lines 19-26 LICENSE_FILE= ${WRKSRC}/LICENSE.FDL Link Here
19	USES= qt:5 tar:xz	20	USES= qt:5 tar:xz
20	USE_QT= # empty	21	USE_QT= # empty
21		22
22	EXTRACT_AFTER_ARGS= --include ${DISTNAME}/LICENSE.FDL \	23	EXTRACT_AFTER_ARGS= --include ${DISTNAME:S/-opensource//}/LICENSE.FDL \
23	--include ${DISTNAME}/doc	24	--include ${DISTNAME:S/-opensource//}/doc
24		25
25	NO_ARCH= yes	26	NO_ARCH= yes
26	NO_BUILD= yes	27	NO_BUILD= yes

Lines 7-20 Link Here

(-)b/devel/qt5/files/create_kde-qt_release.sh (-3 / +4 lines)
7	DIST="$1"	7	DIST="$1"
8	PROJECT=qt"${DIST}"	8	PROJECT=qt"${DIST}"
9	BASE_DIRECTORY="$2"	9	BASE_DIRECTORY="$2"
		10	# Version of Qt we want
		11	VERSION="$3"
		12	ORIGIN_TAG="$4"
10		13
11	# Remote KDE git repository	14	# Remote KDE git repository
12	REPO="https://invent.kde.org/qt/qt/${PROJECT}.git"	15	REPO="https://invent.kde.org/qt/qt/${PROJECT}.git"
13	# Local checkout	16	# Local checkout
14	CHECKOUT="${BASE_DIRECTORY}/${PROJECT}"	17	CHECKOUT="${BASE_DIRECTORY}/${PROJECT}"
15		18
16	# Version of Qt we want
17	VERSION=5.15.2
18	# KDE-Qt branch	19	# KDE-Qt branch
19	BRANCH=kde/5.15	20	BRANCH=kde/5.15
20		21
Lines 37-43 if [ $? -ne 0 ] ; then Link Here
37	fi	38	fi
38		39
39	# Count number of patches added by KDE	40	# Count number of patches added by KDE
40	PATCH_COUNT=$(git -C ${CHECKOUT} rev-list --count origin/${VERSION}..origin/${BRANCH})	41	PATCH_COUNT=$(git -C ${CHECKOUT} rev-list --count ${ORIGIN_TAG}..origin/${BRANCH})
41		42
42	# Setup information for the distfile	43	# Setup information for the distfile
43	DISTNAME="kde-${PROJECT}-${VERSION}p${PATCH_COUNT}"	44	DISTNAME="kde-${PROJECT}-${VERSION}p${PATCH_COUNT}"

Removed Link Here

(-)a/graphics/qt5-wayland/files/patch-libglvnd (-38 lines)
1	drm_*.h are part of kernel DRM API, installed under /usr/include on Linux.
2	FreeBSD (drm-kmod) doesn't install those anywhere, relying on libdrm copies.
3	libglvnd replaces libEGL from Mesa, so libdrm dependency needs to be explicit.
4
5	--- src/client/configure.json.orig 2020-10-27 08:02:11 UTC
6	+++ src/client/configure.json
7	@@ -149,8 +149,7 @@
8	"#endif"
9	]
10	},
11	- "libs": "-ldrm",
12	- "use": "egl"
13	+ "use": "egl drm"
14	},
15	"vulkan-server-buffer": {
16	"label": "Vulkan Buffer Sharing",
17	--- src/compositor/configure.json.orig 2020-10-27 08:02:11 UTC
18	+++ src/compositor/configure.json
19	@@ -151,8 +151,7 @@
20	"#endif"
21	]
22	},
23	- "libs": "-ldrm",
24	- "use": "egl"
25	+ "use": "egl drm"
26	},
27	"dmabuf-client-buffer": {
28	"label": "Linux Client dma-buf Buffer Sharing",
29	@@ -176,8 +175,7 @@
30	"return 0;"
31	]
32	},
33	- "libs": "-ldrm",
34	- "use": "egl"
35	+ "use": "egl drm"
36	},
37	"vulkan-server-buffer": {
38	"label": "Vulkan Buffer Sharing",

Lines 5276-5281 Link Here

(-)b/misc/qt5-examples/pkg-plist (+2 lines)
5276	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/cert.qrc	5276	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/cert.qrc
5277	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/client.crt	5277	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/client.crt
5278	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/client.key	5278	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/client.key
		5279	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/readme
5279	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/rootCA.key	5280	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/rootCA.key
5280	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/rootCA.pem	5281	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/rootCA.pem
5281	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/rootCA.srl	5282	%%QT_EXAMPLEDIR%%/remoteobjects/ssl/sslserver/cert/rootCA.srl
Lines 5291-5296 Link Here
5291	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/cert.qrc	5292	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/cert.qrc
5292	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/client.crt	5293	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/client.crt
5293	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/client.key	5294	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/client.key
		5295	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/readme
5294	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.key	5296	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.key
5295	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.pem	5297	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.pem
5296	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.srl	5298	%%QT_EXAMPLEDIR%%/remoteobjects/websockets/common/cert/rootCA.srl

Removed Link Here

(-)a/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp (-12 lines)
1	Patch based on Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch?id=c60b2b11bd17afca9bbe546db12918f789b57e25
2	--- src/network/ssl/qsslcertificate_openssl.cpp.orig 2021-12-07 13:51:35 UTC
3	+++ src/network/ssl/qsslcertificate_openssl.cpp
4	@@ -691,7 +691,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Na
5	unsigned char *data = nullptr;
6	int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
7	info.insert(name, QString::fromUtf8((char*)data, size));
8	-#if QT_CONFIG(opensslv11)
9	+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
10	q_CRYPTO_free(data, nullptr, 0);
11	#else
12	q_CRYPTO_free(data);

Removed Link Here

(-)a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp (-51 lines)
1	Patch based on Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch?id=c60b2b11bd17afca9bbe546db12918f789b57e25
2	--- src/network/ssl/qsslcontext_openssl.cpp.orig 2021-12-07 13:51:35 UTC
3	+++ src/network/ssl/qsslcontext_openssl.cpp
4	@@ -408,16 +408,28 @@ init_context:
5	maxVersion = DTLS1_VERSION;
6	break;
7	case QSsl::DtlsV1_0OrLater:
8	+#ifdef DTLS_MAX_VERSION
9	minVersion = DTLS1_VERSION;
10	maxVersion = DTLS_MAX_VERSION;
11	+#else
12	+ Q_UNREACHABLE();
13	+#endif // DTLS_MAX_VERSION
14	break;
15	case QSsl::DtlsV1_2:
16	+#ifdef DTLS1_2_VERSION
17	minVersion = DTLS1_2_VERSION;
18	maxVersion = DTLS1_2_VERSION;
19	+#else
20	+ Q_UNREACHABLE();
21	+#endif // DTLS1_2_VERSION
22	break;
23	case QSsl::DtlsV1_2OrLater:
24	+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
25	minVersion = DTLS1_2_VERSION;
26	maxVersion = DTLS_MAX_VERSION;
27	+#else
28	+ Q_UNREACHABLE();
29	+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
30	break;
31	case QSsl::TlsV1_3OrLater:
32	#ifdef TLS1_3_VERSION
33	@@ -722,6 +734,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
34	}
35	#endif // ocsp
36
37	+#ifndef LIBRESSL_VERSION_NUMBER
38	QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
39	if (cctx) {
40	q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
41	@@ -768,7 +781,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
42	sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
43	sslContext->errorCode = QSslError::UnspecifiedError;
44	}
45	- } else {
46	+ } else
47	+#endif // LIBRESSL_VERSION_NUMBER
48	+ {
49	sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
50	sslContext->errorCode = QSslError::UnspecifiedError;
51	}

Removed Link Here

(-)a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl__p.h (-17 lines)
1	Patch based on Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch?id=c60b2b11bd17afca9bbe546db12918f789b57e25
2	--- src/network/ssl/qsslcontext_openssl_p.h.orig 2020-09-02 10:15:07 UTC
3	+++ src/network/ssl/qsslcontext_openssl_p.h
4	@@ -61,6 +61,13 @@
5
6	QT_BEGIN_NAMESPACE
7
8	+#ifndef DTLS_ANY_VERSION
9	+#define DTLS_ANY_VERSION 0x1FFFF
10	+#endif
11	+#ifndef TLS_ANY_VERSION
12	+#define TLS_ANY_VERSION 0x10000
13	+#endif
14	+
15	#ifndef QT_NO_SSL
16
17	class QSslContextPrivate;

Removed Link Here

(-)a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp (-33 lines)
1	Patch based on Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch?id=c60b2b11bd17afca9bbe546db12918f789b57e25
2	--- src/network/ssl/qsslsocket_openssl.cpp.orig 2020-10-27 08:02:11 UTC
3	+++ src/network/ssl/qsslsocket_openssl.cpp
4	@@ -238,7 +238,11 @@ static int q_ssl_psk_use_session_callback(SSL *ssl, co
5
6	return 1; // need to return 1 or else "the connection setup fails."
7	}
8	+#endif // TLS1_3_VERSION
9
10	+#endif // !OPENSSL_NO_PSK
11	+
12	+#ifdef TLS1_3_VERSION
13	int q_ssl_sess_set_new_cb(SSL ssl, SSL_SESSION session)
14	{
15	if (!ssl) {
16	@@ -256,8 +260,6 @@ int q_ssl_sess_set_new_cb(SSL ssl, SSL_SESSION sessi
17	}
18	#endif // TLS1_3_VERSION
19
20	-#endif // !OPENSSL_NO_PSK
21	-
22	#if QT_CONFIG(ocsp)
23
24	int qt_OCSP_status_server_callback(SSL ssl, void ocspRequest)
25	@@ -653,7 +655,7 @@ bool QSslSocketBackendPrivate::initSslContext()
26	else if (mode == QSslSocket::SslServerMode)
27	q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
28
29	-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
30	+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
31	// Set the client callback for TLSv1.3 PSK
32	if (mode == QSslSocket::SslClientMode
33	&& QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {

Removed Link Here

(-)a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp (-129 lines)
1	Patch based on Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch?id=c60b2b11bd17afca9bbe546db12918f789b57e25
2	--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2021-12-07 13:51:35 UTC
3	+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
4	@@ -145,18 +145,31 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYA
5	DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
6	DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
7	DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
8	+#ifdef OPENSSL_NO_DEPRECATED_3_0
9	DEFINEFUNC2(EVP_PKEY_CTX , EVP_PKEY_CTX_new, EVP_PKEY pkey, pkey, ENGINE *e, e, return nullptr, return)
10	DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
11	DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
12	+#endif // OPENSSL_NO_DEPRECATED_3_0
13	DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
14	DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
15	+#if !defined(LIBRESSL_VERSION_NUMBER) \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL)
16	DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
17	+#endif
18	+#ifndef LIBRESSL_VERSION_NUMBER
19	DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
20	DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK a, a, void (b)(void*), b, return, DUMMYARG)
21	DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
22	DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK a, a, void b, b, return, DUMMYARG)
23	DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
24	DEFINEFUNC2(void , OPENSSL_sk_value, OPENSSL_STACK a, a, int b, b, return nullptr, return)
25	+#else
26	+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
27	+DEFINEFUNC2(void, sk_pop_free, STACK a, a, void (b)(void*), b, return, DUMMYARG)
28	+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
29	+DEFINEFUNC2(void, sk_push, _STACK a, a, void b, b, return, DUMMYARG)
30	+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
31	+DEFINEFUNC2(void , sk_value, STACK a, a, int b, b, return nullptr, return)
32	+#endif // LIBRESSL_VERSION_NUMBER
33	DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
34	DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
35	DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
36	@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE
37	DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE a, a, int idx, idx, void data, data, return 0, return)
38	DEFINEFUNC2(void , X509_STORE_get_ex_data, X509_STORE r, r, int idx, idx, return nullptr, return)
39	DEFINEFUNC(STACK_OF(X509) , X509_STORE_CTX_get0_chain, X509_STORE_CTX a, a, return nullptr, return)
40	+#ifndef LIBRESSL_VERSION_NUMBER
41	DEFINEFUNC3(void, CRYPTO_free, void str, str, const char file, file, int line, line, return, DUMMYARG)
42	+#else
43	+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
44	+#endif
45	DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
46	DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
47	DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
48	@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING
49	ASN1_OCTET_STRING piKeyHash, piKeyHash, ASN1_INTEGER pserial, pserial, OCSP_CERTID *cid, cid,
50	return 0, return)
51	DEFINEFUNC2(OCSP_RESPONSE , OCSP_response_create, int status, status, OCSP_BASICRESP bs, bs, return nullptr, return)
52	+#if !defined(LIBRESSL_VERSION_NUMBER) \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL)
53	DEFINEFUNC(const STACK_OF(X509) , OCSP_resp_get0_certs, const OCSP_BASICRESP bs, bs, return nullptr, return)
54	+#endif
55	DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID a, a, OCSP_CERTID b, b, return -1, return)
56	DEFINEFUNC7(OCSP_SINGLERESP , OCSP_basic_add1_status, OCSP_BASICRESP r, r, OCSP_CERTID *c, c, int s, s,
57	int re, re, ASN1_TIME rt, rt, ASN1_TIME t, t, ASN1_TIME *n, n, return nullptr, return)
58	@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
59	DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX a, a, RSA b, b, return -1, return)
60	DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX a, a, const char b, b, int c, c, return -1, return)
61	DEFINEFUNC(X509_STORE , SSL_CTX_get_cert_store, const SSL_CTX a, a, return nullptr, return)
62	+#ifndef LIBRESSL_VERSION_NUMBER
63	DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
64	DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
65	DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX a, a, SSL_CTX b, b, return, return);
66	DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
67	DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
68	DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX a, a, const char b, b, const char *c, c, return 0, return);
69	+#endif
70	DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
71	DEFINEFUNC(STACK_OF(SSL_CIPHER) , SSL_get_ciphers, const SSL a, a, return nullptr, return)
72	DEFINEFUNC(const SSL_CIPHER , SSL_get_current_cipher, SSL a, a, return nullptr, return)
73	@@ -845,17 +866,21 @@ bool q_resolveOpenSslSymbols()
74	RESOLVEFUNC(ASN1_STRING_get0_data)
75	RESOLVEFUNC(EVP_CIPHER_CTX_reset)
76	RESOLVEFUNC(EVP_PKEY_up_ref)
77	+#ifdef OPENSSL_NO_DEPRECATED_3_0
78	RESOLVEFUNC(EVP_PKEY_CTX_new)
79	RESOLVEFUNC(EVP_PKEY_param_check)
80	RESOLVEFUNC(EVP_PKEY_CTX_free)
81	+#endif // OPENSSL_NO_DEPRECATED_3_0
82	RESOLVEFUNC(EVP_PKEY_base_id)
83	RESOLVEFUNC(RSA_bits)
84	+#ifndef LIBRESSL_VERSION_NUMBER
85	RESOLVEFUNC(OPENSSL_sk_new_null)
86	RESOLVEFUNC(OPENSSL_sk_push)
87	RESOLVEFUNC(OPENSSL_sk_free)
88	RESOLVEFUNC(OPENSSL_sk_num)
89	RESOLVEFUNC(OPENSSL_sk_pop_free)
90	RESOLVEFUNC(OPENSSL_sk_value)
91	+#endif
92	RESOLVEFUNC(DH_get0_pqg)
93	RESOLVEFUNC(SSL_CTX_set_options)
94	RESOLVEFUNC(SSL_CTX_get_security_level)
95	@@ -898,7 +923,9 @@ bool q_resolveOpenSslSymbols()
96
97	RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
98	RESOLVEFUNC(DH_bits)
99	+#if !defined(LIBRESSL_VERSION_NUMBER) \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL)
100	RESOLVEFUNC(DSA_bits)
101	+#endif
102
103	#if QT_CONFIG(dtls)
104	RESOLVEFUNC(DTLSv1_listen)
105	@@ -928,7 +955,9 @@ bool q_resolveOpenSslSymbols()
106	RESOLVEFUNC(OCSP_check_validity)
107	RESOLVEFUNC(OCSP_cert_to_id)
108	RESOLVEFUNC(OCSP_id_get0_info)
109	+#ifndef LIBRESSL_VERSION_NUMBER
110	RESOLVEFUNC(OCSP_resp_get0_certs)
111	+#endif
112	RESOLVEFUNC(OCSP_basic_sign)
113	RESOLVEFUNC(OCSP_response_create)
114	RESOLVEFUNC(i2d_OCSP_RESPONSE)
115	@@ -1058,12 +1087,14 @@ bool q_resolveOpenSslSymbols()
116	RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
117	RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
118	RESOLVEFUNC(SSL_CTX_get_cert_store);
119	+#ifndef LIBRESSL_VERSION_NUMBER
120	RESOLVEFUNC(SSL_CONF_CTX_new);
121	RESOLVEFUNC(SSL_CONF_CTX_free);
122	RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
123	RESOLVEFUNC(SSL_CONF_CTX_set_flags);
124	RESOLVEFUNC(SSL_CONF_CTX_finish);
125	RESOLVEFUNC(SSL_CONF_cmd);
126	+#endif
127	RESOLVEFUNC(SSL_accept)
128	RESOLVEFUNC(SSL_clear)
129	RESOLVEFUNC(SSL_connect)

Lines 474-482 Link Here

(-)b/x11-toolkits/qt5-quick3d/pkg-plist (-3 / +12 lines)
474	%%QT_QMLDIR%%/QtQuick3D/designer/images/group.png	474	%%QT_QMLDIR%%/QtQuick3D/designer/images/group.png
475	%%QT_QMLDIR%%/QtQuick3D/designer/images/group16.png	475	%%QT_QMLDIR%%/QtQuick3D/designer/images/group16.png
476	%%QT_QMLDIR%%/QtQuick3D/designer/images/group@2x.png	476	%%QT_QMLDIR%%/QtQuick3D/designer/images/group@2x.png
477	%%QT_QMLDIR%%/QtQuick3D/designer/images/light.png	477	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightarea.png
478	%%QT_QMLDIR%%/QtQuick3D/designer/images/light16.png	478	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightarea16.png
479	%%QT_QMLDIR%%/QtQuick3D/designer/images/light@2x.png	479	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightarea@2x.png
		480	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightdirectional.png
		481	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightdirectional16.png
		482	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightdirectional@2x.png
		483	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightpoint.png
		484	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightpoint16.png
		485	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightpoint@2x.png
		486	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightspot.png
		487	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightspot16.png
		488	%%QT_QMLDIR%%/QtQuick3D/designer/images/lightspot@2x.png
480	%%QT_QMLDIR%%/QtQuick3D/designer/images/material.png	489	%%QT_QMLDIR%%/QtQuick3D/designer/images/material.png
481	%%QT_QMLDIR%%/QtQuick3D/designer/images/material16.png	490	%%QT_QMLDIR%%/QtQuick3D/designer/images/material16.png
482	%%QT_QMLDIR%%/QtQuick3D/designer/images/material@2x.png	491	%%QT_QMLDIR%%/QtQuick3D/designer/images/material@2x.png

Lines 27-32 Link Here

(-)b/x11-toolkits/qt5-quickcontrols2/pkg-plist (-2 / +3 lines)
27	%%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2-config.h	27	%%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2-config.h
28	%%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2global.h	28	%%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2global.h
29	%%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2version.h	29	%%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2version.h
		30	%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qaccessiblequickpage_p.h
30	%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickabstractbutton_p.h	31	%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickabstractbutton_p.h
31	%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickabstractbutton_p_p.h	32	%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickabstractbutton_p_p.h
32	%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickaction_p.h	33	%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickaction_p.h
Lines 351-358 Link Here
351	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ToolSeparator.qml	352	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ToolSeparator.qml
352	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ToolTip.qml	353	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ToolTip.qml
353	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Tumbler.qml	354	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Tumbler.qml
354	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so	355	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/libqqc2materialstyleplugin.so
355	%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so.debug	356	%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls.2/Material/libqqc2materialstyleplugin.so.debug
356	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/plugins.qmltypes	357	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/plugins.qmltypes
357	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/qmldir	358	%%QT_QMLDIR%%/QtQuick/Controls.2/Material/qmldir
358	%%QT_QMLDIR%%/QtQuick/Controls.2/Menu.qml	359	%%QT_QMLDIR%%/QtQuick/Controls.2/Menu.qml