From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/files/, dev-libs/libixion/
Date: Wed, 1 Dec 2021 16:42:41 +0000 (UTC) [thread overview]
Message-ID: <1638376949.9e170d9159e96863444a8270c1cee602d8c00d6a.sam@gentoo> (raw)
commit: 9e170d9159e96863444a8270c1cee602d8c00d6a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 1 16:42:16 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 1 16:42:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e170d91
dev-libs/libixion: fix build with Clang
Closes: https://bugs.gentoo.org/793917
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libixion/files/libixion-0.16.1-clang.patch | 18 ++++++++++++++++++
dev-libs/libixion/libixion-0.16.1.ebuild | 4 ++++
2 files changed, 22 insertions(+)
diff --git a/dev-libs/libixion/files/libixion-0.16.1-clang.patch b/dev-libs/libixion/files/libixion-0.16.1-clang.patch
new file mode 100644
index 000000000000..802d43e71592
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.16.1-clang.patch
@@ -0,0 +1,18 @@
+https://gitlab.com/ixion/ixion/-/commit/1992b8ab9c7765b8da06b6054bb3c0ab990c62f7
+https://bugs.gentoo.org/793917
+
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Wed, 2 Jun 2021 10:19:01 -0500
+Subject: [PATCH] Fix nullptr_t for clang/musl users
+
+--- a/src/libixion/model_context.cpp
++++ b/src/libixion/model_context.cpp
+@@ -17,7 +17,7 @@
+
+ namespace ixion {
+
+-model_context::input_cell::input_cell(nullptr_t) : type(celltype_t::empty) {}
++model_context::input_cell::input_cell(std::nullptr_t) : type(celltype_t::empty) {}
+ model_context::input_cell::input_cell(bool b) : type(celltype_t::boolean)
+ {
+ value.boolean = b;
diff --git a/dev-libs/libixion/libixion-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild
index 8d3350a54854..0f397c8828ef 100644
--- a/dev-libs/libixion/libixion-0.16.1.ebuild
+++ b/dev-libs/libixion/libixion-0.16.1.ebuild
@@ -32,6 +32,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-clang.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
next reply other threads:[~2021-12-01 16:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 16:42 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-10 15:34 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/files/, dev-libs/libixion/ Andreas Sturmlechner
2020-03-23 0:34 Andreas Sturmlechner
2016-02-22 17:07 Andreas Hüttel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1638376949.9e170d9159e96863444a8270c1cee602d8c00d6a.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox