Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/
Date: Sun, 15 Sep 2019 23:06:18
Message-Id: 1568588743.cef8fca8963bc57f0498f84b02b3ff5e13a9ee2c.asturm@gentoo
1 commit: cef8fca8963bc57f0498f84b02b3ff5e13a9ee2c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 15 23:02:00 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 15 23:05:43 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef8fca8
7
8 media-gfx/darktable: Fix build with gcc-9
9
10 Thanks to openSUSE for the patch.
11
12 Closes: https://bugs.gentoo.org/685042
13 Package-Manager: Portage-2.3.76, Repoman-2.3.17
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 media-gfx/darktable/Manifest | 1 +
17 media-gfx/darktable/darktable-2.6.2.ebuild | 6 +++++-
18 2 files changed, 6 insertions(+), 1 deletion(-)
19
20 diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
21 index 1c4a1677824..a86d76b4abf 100644
22 --- a/media-gfx/darktable/Manifest
23 +++ b/media-gfx/darktable/Manifest
24 @@ -1,3 +1,4 @@
25 DIST darktable-2.6.1.tar.xz 3473300 BLAKE2B e2194d9d967872b3dbc5dd608b3aa946424ff8a20a00b8cd8e1e9dd7ad3146acd791d2a7f20652d4673fdaac7bec86e405e055bab664c41b601b5788f0f15e72 SHA512 0d92fa35629ca02ca7cbb2910966b3fad57e536c967fd05381ad02dc9645106e6baaf1a93c1c186618624850c876f23305704e41d7151150e3367e21c415a967
26 +DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
27 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
28 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
29
30 diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
31 index 48d249ae730..e9bf1a97e40 100644
32 --- a/media-gfx/darktable/darktable-2.6.2.ebuild
33 +++ b/media-gfx/darktable/darktable-2.6.2.ebuild
34 @@ -12,6 +12,7 @@ MY_P="${P/_/.}"
35 DESCRIPTION="A virtual lighttable and darkroom for photographers"
36 HOMEPAGE="https://www.darktable.org/"
37 SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
38 + https://dev.gentoo.org/~asturm/distfiles/${P}-gcc9.patch.tar.xz
39 doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
40
41 LICENSE="GPL-3 CC-BY-3.0"
42 @@ -68,7 +69,10 @@ RDEPEND="${COMMON_DEPEND}
43 kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
44 "
45
46 -PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
47 +PATCHES=(
48 + "${FILESDIR}"/"${PN}"-find-opencl-header.patch
49 + "${WORKDIR}"/"${P}"-gcc9.patch
50 +)
51
52 S="${WORKDIR}/${P/_/~}"