[rpms/digikam] epel9-next: Merge commit '64d6a4ac653b3b9c846bbdae159082e609edb242' into epel9-next

[rpms/digikam] epel9-next: Merge commit '64d6a4ac653b3b9c846bbdae159082e609edb242' into epel9-next

[Troy Dawson]

A new commit has been pushed.

Repo   : rpms/digikam
Branch : epel9-next
Commit : a8c63b2584d1d5c6a0de9b0e80c9504dbec46b51
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-07-20T12:26:49-07:00
Stats  : +51/-24 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/digikam/c/a8c63b2584d1d5c6a0de9b0e80c9504dbec46b51?branch=epel9-next

Log:
Merge commit '64d6a4ac653b3b9c846bbdae159082e609edb242' into epel9-next

---
diff --git a/.gitignore b/.gitignore
index 58fb7a1..c7f2f92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
 /digiKam-8.1.0.tar.xz
 /digiKam-8.2.0.tar.xz
 /digiKam-8.3.0.tar.xz
+/digiKam-8.4.0.tar.xz
+/digiKam-8.5.0.tar.xz

diff --git a/digikam.spec b/digikam.spec
index b6550d7..d491aa7 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,9 +1,9 @@
 %bcond_with build_with_qt6
-%if 0%{?fedora} > 39
-%ifarch %{?qt6_qtwebengine_arches}
+%if 0%{?fedora} > 39 || 0%{?rhel} > 9
 %bcond_without build_with_qt6
-%global qwebengine 1
-%endif
+ExclusiveArch: %{qt6_qtwebengine_arches}
+%else
+ExclusiveArch: %{qt5_qtwebengine_arches}
 %endif
 
 # use ninja or not
@@ -13,8 +13,8 @@
 
 Name:    digikam
 Summary: A digital camera accessing & photo management application
-Version: 8.3.0
-Release: 2%{?beta}%{?dist}
+Version: 8.5.0
+Release: 4%{?beta}%{?dist}
 
 License: GPL-2.0-or-later
 URL:     http://www.digikam.org/
@@ -58,6 +58,7 @@ BuildRequires: pkgconfig(exiv2) >= 0.26
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(jasper)
 BuildRequires: pkgconfig(lcms2)
+BuildRequires: pkgconfig(libjxl)
 BuildRequires: pkgconfig(libgphoto2_port) pkgconfig(libusb-1.0) pkgconfig(libusb)
 BuildRequires: pkgconfig(libpng) >= 1.2.7
 BuildRequires: pkgconfig(glu)
@@ -69,8 +70,8 @@ BuildRequires: pkgconfig(Qt6Svg)
 BuildRequires: pkgconfig(Qt6Multimedia)
 BuildRequires: pkgconfig(Qt6StateMachine)
 BuildRequires: pkgconfig(Qt6WebEngineWidgets)
-BuildRequires: libksane-qt6-devel
-BuildRequires: ksanecore-qt6-devel
+BuildRequires: libksane-devel
+BuildRequires: ksanecore-devel
 BuildRequires: kf6-kcalendarcore-devel
 BuildRequires: kf6-kconfig-devel
 BuildRequires: kf6-kdoctools-devel
@@ -100,14 +101,8 @@ BuildRequires: pkgconfig(Qt5Svg)
 BuildRequires: pkgconfig(Qt5Multimedia)
 BuildRequires: pkgconfig(Qt5XmlPatterns)
 BuildRequires: pkgconfig(Qt5X11Extras)
-%if 0%{?qt5_qtwebengine_arches:1}
-%ifarch %{?qt5_qtwebengine_arches}
-%global qwebengine 1
 BuildRequires: pkgconfig(Qt5WebEngine)
-%else
-BuildRequires: pkgconfig(Qt5WebKit)
-%endif
-%endif
+BuildRequires: cmake(KSaneCore)
 BuildRequires: kf5-libksane-devel >= 16.03
 BuildRequires: kf5-kcalendarcore-devel
 BuildRequires: kf5-kconfig-devel
@@ -145,7 +140,6 @@ BuildRequires: pkgconfig(opencv) >= 3.3
 BuildRequires: flex
 BuildRequires: bison
 %if 0%{?fedora} || 0%{?rhel} > 8
-BuildRequires: cmake(KSaneCore)
 BuildRequires: pkgconfig(libheif)
 BuildRequires: pkgconfig(lqr-1)
 # MediaPlayer dependencies
