Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/files/, dev-libs/libixion/
Date: Wed, 01 Dec 2021 16:42:45
Message-Id: 1638376949.9e170d9159e96863444a8270c1cee602d8c00d6a.sam@gentoo
1 commit: 9e170d9159e96863444a8270c1cee602d8c00d6a
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 1 16:42:16 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 1 16:42:29 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e170d91
7
8 dev-libs/libixion: fix build with Clang
9
10 Closes: https://bugs.gentoo.org/793917
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-libs/libixion/files/libixion-0.16.1-clang.patch | 18 ++++++++++++++++++
14 dev-libs/libixion/libixion-0.16.1.ebuild | 4 ++++
15 2 files changed, 22 insertions(+)
16
17 diff --git a/dev-libs/libixion/files/libixion-0.16.1-clang.patch b/dev-libs/libixion/files/libixion-0.16.1-clang.patch
18 new file mode 100644
19 index 000000000000..802d43e71592
20 --- /dev/null
21 +++ b/dev-libs/libixion/files/libixion-0.16.1-clang.patch
22 @@ -0,0 +1,18 @@
23 +https://gitlab.com/ixion/ixion/-/commit/1992b8ab9c7765b8da06b6054bb3c0ab990c62f7
24 +https://bugs.gentoo.org/793917
25 +
26 +From: Jory Pratt <anarchy@g.o>
27 +Date: Wed, 2 Jun 2021 10:19:01 -0500
28 +Subject: [PATCH] Fix nullptr_t for clang/musl users
29 +
30 +--- a/src/libixion/model_context.cpp
31 ++++ b/src/libixion/model_context.cpp
32 +@@ -17,7 +17,7 @@
33 +
34 + namespace ixion {
35 +
36 +-model_context::input_cell::input_cell(nullptr_t) : type(celltype_t::empty) {}
37 ++model_context::input_cell::input_cell(std::nullptr_t) : type(celltype_t::empty) {}
38 + model_context::input_cell::input_cell(bool b) : type(celltype_t::boolean)
39 + {
40 + value.boolean = b;
41
42 diff --git a/dev-libs/libixion/libixion-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild
43 index 8d3350a54854..0f397c8828ef 100644
44 --- a/dev-libs/libixion/libixion-0.16.1.ebuild
45 +++ b/dev-libs/libixion/libixion-0.16.1.ebuild
46 @@ -32,6 +32,10 @@ RDEPEND="
47 "
48 DEPEND="${RDEPEND}"
49
50 +PATCHES=(
51 + "${FILESDIR}"/${P}-clang.patch
52 +)
53 +
54 pkg_setup() {
55 use python && python-single-r1_pkg_setup
56 }