public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/digikam] epel9-next: Fix build against Qt 6.8
@ 2026-07-20 19:27 Jan Grulich
  0 siblings, 0 replies; only message in thread
From: Jan Grulich @ 2026-07-20 19:27 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/digikam
Branch : epel9-next
Commit : 1424155075f6af96b807f7dcfcfbc3e19ffa236d
Author : Jan Grulich <jgrulich@redhat.com>
Date   : 2024-10-16T09:07:18+02:00
Stats  : +35/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/digikam/c/1424155075f6af96b807f7dcfcfbc3e19ffa236d?branch=epel9-next

Log:
Fix build against Qt 6.8

---
diff --git a/digikam-use-qurl-matches-instead-equal-operator.patch b/digikam-use-qurl-matches-instead-equal-operator.patch
new file mode 100644
index 0000000..a30bdbe
--- /dev/null
+++ b/digikam-use-qurl-matches-instead-equal-operator.patch
@@ -0,0 +1,33 @@
+From a8b49ed8df676cae0f48b3369831edde2b74903e Mon Sep 17 00:00:00 2001
+From: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Wed, 2 Oct 2024 21:20:03 +0000
+Subject: [PATCH] With Qt 6.8.0, QUrl::operator== have benn removed. Uses
+ QUrl::matches() instead
+
+---
+ core/libs/database/coredb/coredburl.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/core/libs/database/coredb/coredburl.cpp b/core/libs/database/coredb/coredburl.cpp
+index cb76c14438..a06008e61c 100644
+--- a/core/libs/database/coredb/coredburl.cpp
++++ b/core/libs/database/coredb/coredburl.cpp
+@@ -248,7 +248,16 @@ CoreDbUrl& CoreDbUrl::operator=(const CoreDbUrl& url)
+ 
+ bool CoreDbUrl::operator==(const QUrl& digikamalbumsUrl) const
+ {
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 8, 0))
++
++    return (this->matches(digikamalbumsUrl, QUrl::None));
++
++#else
++
+     return (QUrl::operator==(digikamalbumsUrl));
++
++#endif
++
+ }
+ 
+ /*
+-- 
+GitLab

diff --git a/digikam.spec b/digikam.spec
index a272709..a935f0c 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -32,6 +32,8 @@ Source0: http://download.kde.org/stable/digikam/%{version}/digiKam-%{version}.ta
 Source10: digikam-import.desktop
 
 ## upstream patches
+# Fix build against Qt 6.8
+Patch0:   digikam-use-qurl-matches-instead-equal-operator.patch
 
 ## upstreamable patches
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-20 19:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-20 19:27 [rpms/digikam] epel9-next: Fix build against Qt 6.8 Jan Grulich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox