Qt: Switch Qt5 to use KDE's Qt patch collection

From [1]
    What's this?

	This is a set of git repositories based on the last public
	commits available for Qt 5.15 branches with a curated collection
	of patches on top to ensure open source products can be used
	comfortably until users transition to their Qt 6-based ports.

    Which patches does it include?

	This collection of patches includes patches that fix at least
	one of the following:

	    * Security issues
	    * Crashes
	    * Functional defects

	We only include patches that have been approved upstream in the
	Qt project. If a patch cannot be merged upstream for technical
	reasons (e.g. the class no longer exists), it can also be
	merged.

	The patches to merge will be decided based on their relevance
	towards Open Source products and their viability.

PR:		260548
Exp-run by:	antoine
Differential Revision:	https://reviews.freebsd.org/D33446

[1] https://community.kde.org/Qt5PatchCollection

(cherry picked from commit 6b3bece75ad5a3d03e2751e5cdf78ae8aeb0abf9)

30 files changed, 84 insertions, 87 deletions

diff --git a/x11-toolkits/qt5-charts/Makefile b/x11-toolkits/qt5-charts/Makefile
index 79e71b0e07fb..14c58462c082 100644
--- a/x11-toolkits/qt5-charts/Makefile
+++ b/x11-toolkits/qt5-charts/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	charts
-DISTVERSION=	${QT5_VERSION}
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/qt5-charts/distinfo b/x11-toolkits/qt5-charts/distinfo
new file mode 100644
index 000000000000..ae06d5898498
--- /dev/null
+++ b/x11-toolkits/qt5-charts/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424007
+SHA256 (KDE/Qt/5.15.2/kde-qtcharts-5.15.2p2.tar.xz) = bcc66d1f67d4be893aa1e952657735c63780ac2bcc49d6ec981c38612466b934
+SIZE (KDE/Qt/5.15.2/kde-qtcharts-5.15.2p2.tar.xz) = 4218592
diff --git a/x11-toolkits/qt5-datavis3d/Makefile b/x11-toolkits/qt5-datavis3d/Makefile
index e876b87d45e8..0c12da08eb89 100644
--- a/x11-toolkits/qt5-datavis3d/Makefile
+++ b/x11-toolkits/qt5-datavis3d/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	datavis3d
-DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/qt5-datavis3d/distinfo b/x11-toolkits/qt5-datavis3d/distinfo
new file mode 100644
index 000000000000..2cef9773166f
--- /dev/null
+++ b/x11-toolkits/qt5-datavis3d/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424008
+SHA256 (KDE/Qt/5.15.2/kde-qtdatavis3d-5.15.2p2.tar.xz) = 48c33c37c3a8053403169a00c93bb9ddebfdcfda65ee736c25d6ef355c2b24ce
+SIZE (KDE/Qt/5.15.2/kde-qtdatavis3d-5.15.2p2.tar.xz) = 5159608
diff --git a/x11-toolkits/qt5-declarative-test/Makefile b/x11-toolkits/qt5-declarative-test/Makefile
index d5bd137e6969..5f4145b1e7aa 100644
--- a/x11-toolkits/qt5-declarative-test/Makefile
+++ b/x11-toolkits/qt5-declarative-test/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	declarative-test
-DISTVERSION=	${QT5_VERSION}
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/qt5-declarative-test/distinfo b/x11-toolkits/qt5-declarative-test/distinfo
new file mode 100644
index 000000000000..17f2d376c03b
--- /dev/null
+++ b/x11-toolkits/qt5-declarative-test/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424011
+SHA256 (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 67821e7f3ae5aac78bc82001394b2bef6f952c9607d281dd4a33e3c040d652ec
+SIZE (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 18992128
diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile
index afad220bb9a6..0ad36a26d97d 100644
--- a/x11-toolkits/qt5-declarative/Makefile
+++ b/x11-toolkits/qt5-declarative/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	declarative
-DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	5
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/qt5-declarative/distinfo b/x11-toolkits/qt5-declarative/distinfo
new file mode 100644
index 000000000000..356f1b291022
--- /dev/null
+++ b/x11-toolkits/qt5-declarative/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424010
+SHA256 (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 67821e7f3ae5aac78bc82001394b2bef6f952c9607d281dd4a33e3c040d652ec
+SIZE (KDE/Qt/5.15.2/kde-qtdeclarative-5.15.2p41.tar.xz) = 18992128
diff --git a/x11-toolkits/qt5-declarative/pkg-plist b/x11-toolkits/qt5-declarative/pkg-plist
index 991767ac1cbd..23d393db77f2 100644
--- a/x11-toolkits/qt5-declarative/pkg-plist
+++ b/x11-toolkits/qt5-declarative/pkg-plist
@@ -1,3 +1,5 @@
+%%QT_BINDIR%%/qmltime
+%%DEBUG%%%%QT_BINDIR%%/qmltime.debug
 %%QT_INCDIR%%/QtPacketProtocol/%%FULLVER%%/QtPacketProtocol/private/qpacket_p.h
 %%QT_INCDIR%%/QtPacketProtocol/%%FULLVER%%/QtPacketProtocol/private/qpacketprotocol_p.h
 %%QT_INCDIR%%/QtPacketProtocol/%%FULLVER%%/QtPacketProtocol/private/qversionedpacket_p.h
diff --git a/x11-toolkits/qt5-gamepad/Makefile b/x11-toolkits/qt5-gamepad/Makefile
index d49c7f65bcca..0178a9a388b3 100644
--- a/x11-toolkits/qt5-gamepad/Makefile
+++ b/x11-toolkits/qt5-gamepad/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gamepad
-DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/qt5-gamepad/distinfo b/x11-toolkits/qt5-gamepad/distinfo
new file mode 100644
index 000000000000..267b81d560b1
--- /dev/null
+++ b/x11-toolkits/qt5-gamepad/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424012
+SHA256 (KDE/Qt/5.15.2/kde-qtgamepad-5.15.2p2.tar.xz) = 96b18f044fbd38fd81422f2386c084ccf180f999d46f24b361bec1d8a7b0dfa7
+SIZE (KDE/Qt/5.15.2/kde-qtgamepad-5.15.2p2.tar.xz) = 365384
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index 1663bcb08e98..bfa46c4a8acd 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gui
-DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	7
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits graphics
 PKGNAMEPREFIX=	qt5-
 
@@ -33,9 +32,10 @@ RUN_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
 		xdg-open:devel/xdg-utils
 
 USES=			compiler:c++11-lang gl gnome jpeg localbase \
-			qmake:no_env qt-dist:5,base
+			perl5 qmake:no_env qt-dist:5,base
 USE_GL=			egl gl
 USE_GNOME=		glib20
+USE_PERL5=		extract
 USE_QT=			core dbus network buildtools_build qmake_build
 QT_BINARIES=		yes
 QT_CONFIG=		accessibility accessibility-atspi-bridge dbus \
diff --git a/x11-toolkits/qt5-gui/distinfo b/x11-toolkits/qt5-gui/distinfo
new file mode 100644
index 000000000000..27cf2cdba087
--- /dev/null
+++ b/x11-toolkits/qt5-gui/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424013
+SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
+SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048
diff --git a/x11-toolkits/qt5-gui/files/patch-git_73fc1f93-add_timeout_control_when_reading_incr_property b/x11-toolkits/qt5-gui/files/patch-git_73fc1f93-add_timeout_control_when_reading_incr_property
deleted file mode 100644
index 6f6dec7d35ec..000000000000
--- a/x11-toolkits/qt5-gui/files/patch-git_73fc1f93-add_timeout_control_when_reading_incr_property
+++ /dev/null
@@ -1,59 +0,0 @@
-From 73fc1f93e8bea1c493ed16655ad6fd68ae270e38 Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi@qt.io>
-Date: Wed, 7 Jul 2021 13:19:14 +0200
-Subject: [PATCH] xcb: add a timeout control when reading INCR property
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-For the first call of QXcbClipboard::clipboardReadProperty()
-inside of clipboardReadIncrementalProperty() in getSelection(),
-it will get a XCB_NONE reply before the contents arrived via
-property change. Then we give a chance to read more.
-
-Manually tested with following setups:
-* examples/widgets/mainwindows/application with gvim(gtk3)
-* examples/widgets/widgets/imageviewer with GIMP 2.10.18(based on
-gtk2) and GIMP 2.99.6(based on gtk3 via flatpak)
-
-Fixes: QTBUG-56595
-Done-With: JiDe Zhang <zhangjide@uniontech.com>
-Change-Id: Ib45f08464d39ad79137b1da99808c89b7dca2d08
-Reviewed-by: JiDe Zhang <zhangjide@uniontech.com>
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-(cherry picked from commit 02248eea5562c1df39ee23f195011afacc6759b0)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/plugins/platforms/xcb/qxcbclipboard.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-index 725c0e4d514..a4940f1c491 100644
---- src/plugins/platforms/xcb/qxcbclipboard.cpp
-+++ src/plugins/platforms/xcb/qxcbclipboard.cpp
-@@ -841,6 +841,8 @@ QByteArray QXcbClipboard::clipboardReadIncrementalProperty(xcb_window_t win, xcb
-         alloc_error = buf.size() != nbytes+1;
-     }
- 
-+    QElapsedTimer timer;
-+    timer.start();
-     for (;;) {
-         connection()->flush();
-         xcb_generic_event_t *ge = waitForClipboardEvent(win, XCB_PROPERTY_NOTIFY);
-@@ -876,9 +878,11 @@ QByteArray QXcbClipboard::clipboardReadIncrementalProperty(xcb_window_t win, xcb
-                 tmp_buf.resize(0);
-                 offset += length;
-             }
--        } else {
--            break;
-         }
-+
-+        const auto elapsed = timer.elapsed();
-+        if (elapsed > clipboard_timeout)
-+            break;
-     }
- 
-     // timed out ... create a new requestor window, otherwise the requestor
--- 
-2.16.3
-
diff --git a/x11-toolkits/qt5-quick3d/Makefile b/x11-toolkits/qt5-quick3d/Makefile
index 7d1b8dfeae02..8cde6a481c6b 100644
--- a/x11-toolkits/qt5-quick3d/Makefile
+++ b/x11-toolkits/qt5-quick3d/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	quick3d
-DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	3
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Set of controls for building complete interfaces in Qt Quick3D
 
+LIB_DEPENDS=	libassimp.so:multimedia/assimp
+
 USES=		compiler:c++11-lang qmake qt-dist:5
 USE_QT=		core declarative gui network opengl \
 		buildtools_build
 
-QMAKE_CONFIGURE_ARGS=	--quick3d-assimp=qt
 QT_BINARIES=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-quick3d/distinfo b/x11-toolkits/qt5-quick3d/distinfo
new file mode 100644
index 000000000000..cb4b6cad90b7
--- /dev/null
+++ b/x11-toolkits/qt5-quick3d/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424014
+SHA256 (KDE/Qt/5.15.2/kde-qtquick3d-5.15.2p19.tar.xz) = 40c9ec702df6f1ce429144c78b53210e876590318b6a463855269c8d98071b6a
+SIZE (KDE/Qt/5.15.2/kde-qtquick3d-5.15.2p19.tar.xz) = 18253072
diff --git a/x11-toolkits/qt5-quick3d/files/patch-arch_qt5-quick3d-assimp-5.1 b/x11-toolkits/qt5-quick3d/files/patch-arch_qt5-quick3d-assimp-5.1
new file mode 100644
index 000000000000..c6ed41c4bf20
--- /dev/null
+++ b/x11-toolkits/qt5-quick3d/files/patch-arch_qt5-quick3d-assimp-5.1
@@ -0,0 +1,17 @@
+Obtained from: https://github.com/archlinux/svntogit-packages/blob/packages/qt5-quick3d/trunk/qt5-quick3d-assimp-5.1.patch
+
+diff --git src/plugins/assetimporters/assimp/assimpimporter.cpp src/plugins/assetimporters/assimp/assimpimporter.cpp
+index f3660fdd..0f5fc901 100644
+--- src/plugins/assetimporters/assimp/assimpimporter.cpp
++++ src/plugins/assetimporters/assimp/assimpimporter.cpp
+@@ -1082,9 +1082,7 @@ void AssimpImporter::generateMaterial(aiMaterial *material, QTextStream &output,
+         }
+ 
+         // SpecularGlossiness Properties
+-        bool hasSpecularGlossiness;
+-        result = material->Get(AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS, hasSpecularGlossiness);
+-        if (result == aiReturn_SUCCESS && hasSpecularGlossiness) {
++        {
+ 
+             // diffuseFactor (color) // not used (yet), but ends up being diffuseColor
+ //            {
diff --git a/x11-toolkits/qt5-quick3d/pkg-plist b/x11-toolkits/qt5-quick3d/pkg-plist
index d6d0ef0ad6e5..a0396a8d374c 100644
--- a/x11-toolkits/qt5-quick3d/pkg-plist
+++ b/x11-toolkits/qt5-quick3d/pkg-plist
@@ -305,6 +305,7 @@
 %%QT_QMLDIR%%/QtQuick3D/Effects/designer/images/effect.png
 %%QT_QMLDIR%%/QtQuick3D/Effects/designer/images/effect16.png
 %%QT_QMLDIR%%/QtQuick3D/Effects/designer/images/effect@2x.png
+%%QT_QMLDIR%%/QtQuick3D/Effects/designer/source/effect_default_shader.frag
 %%QT_QMLDIR%%/QtQuick3D/Effects/designer/source/effect_template.qml
 %%QT_QMLDIR%%/QtQuick3D/Effects/libqtquick3deffectplugin.so
 %%DEBUG%%%%QT_QMLDIR%%/QtQuick3D/Effects/libqtquick3deffectplugin.so.debug
@@ -372,6 +373,8 @@
 %%QT_QMLDIR%%/QtQuick3D/Materials/designer/images/custommaterial16.png
 %%QT_QMLDIR%%/QtQuick3D/Materials/designer/images/custommaterial@2x.png
 %%QT_QMLDIR%%/QtQuick3D/Materials/designer/materiallib.metainfo
+%%QT_QMLDIR%%/QtQuick3D/Materials/designer/source/custom_material_default_shader.frag
+%%QT_QMLDIR%%/QtQuick3D/Materials/designer/source/custom_material_default_shader.vert
 %%QT_QMLDIR%%/QtQuick3D/Materials/designer/source/custommaterial_template.qml
 %%QT_QMLDIR%%/QtQuick3D/Materials/libqtquick3dmaterialplugin.so
 %%DEBUG%%%%QT_QMLDIR%%/QtQuick3D/Materials/libqtquick3dmaterialplugin.so.debug
diff --git a/x11-toolkits/qt5-quickcontrols/Makefile b/x11-toolkits/qt5-quickcontrols/Makefile
index 1720e91d6eef..5d316783c830 100644
--- a/x11-toolkits/qt5-quickcontrols/Makefile
+++ b/x11-toolkits/qt5-quickcontrols/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	quickcontrols
-DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/qt5-quickcontrols/distinfo b/x11-toolkits/qt5-quickcontrols/distinfo
new file mode 100644
index 000000000000..5dc3bf1ee3ed
--- /dev/null
+++ b/x11-toolkits/qt5-quickcontrols/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424015
+SHA256 (KDE/Qt/5.15.2/kde-qtquickcontrols-5.15.2p3.tar.xz) = c70376eded8bf247d3bc6575a8b1eecf509a40f9e0a2e425c999c26ae83cbf40
+SIZE (KDE/Qt/5.15.2/kde-qtquickcontrols-5.15.2p3.tar.xz) = 5956452
diff --git a/x11-toolkits/qt5-quickcontrols2/Makefile b/x11-toolkits/qt5-quickcontrols2/Makefile
index 044411683504..195a8676eabb 100644
--- a/x11-toolkits/qt5-quickcontrols2/Makefile
+++ b/x11-toolkits/qt5-quickcontrols2/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	quickcontrols2
-DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/qt5-quickcontrols2/distinfo b/x11-toolkits/qt5-quickcontrols2/distinfo
new file mode 100644
index 000000000000..3a32889d03b9
--- /dev/null
+++ b/x11-toolkits/qt5-quickcontrols2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424016
+SHA256 (KDE/Qt/5.15.2/kde-qtquickcontrols2-5.15.2p8.tar.xz) = b250a5c0755fd5f0a6692e3272e6e82525991a5fdfea0a73a9457d88da1117e5
+SIZE (KDE/Qt/5.15.2/kde-qtquickcontrols2-5.15.2p8.tar.xz) = 8242136
diff --git a/x11-toolkits/qt5-quicktimeline/Makefile b/x11-toolkits/qt5-quicktimeline/Makefile
index 3d9b407030a7..b982c9cada13 100644
--- a/x11-toolkits/qt5-quicktimeline/Makefile
+++ b/x11-toolkits/qt5-quicktimeline/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	quicktimeline
-DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/qt5-quicktimeline/distinfo b/x11-toolkits/qt5-quicktimeline/distinfo
new file mode 100644
index 000000000000..8da0352703aa
--- /dev/null
+++ b/x11-toolkits/qt5-quicktimeline/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424017
+SHA256 (KDE/Qt/5.15.2/kde-qtquicktimeline-5.15.2p3.tar.xz) = 5170b45bf2ef94d27eb5363376817baabffb720c3f864ce2f61fd27452d812b0
+SIZE (KDE/Qt/5.15.2/kde-qtquicktimeline-5.15.2p3.tar.xz) = 82136
diff --git a/x11-toolkits/qt5-uiplugin/Makefile b/x11-toolkits/qt5-uiplugin/Makefile
index c2bc3f3110ca..511279c2913c 100644
--- a/x11-toolkits/qt5-uiplugin/Makefile
+++ b/x11-toolkits/qt5-uiplugin/Makefile
@@ -1,13 +1,15 @@
 PORTNAME=	uiplugin
-DISTVERSION=	${QT5_VERSION}
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Custom Qt widget plugin interface for Qt Designer
 
-USES=		compiler:c++17-lang qmake qt-dist:5,tools
-USE_QT=		core gui widgets
+USES=		compiler:c++17-lang perl5 qmake qt-dist:5,tools
+USE_PERL5=	extract
+USE_QT=		core gui widgets \
+		buildtools_build # syncqt
 
 BUILD_WRKSRC=	${WRKSRC}/src/designer/src/${PORTNAME}
 INSTALL_WRKSRC=	${WRKSRC}/src/designer/src/${PORTNAME}
diff --git a/x11-toolkits/qt5-uiplugin/distinfo b/x11-toolkits/qt5-uiplugin/distinfo
new file mode 100644
index 000000000000..df5549373835
--- /dev/null
+++ b/x11-toolkits/qt5-uiplugin/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424018
+SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a
+SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464
diff --git a/x11-toolkits/qt5-virtualkeyboard/Makefile b/x11-toolkits/qt5-virtualkeyboard/Makefile
index 2bf560f62ed5..e6b402ae5ba6 100644
--- a/x11-toolkits/qt5-virtualkeyboard/Makefile
+++ b/x11-toolkits/qt5-virtualkeyboard/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	virtualkeyboard
-DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/qt5-virtualkeyboard/distinfo b/x11-toolkits/qt5-virtualkeyboard/distinfo
new file mode 100644
index 000000000000..a2f774825236
--- /dev/null
+++ b/x11-toolkits/qt5-virtualkeyboard/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424019
+SHA256 (KDE/Qt/5.15.2/kde-qtvirtualkeyboard-5.15.2p4.tar.xz) = c310615cd5be3f4e89716ab4f92225f73a1ed21e0c3238b3db37f752ef031028
+SIZE (KDE/Qt/5.15.2/kde-qtvirtualkeyboard-5.15.2p4.tar.xz) = 10929208
diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile
index 494138b058ae..bbd1812627d7 100644
--- a/x11-toolkits/qt5-widgets/Makefile
+++ b/x11-toolkits/qt5-widgets/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	widgets
-DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	3
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt C++ widgets module
 
-USES=		compiler:c++11-lang qmake:no_env qt-dist:5,base xorg
+USES=		compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base xorg
+USE_PERL5=	extract
 USE_QT=		core gui qmake_build buildtools_build
 USE_XORG=	x11
 HAS_CONFIGURE=	yes
diff --git a/x11-toolkits/qt5-widgets/distinfo b/x11-toolkits/qt5-widgets/distinfo
new file mode 100644
index 000000000000..0b641234e3cf
--- /dev/null
+++ b/x11-toolkits/qt5-widgets/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1639424021
+SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e
+SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048