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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0B7B6158086 for ; Wed, 1 Dec 2021 16:42:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39D732BC06A; Wed, 1 Dec 2021 16:42:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BBC342BC06A for ; Wed, 1 Dec 2021 16:42:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A2EFE342F99 for ; Wed, 1 Dec 2021 16:42:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3750E10C for ; Wed, 1 Dec 2021 16:42:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1638376949.9e170d9159e96863444a8270c1cee602d8c00d6a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/files/, dev-libs/libixion/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libixion/files/libixion-0.16.1-clang.patch dev-libs/libixion/libixion-0.16.1.ebuild X-VCS-Directories: dev-libs/libixion/files/ dev-libs/libixion/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9e170d9159e96863444a8270c1cee602d8c00d6a X-VCS-Branch: master Date: Wed, 1 Dec 2021 16:42:41 +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: cd5cb35b-06af-4a92-a3c8-ab183a9f9b19 X-Archives-Hash: e174d185c351f67f0e3beebfa8549006 commit: 9e170d9159e96863444a8270c1cee602d8c00d6a Author: Sam James gentoo org> AuthorDate: Wed Dec 1 16:42:16 2021 +0000 Commit: Sam James gentoo 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 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 +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 }