From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CDD30158021 for ; Tue, 20 Dec 2022 19:00:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16E77E0918; Tue, 20 Dec 2022 19:00:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E244AE0918 for ; Tue, 20 Dec 2022 19:00:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EDD7D335D29 for ; Tue, 20 Dec 2022 19:00:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FCAA7CC for ; Tue, 20 Dec 2022 19:00:02 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1671562779.436675c61eaefced99e20f8edc9e01355a2b2e70.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch media-gfx/krita/krita-5.1.4-r1.ebuild X-VCS-Directories: media-gfx/krita/files/ media-gfx/krita/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 436675c61eaefced99e20f8edc9e01355a2b2e70 X-VCS-Branch: master Date: Tue, 20 Dec 2022 19:00:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 602b5943-a4a5-411c-899a-5f0925ba9105 X-Archives-Hash: 4b5913a7227a0692a4346f2d854ee0fd commit: 436675c61eaefced99e20f8edc9e01355a2b2e70 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 20 18:45:59 2022 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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