diff --git a/srcpkgs/digikam/patches/qstring.patch b/srcpkgs/digikam/patches/qstring.patch
new file mode 100644
index 00000000000..673276a2716
--- /dev/null
+++ b/srcpkgs/digikam/patches/qstring.patch
@@ -0,0 +1,21 @@
+--- a/core/dplugins/generic/tools/htmlgallery/generator/gallerytheme.cpp
++++ b/core/dplugins/generic/tools/htmlgallery/generator/gallerytheme.cpp
+@@ -13,6 +13,9 @@
+  *
+  * ============================================================ */
+ 
++#ifdef QT_NO_CAST_FROM_ASCII
++#undef QT_NO_CAST_FROM_ASCII
++#endif
+ #include "gallerytheme.h"
+ 
+ // Qt includes
+--- a/core/libs/dplugins/webservices/o2/src/o0baseauth.cpp
++++ b/core/libs/dplugins/webservices/o2/src/o0baseauth.cpp
+@@ -1,3 +1,6 @@
++#ifdef QT_NO_CAST_FROM_ASCII
++#undef QT_NO_CAST_FROM_ASCII
++#endif
+ #include <QDataStream>
+ #include <QDebug>
+ #include <QUrlQuery>
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index bba02440494..bb394c8fccf 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,21 +1,24 @@
 # Template file for 'digikam'
 pkgname=digikam
 version=8.2.0
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules gettext pkg-config bison flex qt5-qmake
- qt5-host-tools kcoreaddons"
-makedepends="qt5-devel libjpeg-turbo-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-xmlpatterns-devel
- qt5-webkit-devel qt5-webview-devel qt5-declarative-devel kxmlgui-devel
- kcoreaddons-devel kconfig-devel kservice-devel kwindowsystem-devel
- ksolid-devel ki18n-devel kio-devel kiconthemes-devel kfilemetadata5-devel
- knotifyconfig-devel knotifications-devel threadweaver-devel
- akonadi-contacts-devel libksane-devel kcalendarcore-devel tiff-devel
- lcms2-devel qtav libopencv-devel liblqr-devel marble5-devel libgphoto2-devel
- lensfun-devel eigen jasper-devel MesaLib-devel glu-devel qt5-webchannel-devel
- kconfigwidgets-devel kwidgetsaddons-devel libheif-devel qt5-networkauth-devel"
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
+ -DKDE_INSTALL_QMLDIR=lib/qt6/qml
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs/modules"
+hostmakedepends="extra-cmake-modules gettext pkg-config bison flex qt6-base
+ kf6-kcoreaddons kf6-kconfig"
+makedepends="qt6-base-devel libjpeg-turbo-devel qt6-plugin-mysql qt6-plugin-odbc
+ qt6-plugin-pgsql qt6-plugin-sqlite qt6-scxml-devel
+ qt6-declarative-devel kf6-kxmlgui-devel kf6-kfilemetadata-devel
+ kf6-kcoreaddons-devel kf6-kconfig-devel kf6-kservice-devel kf6-kwindowsystem-devel
+ kf6-solid-devel kf6-ki18n-devel kf6-kio-devel kf6-kiconthemes-devel
+ kf6-knotifyconfig-devel kf6-knotifications-devel kf6-threadweaver-devel
+ akonadi-contacts-devel libksane6-devel kf6-kcalendarcore-devel tiff-devel
+ lcms2-devel qtav libopencv-devel liblqr-devel libgphoto2-devel qt6-webengine-devel
+ lensfun-devel eigen jasper-devel MesaLib-devel glu-devel qt6-webchannel-devel
+ kf6-kconfigwidgets-devel kf6-kwidgetsaddons-devel libheif-devel qt6-networkauth-devel"
 short_desc="Advanced digital photo management application"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -23,25 +26,16 @@ homepage="https://www.digikam.org"
 distfiles="${KDE_SITE}/digikam/${version}/digiKam-${version}.tar.xz"
 checksum=2f7fcb559b123ed9ecae5a5aef6f4560eee5f49206d9d1746dec9ab6c8fb38bf
 
+# TODO add marble back when it's ported to Qt6
+
 CXXFLAGS="-Wl,-lpthread"
 
-build_options="webengine"
-desc_option_webengine="Build with Qt5 WebEngine"
-
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
-		build_options_default="webengine"
-	fi
+if [ "$XBPS_TARGET_ENDIAN" != "le" ] ||
+	[ $XBPS_WORDSIZE != 64 ] ||
+	[ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="require webengine"
 fi
 
 if [ -n "$CROSS_BUILD" ]; then
 	configure_args+=" -DSSE4_1_FOUND=OFF -DSSE2_FOUND=OFF"
 fi
-
-
-if [ "$build_option_webengine" ]; then
-	makedepends+=" qt5-webengine-devel"
-else
-	makedepends+=" qt5-webkit-devel"
-	configure_args+=" -DENABLE_QWEBENGINE=OFF"
-fi