commit:     fdb821995fb703f161257ca498b4ea974c67a24a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  4 15:35:09 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun  4 18:59:25 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb82199

media-gfx/digikam: Fix build with >=Qt-6.9

Closes: https://bugs.gentoo.org/957105
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/digikam/digikam-8.6.0.ebuild             |  1 +
 media-gfx/digikam/files/digikam-8.6.0-qt-6.9.patch | 25 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/media-gfx/digikam/digikam-8.6.0.ebuild 
b/media-gfx/digikam/digikam-8.6.0.ebuild
index 610cb7c1e021..63c74788197d 100644
--- a/media-gfx/digikam/digikam-8.6.0.ebuild
+++ b/media-gfx/digikam/digikam-8.6.0.ebuild
@@ -98,6 +98,7 @@ BDEPEND="
 PATCHES=(
        "${FILESDIR}/${PN}-8.4.0-cmake.patch"
        "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch"
+       "${FILESDIR}/${P}-qt-6.9.patch" # bug 957105
 )
 
 pkg_pretend() {

diff --git a/media-gfx/digikam/files/digikam-8.6.0-qt-6.9.patch 
b/media-gfx/digikam/files/digikam-8.6.0-qt-6.9.patch
new file mode 100644
index 000000000000..ad157610d402
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-8.6.0-qt-6.9.patch
@@ -0,0 +1,25 @@
+From 325b19fc7f0d04cdc1308f235c207c1ab43e945d Mon Sep 17 00:00:00 2001
+From: Andras Man <[email protected]>
+Date: Fri, 4 Apr 2025 18:47:03 +0300
+Subject: [PATCH] Fix build with Qt 6.9.0
+
+---
+ core/libs/widgets/text/localizeselector.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/libs/widgets/text/localizeselector.cpp 
b/core/libs/widgets/text/localizeselector.cpp
+index b284b270979..ab70a9379c3 100644
+--- a/core/libs/widgets/text/localizeselector.cpp
++++ b/core/libs/widgets/text/localizeselector.cpp
+@@ -326,7 +326,7 @@ bool s_inlineTranslateString(const QString& text, const 
QString& trCode, QString
+     }
+     else
+     {
+-        error = QChar(trengine->error());
++        error = QChar::fromLatin1(trengine->error());
+     }
+ 
+     return false;
+-- 
+GitLab
+

Reply via email to