gentoo auto-resync : 07:08:2024 - 12:37:20

7 files changed, 169 insertions, 344 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 22b152b55837..eb5d3ba7ae22 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,8 +1,8 @@
 AUX digikam-8.3.0-cmake-addressbook.patch 1245 BLAKE2B 22365de2072c5ce5e2eac3bc1d7138e820166b977e5894f29addcdb00ae3329c47965b2b7930a4725b01789add63b4416083e6e358ca6ffb4a0d60f3e80ad52c SHA512 a872aed53811642407c98e20f423cf5381a117e96d4e95d309da6f116a13aa2584671ef20af3e1059c3ed7e09fec178fdb77e7afecde21077252bb2c8f116158
-AUX digikam-8.3.0-cmake.patch 6775 BLAKE2B 1c93e204bd3b5f3d73ecf812ee851e0a3a9bb3e414e41afbc0a072bf05e6b615a147e545f6a16e8e218e1f910e9f1667e012bc35e06eab7d192f4c8c8d814746 SHA512 42707d0bff593114de412697a037cfaccfbfc568ba3a90b3b68a3cbdba32d79e5e61d2e8cd6f185c2543cac4c6de66f36e5f549908781243064b17aececba72b
 AUX digikam-8.4.0-cmake.patch 7429 BLAKE2B 20d79867086e390c2a571bae76f2023e4ec5f26bdc137f28be6ec8eff54ba2c5e84ec15191ceed83eb8e9415a522165f5931cf6d972e1537806cbb6d7e22bbf0 SHA512 fd38773ce49a31d3fcd0d477c5e180b42d1a2ea586b41534b7dd3d08653fea4020af30bce3b20ba14c4a2710cde3fecbd13fbe8fcfd33bdca6b82989cf431214
-DIST digiKam-8.3.0-1.tar.xz 55664168 BLAKE2B 46b0f26bb781d370c1046fd6de6afb0a0878175f9722a2fc9ed23aad89eb0671f8b219bb7c169ccd22d440ce493d958304a5a527a733862fe4e2c5cd07da8a21 SHA512 c2fdcecafa68641f08b31286d1b9c44828164a0a0bea607fb64a71c73ff53417cdfefa110245adab164fae8ea0980ea86cd69d693dcd43a96bb188197dc78fcd
+AUX digikam-8.4.0-fix-find_libheif-regex.patch 856 BLAKE2B 5b2f2bea0c4a7cae5aed2d385123082576c95fd7ea66521c7245db844af0bb86422279674a3f46ba56075547ff161d1bfbf30c37fb57efcfd15e10b55c255b36 SHA512 bedcc963511afd0037ab1dbfa05b06e72c0b6785b222a33f15dbe84535e62820d9b1e437a3cb11a3fffe5c6e4f474609e63dcc515482a14b09e98a5fa5dd34f6
 DIST digiKam-8.4.0.tar.xz 58025616 BLAKE2B 33441e023cd9d6edba2e7c01e482a6eea7a6b1972b6bad0fc804fb3e94f97cc62e2663690137b2445fb7043789b7e942d830b71209385de77ccffe57d22d09ff SHA512 4342d18a7c04ab239821de3cf908f8e7d676598778f0174164aa336e8cfdc0a76327d31c64e6c4e47dcf0d6fbef46b01918312e4622ce3359888a9a94948a22b
-EBUILD digikam-8.3.0.ebuild 4193 BLAKE2B bdaf2e8e960067f18bc85513a2ed3ca17f235d86de490b8f53cc969ea25f115804a0f659dc19d6756ea1085692e917e1caf26d1e8e569295be4cb2941949d2ea SHA512 7dac2a6e459ca160c1b7cad2955b725123714cf7cc1f5a9a88666c378d7b8c5fd083e8712262de5c20ac599677b425d4ffa4810a7c5abe891eb52f51917f25d6
-EBUILD digikam-8.4.0.ebuild 4256 BLAKE2B f4c6dec1386dc07267182c1068558b9a3ff4784adea63e1a53b906e0a097b0c45b05bd0425eaad1e1585e39def92610eab6efbad4659f618f48dff254dfded1c SHA512 33f69e5c75f814cf70fd16321635abc1e6ebe5fb8492dab17cdc42beee4e29241c3e4a64777d9cd168a20baa58d5fafd6c772c326940d9711bdb5b680e0c5c5a
-MISC metadata.xml 922 BLAKE2B 230932621f619b704122e3c1e4dbfe090bfad7f7722e41fb8d0b7bd6dd124d7d72139852ed016e34e099877c995cfdb0fb460194535824d2f0c13426dd65296c SHA512 457f3ec2b0479f8f686e3bf0b9f771f8bee205bd661a86226238ae9a3b557c52ec462663d45617872a83ce3717e74bcdbe74d5c2f9e4ab391bcb76a72082aec4
+DIST digikam-8.4.0-patchset.tar.xz 11904 BLAKE2B 6ab167cae66710505eb81bb538fde2a81458b6580bf8c70d0c28500ca81a3c9c9b9e0a12ca288a4dc6f39ae1a175f7b2bd09e4d94624337348084c228eafcc38 SHA512 df1199d3aaecc0afc032090424af69c031e95afba1fed70b00cf61c5ef52fa2a7c3d97918592c167f9ea918dd2823e4cc52f12a470a9eede815b3ff43314001b
+EBUILD digikam-8.4.0-r10.ebuild 4071 BLAKE2B 77e16f53d4dcdba4b1a5833b727b7b7a86ba9b8939cfea133c56a2d853371e8450ad27ad5d1988df7f89e81fabba1a63931fd9a10e812bbf50c48e02c1d82a03 SHA512 8fbfa68a6977a27a464bbd86f19ca3987f34693ade77b4e184cd8d76ecc14c1f5ec88cb80103418a157e6d890fc50f38dff8c8fd9a6d2f810dfaf255b9a68618
+EBUILD digikam-8.4.0.ebuild 4317 BLAKE2B 451131ac82a5507fb0f563c2795176bf74d8481ee73b7b1686ef7bf00c092d8002e99af431fb4d5c5547fdc54d2d43c38c05f23ede974e614e92c288fa848c0f SHA512 38d03dbd4b924c2e92d593a79a9be6fe45b03057f51a2448265723f59a2bbd249bd1ded30da0e41d768af3f10632ce43b890489528390935d289cc6c64c7ccf8
+MISC metadata.xml 981 BLAKE2B 1c1494b9c7fd7207550ea214baafcab17aa12ecb93f08885dd7c873a15114d826341027b8a37e36138cf89d1ba1451c8fff247d9fde18c235bee062f3cda1ab9 SHA512 7f4602eafde8e22b18b7abc1a071eb27369d2ab7df01554253f142614577209828698b39614666fd6d4688ff44b3c1dc3d4820ec3398a6f8228710343ef65f85
diff --git a/media-gfx/digikam/digikam-8.3.0.ebuild b/media-gfx/digikam/digikam-8.3.0.ebuild
deleted file mode 100644
index fd35ed4e3572..000000000000
--- a/media-gfx/digikam/digikam-8.3.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	TARNAME="digiKam-${PV/_/-}-1"
-	if [[ ${PV} =~ beta[0-9]$ ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
-	fi
-	KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick +lensfun mysql opengl openmp +panorama scanner semantic-desktop spell"
-
-# bug 366505
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-gfx/exiv2-0.27.1:=[xmp]
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/liblqr
-	media-libs/libpng:=
-	>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
-	media-libs/tiff:=
-	x11-libs/libX11
-	addressbook? (
-		>=kde-apps/akonadi-contacts-23.08.3:5
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-	)
-	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	heif? (
-		media-libs/libheif:=
-		media-libs/x265:=
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	lensfun? ( media-libs/lensfun )
-	opengl? (
-		>=dev-qt/qtopengl-${QTMIN}:5
-		virtual/opengl
-	)
-	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-	scanner? ( >=kde-apps/libksane-23.08.3:5 )
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
-	spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	addressbook? ( >=kde-apps/akonadi-23.08.3:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/exiftool
-	mysql? ( virtual/mysql[server(+)] )
-	panorama? ( media-gfx/hugin )
-"
-BDEPEND="
-	sys-devel/gettext
-	panorama? (
-		app-alternatives/lex
-		app-alternatives/yacc
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-cmake-addressbook.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=OFF # KF6 not stable upstream yet
-		-DBUILD_TESTING=OFF # bug 698192
-		-DENABLE_APPSTYLES=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		-DENABLE_MEDIAPLAYER=OFF # bug 758641; bundled as of 8.0, KDE-bug 448681
-		-DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
-		-DENABLE_QWEBENGINE=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake_use_find_package calendar KF5CalendarCore)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake_use_find_package gphoto2 Gphoto2)
-		$(cmake_use_find_package heif Libheif)
-		$(cmake_use_find_package imagemagick ImageMagick)
-		$(cmake_use_find_package lensfun LensFun)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake_use_find_package opengl OpenGL)
-		$(cmake_use_find_package panorama KF5ThreadWeaver)
-		$(cmake_use_find_package scanner KF5Sane)
-		$(cmake_use_find_package spell KF5Sonnet)
-		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/digikam/digikam-8.4.0-r10.ebuild b/media-gfx/digikam/digikam-8.4.0-r10.ebuild
new file mode 100644
index 000000000000..bdae19de0bda
--- /dev/null
+++ b/media-gfx/digikam/digikam-8.4.0-r10.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql opengl openmp +panorama scanner semantic-desktop spell video"
+
+# bug 366505
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,-gles2-only,gui,mysql?,network,sql,widgets,xml]
+	>=dev-qt/qtnetworkauth-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=media-gfx/exiv2-0.27.1:=[xmp]
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/liblqr
+	media-libs/libpng:=
+	>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
+	media-libs/tiff:=
+	x11-libs/libX11
+	addressbook? (
+		>=kde-apps/akonadi-contacts-24.05.2:6
+		>=kde-frameworks/kcontacts-${KFMIN}:6
+	)
+	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:6 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	heif? (
+		media-libs/libheif:=
+		media-libs/x265:=
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	jpegxl? ( media-libs/libjxl:= )
+	lensfun? ( media-libs/lensfun )
+	opengl? (
+		>=dev-qt/qtbase-${QTMIN}:6[opengl]
+		virtual/opengl
+	)
+	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
+	scanner? ( >=kde-apps/libksane-24.05.2:6 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 )
+	spell? ( >=kde-frameworks/sonnet-${KFMIN}:6 )
+	video? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	addressbook? ( >=kde-apps/akonadi-24.05.2:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	media-libs/exiftool
+	mysql? ( virtual/mysql[server(+)] )
+	panorama? ( media-gfx/hugin )
+"
+BDEPEND="
+	sys-devel/gettext
+	panorama? (
+		app-alternatives/lex
+		app-alternatives/yacc
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.4.0-cmake.patch"
+	"${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch"
+	# bug 936507; KDE-bugs 488662, 490611, 491007, 490484, 490821,
+	# 490859, 490828, 490690, 490552, 490385, 489751, 490128
+	"${WORKDIR}/${P}-patchset"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=ON
+		-DBUILD_TESTING=OFF # bug 698192
+		-DENABLE_APPSTYLES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		-DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake_use_find_package calendar KF6CalendarCore)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package heif Libheif)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package jpegxl Libjxl)
+		$(cmake_use_find_package lensfun LensFun)
+		-DENABLE_MYSQLSUPPORT=$(usex mysql)
+		-DENABLE_INTERNALMYSQL=$(usex mysql)
+		$(cmake_use_find_package opengl OpenGL)
+		$(cmake_use_find_package panorama KF6ThreadWeaver)
+		$(cmake_use_find_package scanner KSaneWidgets6)
+		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
+		$(cmake_use_find_package spell KF6Sonnet)
+		-DENABLE_MEDIAPLAYER=$(usex video)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/digikam/digikam-8.4.0.ebuild b/media-gfx/digikam/digikam-8.4.0.ebuild
index a118da4e0919..b3d5ace50bc3 100644
--- a/media-gfx/digikam/digikam-8.4.0.ebuild
+++ b/media-gfx/digikam/digikam-8.4.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	else
 		SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Digital photo management application"
@@ -105,6 +105,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${P}-cmake.patch"
 	"${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch"
+	"${FILESDIR}/${P}-fix-find_libheif-regex.patch" # bug 936507
 )
 
 pkg_pretend() {
diff --git a/media-gfx/digikam/files/digikam-8.3.0-cmake.patch b/media-gfx/digikam/files/digikam-8.3.0-cmake.patch
deleted file mode 100644
index 03438e3f2245..000000000000
--- a/media-gfx/digikam/files/digikam-8.3.0-cmake.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From c6ae81abf56851c818285d555e192c660635247b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 17 Feb 2019 23:51:03 +0100
-Subject: [PATCH] Un-break optional Qt/KF detection
-
-And if we enable an option, make the necessary libraries REQUIRED.
----
- core/cmake/rules/RulesKDEFramework.cmake | 43 +++--------------
- core/cmake/rules/RulesQtFramework.cmake  | 61 +++++-------------------
- core/cmake/rules/RulesX11.cmake          |  7 +--
- 3 files changed, 20 insertions(+), 91 deletions(-)
-
-diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake
-index e34e5f4a8d..3cde25928f 100644
---- a/core/cmake/rules/RulesKDEFramework.cmake
-+++ b/core/cmake/rules/RulesKDEFramework.cmake
-@@ -26,26 +26,15 @@ find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
- )
- 
- if(ENABLE_KFILEMETADATASUPPORT)
--
--    find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
--                                        OPTIONAL_COMPONENTS
--                                        FileMetaData            # For Plasma desktop file indexer support.
--    )
--
-+    # For Plasma desktop file indexer support.
-+    find_package(KF${QT_VERSION_MAJOR}FileMetaData ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED)
- endif()
- 
- 
- if(ENABLE_AKONADICONTACTSUPPORT)
--
--    find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
--                                            OPTIONAL_COMPONENTS
--                                            Akonadi
--                                            AkonadiContact      # For KDE Mail Contacts support.
--                                            Contacts            # API for contacts/address book data.
--    )
--    find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
--    find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET)
--
-+    find_package(KF${QT_VERSION_MAJOR}Contacts ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED) # API for contacts/address book data.
-+    find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
-+    find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
- endif()
- 
- if(Qt6_FOUND)
-@@ -54,17 +43,11 @@ if(Qt6_FOUND)
- 
- else()
- 
--    find_package(KF${QT_VERSION_MAJOR} ${KSANE_MIN_VERSION} QUIET
--                                       OPTIONAL_COMPONENTS
--                                       Sane                      # For digital scanner support.
--    )
-+    find_package(KF${QT_VERSION_MAJOR}Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support.
- 
- endif()
- 
--find_package(KF${QT_VERSION_MAJOR} ${CALENDAR_MIN_VERSION} QUIET
--                                         OPTIONAL_COMPONENTS
--                                         CalendarCore           # For Calendar tool.
--)
-+find_package(KF${QT_VERSION_MAJOR}CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool.
- 
- if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
- 
-@@ -72,18 +55,6 @@ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
- 
- endif()
- 
--if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND OR NOT KPim${QT_VERSION_MAJOR}Contacts_FOUND))
--
--    set(ENABLE_AKONADICONTACTSUPPORT OFF)
--
--endif()
--
--if(ENABLE_KFILEMETADATASUPPORT AND NOT KF${QT_VERSION_MAJOR}FileMetaData_FOUND)
--
--    set(ENABLE_KFILEMETADATASUPPORT OFF)
--
--endif()
--
- # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one.
- 
- if(ENABLE_KIO)
-diff --git a/core/cmake/rules/RulesQtFramework.cmake b/core/cmake/rules/RulesQtFramework.cmake
-index 6f233ccfbc..7e29a09a40 100644
---- a/core/cmake/rules/RulesQtFramework.cmake
-+++ b/core/cmake/rules/RulesQtFramework.cmake
-@@ -19,49 +19,20 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED
- )
- 
- if(ENABLE_QWEBENGINE)
--
--    find_package(Qt${QT_VERSION_MAJOR} REQUIRED
--                                       NO_MODULE
--                                       COMPONENTS
--                                       WebEngineWidgets
--    )
--
-+    find_package(Qt${QT_VERSION_MAJOR}WebEngineWidgets REQUIRED NO_MODULE)
- else()
--
--    find_package(Qt${QT_VERSION_MAJOR} REQUIRED
--                                       NO_MODULE
--                                       COMPONENTS
--                                       WebKitWidgets
--    )
--
-+    find_package(Qt${QT_VERSION_MAJOR}WebKitWidgets REQUIRED NO_MODULE)
- endif()
- 
--find_package(Qt${QT_VERSION_MAJOR}
--             OPTIONAL_COMPONENTS
--             DBus
--             OpenGL
--)
-+find_package(Qt${QT_VERSION_MAJOR}DBus)
-+find_package(Qt${QT_VERSION_MAJOR}OpenGL)
- 
- if(Qt6_FOUND)
--
--    find_package(Qt${QT_VERSION_MAJOR} REQUIRED
--                 NO_MODULE COMPONENTS
--                 StateMachine
--                 SvgWidgets
--    )
--
--    find_package(Qt${QT_VERSION_MAJOR}
--                 OPTIONAL_COMPONENTS
--                 OpenGLWidgets
--    )
--
-+    find_package(Qt${QT_VERSION_MAJOR}StateMachine REQUIRED NO_MODULE)
-+    find_package(Qt${QT_VERSION_MAJOR}SvgWidgets REQUIRED NO_MODULE)
-+    find_package(Qt${QT_VERSION_MAJOR}OpenGLWidgets)
- else()
--
--    find_package(Qt${QT_VERSION_MAJOR}
--                 OPTIONAL_COMPONENTS
--                 XmlPatterns                # For Rajce plugin
--    )
--
-+    find_package(Qt${QT_VERSION_MAJOR}XmlPatterns) # For Rajce plugin
- endif()
- 
- if(ENABLE_DBUS)
-@@ -77,17 +48,9 @@ endif()
- # Qt Dependencies For unit tests and CLI test tools
- 
- if(BUILD_TESTING)
-+    find_package(Qt${QT_VERSION_MAJOR}Test REQUIRED NO_MODULE)
- 
--    find_package(Qt${QT_VERSION_MAJOR} REQUIRED
--                                       NO_MODULE
--                                       COMPONENTS
--                                       Test
--    )
--
--    find_package(Qt${QT_VERSION_MAJOR}
--                 QUIET
--                 OPTIONAL_COMPONENTS
--                 Qml WebView  # Optional, for 'sialis' O2 library test tool.
--    )
--
-+    # Optional, for 'sialis' O2 library test tool.
-+    find_package(Qt${QT_VERSION_MAJOR}Qml QUIET NO_MODULE)
-+    find_package(Qt${QT_VERSION_MAJOR}WebView QUIET NO_MODULE)
- endif()
-diff --git a/core/cmake/rules/RulesX11.cmake b/core/cmake/rules/RulesX11.cmake
-index d7830f3923..4401a57c87 100644
---- a/core/cmake/rules/RulesX11.cmake
-+++ b/core/cmake/rules/RulesX11.cmake
-@@ -11,12 +11,7 @@ find_package(X11)
- if(X11_FOUND)
- 
-     if(NOT Qt6_FOUND)
--
--        find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE
--                                           COMPONENTS
--                                           X11Extras
--        )
--
-+        find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
-     endif()
- 
-     set(HAVE_X11 TRUE)
--- 
-2.44.0
-
diff --git a/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch b/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch
new file mode 100644
index 000000000000..cd18ea3ed475
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch
@@ -0,0 +1,25 @@
+From a3ff8ad14c1373f7a7d3c1c9aee4e80954e1859e Mon Sep 17 00:00:00 2001
+From: Maik Qualmann <metzpinguin@gmail.com>
+Date: Tue, 23 Jul 2024 12:33:13 +0200
+Subject: [PATCH] escape the input from REGEX MATCHALL CCBUGS: 490690
+
+---
+ core/cmake/modules/FindLibheif.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/cmake/modules/FindLibheif.cmake b/core/cmake/modules/FindLibheif.cmake
+index fdaf73a4b9e..38876ecc38a 100644
+--- a/core/cmake/modules/FindLibheif.cmake
++++ b/core/cmake/modules/FindLibheif.cmake
+@@ -54,7 +54,7 @@ else()
+     if(HEIF_INCLUDES_DIR)
+ 
+         file(STRINGS "${HEIF_INCLUDES_DIR}/libheif/heif_version.h" TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$")
+-        string(REGEX MATCHALL "[0-9.]+" HEIF_VERSION ${TMP})
++        string(REGEX MATCHALL "[0-9.]+" HEIF_VERSION "${TMP}")
+ 
+     endif()
+ 
+-- 
+GitLab
+
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 0a9720425415..9cc51d33573b 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -18,5 +18,6 @@
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
 		<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
 		<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
+		<flag name="video">Enable integrated video player</flag>
 	</use>
 </pkgmetadata>