diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-05-09 01:36:11 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-05-09 14:09:52 +0200 |
| commit | 76bdbe7aafec09075e3c2f83df5f277c2e229bda (patch) | |
| tree | 694a8ad6f970df9dbede46be32bf62f7c89e10b8 /media-gfx/digikam | |
| parent | app-backup/kfoldersync: Fix build w/ >=kde-frameworks/kwindowsystem-5.82 (diff) | |
| download | gentoo-76bdbe7aafec09075e3c2f83df5f277c2e229bda.tar.gz gentoo-76bdbe7aafec09075e3c2f83df5f277c2e229bda.tar.bz2 gentoo-76bdbe7aafec09075e3c2f83df5f277c2e229bda.zip | |
media-gfx/digikam: Fix build with Qt-5.15.2-after-f8ad329f
Upstream commit 7078ffb91c05e6cd436eaf222541044b98265113
See also: https://invent.kde.org/graphics/digikam/-/merge_requests/60
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-gfx/digikam')
| -rw-r--r-- | media-gfx/digikam/digikam-7.2.0.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch | 29 |
2 files changed, 31 insertions, 0 deletions
diff --git a/media-gfx/digikam/digikam-7.2.0.ebuild b/media-gfx/digikam/digikam-7.2.0.ebuild index c7406e0e9cf7..7024418a1e3a 100644 --- a/media-gfx/digikam/digikam-7.2.0.ebuild +++ b/media-gfx/digikam/digikam-7.2.0.ebuild @@ -108,6 +108,8 @@ RDEPEND="${COMMON_DEPEND} panorama? ( media-gfx/hugin ) " +PATCHES=( "${FILESDIR}"/${P}-qt-5.15.2-after-f8ad329f.patch ) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp ecm_pkg_pretend diff --git a/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch b/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch new file mode 100644 index 000000000000..938cd8a990cd --- /dev/null +++ b/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch @@ -0,0 +1,29 @@ +From 7078ffb91c05e6cd436eaf222541044b98265113 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas@archlinux.org> +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 + |