@@ -177,7 +171,7 @@ Recommends: qt5-qtimageformats%{?_isa}
 %endif
 
 # core/libs/rawengine/libraw/
-Provides: bundled(LibRaw) = 0.21.1
+Provides: bundled(LibRaw) = 0.22.0
 
 # no more DocBook documentation
 # Sphinx documentation is published in a dedicated web site
@@ -211,8 +205,6 @@ needed to develop applications using %{name}.
 
 %prep
 %autosetup -n %{name}-%{version}%{?beta:-%{beta}} -p1
-# fix wrong version 8.4.0 in 8.3.0 tarball
-sed -i 's|DIGIKAM_MINOR_VERSION "4"|DIGIKAM_MINOR_VERSION "3"|g' CMakeLists.txt
 
 %build
 %if %{with build_with_qt6}
@@ -228,8 +220,7 @@ sed -i 's|DIGIKAM_MINOR_VERSION "4"|DIGIKAM_MINOR_VERSION "3"|g' CMakeLists.txt
   -DENABLE_MEDIAPLAYER:BOOL=OFF \
 %endif
   -DENABLE_MYSQLSUPPORT:BOOL=ON \
-  -DENABLE_INTERNALMYSQL:BOOL=ON \
-  -DENABLE_QWEBENGINE:BOOL=%{?qwebengine:ON}%{!?qwebengine:OFF}
+  -DENABLE_INTERNALMYSQL:BOOL=ON
 
 %cmake_build
 
@@ -346,8 +337,39 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
-* Fri Jul 17 2026 Troy Dawson <tdawson@redhat.com> - 8.3.0-2
-- Rebuild for ImageMagick update
+* Tue Feb 04 2025 Sérgio Basto <sergio@serjux.com> - 8.5.0-4
+- Rebuild for opencv-4.11.0
+
+* Sun Feb 02 2025 Sérgio Basto <sergio@serjux.com> - 8.5.0-3
+- Rebuild for jpegxl (libjxl) 0.11.1
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Nov 16 2024 Alexey Kurov <nucleo@fedoraproject.org> - 8.5.0-1
+- digiKam-8.5.0
+
+* Mon Oct 14 2024 Jan Grulich <jgrulich@redhat.com> - 8.4.0-5
+- Rebuild (qt6)
+
+* Mon Sep 23 2024 Fabio Valentini <decathorpe@gmail.com> - 8.4.0-4
+- Rebuild for ffmpeg 7
+
+* Thu Jul 25 2024 Sérgio Basto <sergio@serjux.com> - 8.4.0-3
+- Rebuild for opencv 4.10.0
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jul 13 2024 Alexey Kurov <nucleo@fedoraproject.org> - 8.4.0-1
+- digiKam-8.4.0
+- build only on QtWebEngine arches
+
+* Tue Jun 18 2024 Robert-André Mauchin <zebob.m@gmail.com> - 8.3.0-3
+- Rebuilt for exiv2 0.28.2
+
+* Sat Apr  6 2024 Alexey Kurov <nucleo@fedoraproject.org> - 8.3.0-2
+- Rebuild for qt6 6.7.0
 
 * Fri Mar 15 2024 Alexey Kurov <nucleo@fedoraproject.org> - 8.3.0-1
 - digiKam-8.3.0

diff --git a/sources b/sources
index ab4a6e4..2ab4a81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digiKam-8.3.0.tar.xz) = c42c51bacf6e56808a9de97cfdbdb368cecc953e9e738c361eca27465c48b0ac2dfcc25bc7a9af5341d91f104803b8d52e2ef4fe5b39025b92b114146689d7b0
+SHA512 (digiKam-8.5.0.tar.xz) = 5610f0173043e29a2b5ff62b2ed2c2bea79e10cd20a0c2416ebb425457cee55aa8b8d575ba57e8e188a899cc909516ea05e6c80e73e3316742cc9e8119855509

diff --git a/digikam.spec b/digikam.spec
index 1e4fee5..d491aa7 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -27,6 +27,9 @@ Source0: http://download.kde.org/stable/digikam/%{version}/digiKam-%{version}.ta
 # rawhide s390x is borked recently
 #ExcludeArch: s390x
 
+# epel9 ppc64le is borked
+ExcludeArch: ppc64le
+
 # digiKam not listed as a media handler for pictures in Nautilus (#516447)
 # TODO: upstream me
 Source10: digikam-import.desktop