diff --git a/Fix-build-after-Qt-commit-f8ad329f.patch b/Fix-build-after-Qt-commit-f8ad329f.patch new file mode 100644 index 0000000..d6eb339 --- /dev/null +++ b/Fix-build-after-Qt-commit-f8ad329f.patch @@ -0,0 +1,29 @@ +From 7078ffb91c05e6cd436eaf222541044b98265113 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Fri, 16 Apr 2021 19:45:05 +0200 +Subject: [PATCH] Fix build after Qt commit + f8ad329f7ee01993c388f78851fc4ac88f5093b4 + +Build fails after this commit when using QT_NO_CAST_FROM_ASCII +--- + .../webservices/mediawiki/backend/mediawiki_queryrevision.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp +index dce0fc9eb5..625d170d5e 100644 +--- a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp ++++ b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp +@@ -299,8 +299,8 @@ void QueryRevision::doWorkProcessReply() + while (count < 2) + { + if (replytmp[i] == QLatin1Char('"') && replytmp[i-1] != QLatin1Char('\\')) count++; +- if (replytmp[i] == QLatin1Char('<')) replytmp[i] = char(255); +- if (replytmp[i] == QLatin1Char('>')) replytmp[i] = char(254); ++ if (replytmp[i] == QLatin1Char('<')) replytmp[i] = QLatin1Char(char(255)); ++ if (replytmp[i] == QLatin1Char('>')) replytmp[i] = QLatin1Char(char(254)); + ++i; + } + } +-- +GitLab + diff --git a/digikam.changes b/digikam.changes index cfd4a05..59e1802 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jun 26 05:56:50 UTC 2021 - Wolfgang Bauer + +- Add Fix-build-after-Qt-commit-f8ad329f.patch to fix build with + the latest Qt + ------------------------------------------------------------------- Sun May 9 10:55:26 UTC 2021 - Fabian Vogt diff --git a/digikam.spec b/digikam.spec index 445b4a5..2ed138b 100644 --- a/digikam.spec +++ b/digikam.spec @@ -29,6 +29,8 @@ URL: https://www.digikam.org/ Source0: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE -- Lower minimum exiv2 version to 0.26 Patch0: 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch +# PATCH-FIX-UPSTREAM +Patch1: Fix-build-after-Qt-commit-f8ad329f.patch BuildRequires: QtAV-devel >= 1.12 BuildRequires: bison BuildRequires: fdupes @@ -181,6 +183,7 @@ The main digikam libraries that are being shared between showfoto and digikam # Leap 15 only has exiv2 0.26 %patch0 -p1 %endif +%patch1 -p1 %build %cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON %{?qwebengine}