commit: 436675c61eaefced99e20f8edc9e01355a2b2e70 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 20 18:45:59 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 20 18:59:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436675c6
media-gfx/krita: Fix build against >=media-libs/libraw-0.21.0 Closes: https://bugs.gentoo.org/887473 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../krita/files/krita-5.1.4-libraw-0.21.patch | 28 ++++++++++++++++++++++ media-gfx/krita/krita-5.1.4-r1.ebuild | 5 +++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch new file mode 100644 index 000000000000..9cdd0a9f8161 --- /dev/null +++ b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch @@ -0,0 +1,28 @@ +From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <aro...@archlinux.org> +Date: Sun, 18 Dec 2022 16:28:38 +0100 +Subject: [PATCH] Fix build with libraw 0.21 + +--- + plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp +index dcaecc6fa7..71425f909c 100644 +--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp ++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp +@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI + d->setProgress(0.3); + + raw.imgdata.params.output_bps = 16; ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) ++ raw.imgdata.rawparams.shot_select = shotSelect; ++#else + raw.imgdata.params.shot_select = shotSelect; ++#endif + ret = raw.unpack(); + + if (ret != LIBRAW_SUCCESS) +-- +GitLab + diff --git a/media-gfx/krita/krita-5.1.4-r1.ebuild b/media-gfx/krita/krita-5.1.4-r1.ebuild index abf1cf77bf49..86ce7588ec21 100644 --- a/media-gfx/krita/krita-5.1.4-r1.ebuild +++ b/media-gfx/krita/krita-5.1.4-r1.ebuild @@ -85,7 +85,10 @@ BDEPEND=" sys-devel/gettext " -PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch + "${FILESDIR}"/${P}-libraw-0.21.patch # bug 887473 +) pkg_setup() { python-single-r1_pkg_setup
