Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2021-06-26 21:25:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Sat Jun 26 21:25:34 2021 rev:195 rq:902479 version:7.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2021-05-10 15:41:13.929120935 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new.2625/digikam.changes 2021-06-26 21:26:02.355388955 +0200 @@ -1,0 +2,6 @@ +Sat Jun 26 05:56:50 UTC 2021 - Wolfgang Bauer <[email protected]> + +- Add Fix-build-after-Qt-commit-f8ad329f.patch to fix build with + the latest Qt + +------------------------------------------------------------------- New: ---- Fix-build-after-Qt-commit-f8ad329f.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.7nY9Xt/_old 2021-06-26 21:26:04.091391247 +0200 +++ /var/tmp/diff_new_pack.7nY9Xt/_new 2021-06-26 21:26:04.095391252 +0200 @@ -29,6 +29,8 @@ 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 @@ # Leap 15 only has exiv2 0.26 %patch0 -p1 %endif +%patch1 -p1 %build %cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON %{?qwebengine} ++++++ Fix-build-after-Qt-commit-f8ad329f.patch ++++++ >From 7078ffb91c05e6cd436eaf222541044b98265113 Mon Sep 17 00:00:00 2001 From: Antonio Rojas <[email protected]> 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
