diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile
index 4dd1225b49a5..0c45cbbf94b2 100644
--- a/devel/qt6-base/Makefile
+++ b/devel/qt6-base/Makefile
@@ -1,136 +1,139 @@
 PORTNAME=	base
 DISTVERSION=	${QT6_VERSION}
 PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
+PATCH_SITES=	https://github.com/qt/qtbase/commit/
+PATCHFILES=	3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch:-p1
+
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt base (core, gui, widgets, network,...)
 WWW=		https://www.qt.io/
 
 BUILD_DEPENDS=	xml:textproc/xmlstarlet \
 		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	\
 		libatk-1.0.so:accessibility/at-spi2-core \
 		libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libavahi-client.so:net/avahi-app \
 		libbrotlidec.so:archivers/brotli \
 		libdbus-1.so:devel/dbus \
 		libdouble-conversion.so:devel/double-conversion \
 		libdrm.so:graphics/libdrm \
 		libepoll-shim.so:devel/libepoll-shim \
 		libepoxy.so:graphics/libepoxy \
 		libevdev.so:devel/libevdev \
 		libexpat.so:textproc/expat2 \
 		libffi.so:devel/libffi \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libgmp.so:math/gmp \
 		libgnutls.so:security/gnutls \
 		libgraphite2.so:graphics/graphite2 \
 		libgudev-1.0.so:devel/libgudev \
 		libharfbuzz.so:print/harfbuzz \
 		libicui18n.so:devel/icu \
 		libidn2.so:dns/libidn2 \
 		libinput.so:x11/libinput \
 		libintl.so:devel/gettext-runtime \
 		libjpeg.so:graphics/jpeg-turbo \
 		libmtdev.so:devel/libmtdev \
 		libnettle.so:security/nettle \
 		libp11-kit.so:security/p11-kit \
 		libpcre.so:devel/pcre \
 		libpcre2-16.so:devel/pcre2 \
 		libpng16.so:graphics/png \
 		libtasn1.so:security/libtasn1 \
 		libudev.so:devel/libudev-devd \
 		libunistring.so:devel/libunistring \
 		libvulkan.so:graphics/vulkan-loader \
 		libwacom.so:x11/libwacom \
 		libwayland-client.so:graphics/wayland \
 		libxcb-cursor.so:x11/xcb-util-cursor \
 		libxcb-ewmh.so:x11/xcb-util-wm \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-render-util.so:x11/xcb-util-renderutil \
 		libxcb-util.so:x11/xcb-util \
 		libxkbcommon.so:x11/libxkbcommon \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang gl gnome jpeg perl5 pkgconfig python \
 		qt-dist:6 shebangfix xorg
 USE_GL=		egl gl
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 pango
 USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 		xext xfixes xi xinerama xrandr xrender
 CMAKE_ON=	QT_AVOID_CMAKE_ARCHIVING_API \
 		QT_FIND_ALL_PACKAGES_ALWAYS
 CMAKE_OFF=	QT_FEATURE_eglfs \
 		QT_FEATURE_gssapi
 SHEBANG_FILES=	${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \
 		${WRKSRC}/mkspecs/features/uikit/devices.py \
 		${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \
 		${WRKSRC}/util/android/android_emulator_launcher.sh \
 		${WRKSRC}/util/testrunner/qt-testrunner.py
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 # zstd from base fails to compress files during the build (error 11: unsupported argument)
 BINARY_ALIAS=	zstd=${LOCALBASE}/bin/zstd
 
 OPTIONS_DEFINE=		CUPS
 OPTIONS_GROUP=		SQL
 OPTIONS_GROUP_SQL=	IBASE MYSQL ODBC PSQL SQLITE
 OPTIONS_DEFAULT=	CUPS SQLITE
 OPTIONS_SUB=		yes
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_OFF=		-DFEATURE_cups=OFF
 
 IBASE_DESC=		InterBase database support
 IBASE_CMAKE_ON=		-DFEATURE_sql_ibase=ON
 IBASE_CMAKE_OFF=	-DFEATURE_sql_ibase=OFF
 IBASE_USES=		firebird:4.0
 IBASE_BROKEN=		IBASE: fatal error: 'gen/iberror.h' file not found
 
 MYSQL_DESC=		MySQL database support
 MYSQL_CMAKE_ON=		-DFEATURE_sql_mysql=ON
 MYSQL_CMAKE_OFF=	-DFEATURE_sql_mysql=OFF
 MYSQL_USES=		mysql
 
 ODBC_DESC=		ODBC database support
 ODBC_CMAKE_ON=		-DFEATURE_sql_odbc=ON
 ODBC_CMAKE_OFF=		-DFEATURE_sql_odbc=OFF
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 PSQL_DESC=		PostgreSQL database support
 PSQL_CMAKE_ON=		-DFEATURE_sql_psql=ON
 PSQL_CMAKE_OFF=		-DFEATURE_sql_psql=OFF
 PSQL_USES=		pgsql
 
 SQLITE_DESC=		Sqlite database support
 SQLITE_CMAKE_ON=	-DFEATURE_sql_sqlite=ON \
 			-DQT_FEATURE_system_sqlite=ON
 SQLITE_CMAKE_OFF=	-DFEATURE_sql_sqlite=OFF
 SQLITE_USES=		sqlite:3
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "armv6" || ${ARCH} == "armv7"
 BUILD_DEPENDS+=	as:devel/binutils
 CMAKE_ARGS+=	-DCMAKE_ASM_FLAGS=-no-integrated-as
 .endif
 
 # TODO: do this cleaner -- somewhere cmake/qmake still creates empty directories
 # for the cmake files in INSTALL_PREFIX/lib/cmake
 post-install:
 	${RM} -vr ${STAGEDIR}${PREFIX}/${QT_LIBDIR_REL}/cmake
 	# Install symlinks for user-facing tools
 	${REINPLACE_CMD} -e "s#^#${STAGEDIR}#" -e "s# # ${STAGEDIR}#" \
 		${WRKDIR}/.build/user_facing_tool_links.txt
 	while read t; do \
 		${RLN} $$t; \
 	done <${WRKDIR}/.build/user_facing_tool_links.txt
 
 .include <bsd.port.post.mk>
diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo
index 7ec303605788..32ffe38b4e78 100644
--- a/devel/qt6-base/distinfo
+++ b/devel/qt6-base/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1672934696
+TIMESTAMP = 1680729396
 SHA256 (KDE/Qt/6.4.2/qtbase-everywhere-src-6.4.2.tar.xz) = a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d
 SIZE (KDE/Qt/6.4.2/qtbase-everywhere-src-6.4.2.tar.xz) = 47987188
+SHA256 (KDE/Qt/6.4.2/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 61e345f12c6283792e230d3572756e6093d1be0c80d1f3dc0745e19532e28ebc
+SIZE (KDE/Qt/6.4.2/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 1326