* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/files/, dev-libs/libixion/
@ 2016-02-22 17:07 Andreas Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2016-02-22 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 77d879fe444909e960a42c563cae442e72aabca8
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Feb 6 15:09:03 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 17:05:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d879fe
dev-libs/libixion: Fix DEPENDs, subslot, fix USE=-python (bug 550814)
- >=9999: Pin mdds DEPEND to slot 1
- <9999: Pin mdds DEPEND to slot 0
Package-Manager: portage-2.2.27
.../files/libixion-0.9.1-python-optional.patch | 96 ++++++++++++++--------
.../files/libixion-0.9.1-python-symbol.patch | 13 +++
dev-libs/libixion/libixion-0.9.0.ebuild | 2 +-
dev-libs/libixion/libixion-0.9.1.ebuild | 9 +-
dev-libs/libixion/libixion-9999.ebuild | 11 +--
dev-libs/libixion/metadata.xml | 3 +
6 files changed, 89 insertions(+), 45 deletions(-)
diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
index a4e7239..df945ab 100644
--- a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
+++ b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
@@ -1,34 +1,48 @@
-commit 59c360c9fe438a2805d65decc6c7889bc99a7747
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun May 31 10:14:17 2015 +0200
-
- python: Make it optional
-
- python bindings are built unless disabled
-
-diff --git a/configure.ac b/configure.ac
-index 03f6120..1c7d8b2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,7 +15,6 @@ AC_PREREQ([2.63])
+--- a/configure.ac 2016-02-06 17:08:05.505990463 +0100
++++ b/configure.ac 2016-02-06 17:08:42.316530268 +0100
+@@ -15,18 +15,13 @@
AC_INIT([libixion], [ixion_version])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz])
-AM_PATH_PYTHON(2.7.0)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AC_ARG_WITH(hash-container-compat,
-@@ -28,6 +27,9 @@ AC_ARG_WITH(mdds-include-path,
- AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.])
- ,)
-
+-AC_ARG_WITH(hash-container-compat,
+-[
+- --with-hash-container-compat use std::hash_foo instead of boost::unordered_foo
+-],
+-,with_hash_container_compat=no)
+-
+-AC_ARG_WITH(mdds-include-path,
+- AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.])
+-,)
+AC_ARG_ENABLE([python],
-+ AS_HELP_STRING([--disable-python], [Disable python bindings]))
-+
++ [AS_HELP_STRING([--disable-python], [Disable python bindings])],
++ [enable_python="$enableval"],
++ [enable_python=yes]
++)
+
IXION_API_VERSION=ixion_api_version
IXION_MAJOR_VERSION=ixion_major_version
- IXION_MINOR_VERSION=ixion_minor_version
-@@ -82,7 +84,11 @@ fi
+@@ -66,23 +61,19 @@
+ AC_FUNC_STRTOD
+ AC_CHECK_FUNCS([gettimeofday])
+
+-CPPFLAGS="$CPPFLAGS -D_REENTRANT -DMDDS_HASH_CONTAINER_BOOST"
++CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+
+-AC_MSG_CHECKING([whether to turn on hash container compatibility])
+-if test "z$with_hash_container_compat" = "zno"; then
+- AC_MSG_RESULT([no])
+- BOOST_REQUIRE([1.36])
+- BOOST_UNORDERED
+-else
+- AC_MSG_RESULT([yes])
+- DEFINES="$DEFINES -D_IXION_HASH_CONTAINER_COMPAT"
+-fi
++BOOST_REQUIRE([1.36])
+
+ # Check for mdds.
PKG_CHECK_MODULES([MDDS],[mdds >= 0.12.0])
# Check for python.
@@ -37,20 +51,32 @@ index 03f6120..1c7d8b2 100644
+ AM_PATH_PYTHON(2.7.0)
+ PKG_CHECK_MODULES([PYTHON], [python >= 0.27.1])
+])
-+AM_CONDITIONAL([PYTHON], [test "x$enable_python" != "xno"])
++AM_CONDITIONAL([BUILD_PYTHON], [test "x$enable_python" != "xno"])
CPPFLAGS="$CPPFLAGS -g -Os -fvisibility=hidden"
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6e138a4..cd912ab 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,7 @@
--SUBDIRS = libixion python
-+SUBDIRS = libixion
-+if PYTHON
-+ SUBDIRS += python
-+endif
-
- AM_CPPFLAGS = -I$(top_srcdir)/include $(MDDS_CFLAGS)
+@@ -101,3 +92,10 @@
+ src/libixion/constants.inl
+ src/python/Makefile])
+ AC_OUTPUT
++
++AC_MSG_NOTICE([
++==============================================================================
++Build configuration:
++ python: $enable_python
++==============================================================================
++])
+--- a/src/python/Makefile.am 2016-02-06 17:08:12.138907540 +0100
++++ b/src/python/Makefile.am 2016-02-06 17:08:38.034583800 +0100
+@@ -1,3 +1,5 @@
++if BUILD_PYTHON
++
+ pyexec_LTLIBRARIES = ixion.la
+ ixion_la_SOURCES = \
+ document.hpp \
+@@ -16,3 +18,5 @@
+ AM_TESTS_ENVIRONMENT = PYTHONPATH=.libs$${PYTHONPATH:+:$${PYTHONPATH}}; export PYTHONPATH;
+ TESTS = ../../test/ixion-python-test.py
++
++endif
diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch b/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch
new file mode 100644
index 0000000..1a62bbc
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch
@@ -0,0 +1,13 @@
+diff --git a/src/python/Makefile.am b/src/python/Makefile.am
+index 0dfae54..094e0cf 100644
+--- a/src/python/Makefile.am
++++ b/src/python/Makefile.am
+@@ -10,7 +10,7 @@ ixion_la_SOURCES = \
+ sheet.hpp \
+ sheet.cpp
+
+-ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex initixion
++ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex PyInit_ixion
+ ixion_la_CPPFLAGS = -I$(top_srcdir)/include $(PYTHON_CFLAGS) $(MDDS_CFLAGS)
+ ixion_la_LIBADD = \
+ ../libixion/libixion-@IXION_API_VERSION@.la \
diff --git a/dev-libs/libixion/libixion-0.9.0.ebuild b/dev-libs/libixion/libixion-0.9.0.ebuild
index f36ed25..59b8842 100644
--- a/dev-libs/libixion/libixion-0.9.0.ebuild
+++ b/dev-libs/libixion/libixion-0.9.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[threads]
"
DEPEND="${RDEPEND}
- >=dev-util/mdds-0.12.0:=
+ >=dev-util/mdds-0.12.0:0=
"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libixion/libixion-0.9.1.ebuild b/dev-libs/libixion/libixion-0.9.1.ebuild
index ff9dd6d..9c993be 100644
--- a/dev-libs/libixion/libixion-0.9.1.ebuild
+++ b/dev-libs/libixion/libixion-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,7 @@ RDEPEND="
python? ( ${PYTHON_DEPS} )
"
DEPEND="${RDEPEND}
- >=dev-util/mdds-0.12.0:=
+ >=dev-util/mdds-0.12.0:0=
"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -37,8 +37,9 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/${PN}-0.9.1-typo.patch"
- epatch "${FILESDIR}/${PN}-0.9.1-python-optional.patch"
+ epatch "${FILESDIR}/${PN}-0.9.1-typo.patch" \
+ "${FILESDIR}/${PN}-0.9.1-python-optional.patch" \
+ "${FILESDIR}/${PN}-0.9.1-python-symbol.patch"
eautoreconf
}
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index 676202b..0a1ad43 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
-PYTHON_COMPAT=( python{3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
inherit eutils python-single-r1 ${GITECLASS}
@@ -17,7 +17,7 @@ HOMEPAGE="https://gitlab.com/ixion/ixion"
[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.xz"
LICENSE="MIT"
-SLOT="0/0.12"
+SLOT="0/0.11" # based on SONAME of libixion.so
[[ ${PV} == 9999 ]] || \
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="python static-libs"
@@ -27,7 +27,7 @@ RDEPEND="
python? ( ${PYTHON_DEPS} )
"
DEPEND="${RDEPEND}
- >=dev-util/mdds-0.12.0:=
+ dev-util/mdds:1=
"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -37,6 +37,7 @@ pkg_setup() {
}
src_prepare() {
+ eapply_user
[[ ${PV} == 9999 ]] && eautoreconf
}
diff --git a/dev-libs/libixion/metadata.xml b/dev-libs/libixion/metadata.xml
index 13ce236..4fc2ac0 100644
--- a/dev-libs/libixion/metadata.xml
+++ b/dev-libs/libixion/metadata.xml
@@ -5,4 +5,7 @@
<email>office@gentoo.org</email>
<name>Gentoo Office project</name>
</maintainer>
+ <upstream>
+ <remote-id type="gitlab">ixion/ixion</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/files/, dev-libs/libixion/
@ 2020-03-23 0:34 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-03-23 0:34 UTC (permalink / raw
To: gentoo-commits
commit: 5cd6c37430359b936182b26f47605e396043239c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 23 00:33:20 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 23 00:33:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd6c374
dev-libs/libixion: Fix build with musl/clang
Closes: https://bugs.gentoo.org/714018
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libixion-0.15.0-musl-clang.patch | 24 ++++++++++++++++++++++
dev-libs/libixion/libixion-0.15.0.ebuild | 2 ++
2 files changed, 26 insertions(+)
diff --git a/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch b/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch
new file mode 100644
index 00000000000..be5d2e6ecae
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch
@@ -0,0 +1,24 @@
+From a8fe2c542b16ee30723ab3d7f3b643ee479e9723 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 23 Aug 2019 08:50:28 -0700
+Subject: [PATCH] Fix build with clang.
+
+---
+ include/ixion/model_context.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/ixion/model_context.hpp b/include/ixion/model_context.hpp
+index 6ff5b67..dc27ed0 100644
+--- a/include/ixion/model_context.hpp
++++ b/include/ixion/model_context.hpp
+@@ -61,7 +61,7 @@ public:
+ } value;
+
+ /** Initializes the cell to be empty. */
+- input_cell(nullptr_t);
++ input_cell(std::nullptr_t);
+ /** Boolean cell value. */
+ input_cell(bool b);
+ /** The char array must be null-terminated. */
+--
+2.24.1
diff --git a/dev-libs/libixion/libixion-0.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild
index 741d54be08e..58f699f6b19 100644
--- a/dev-libs/libixion/libixion-0.15.0.ebuild
+++ b/dev-libs/libixion/libixion-0.15.0.ebuild
@@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
dev-libs/spdlog
"
+PATCHES=( "${FILESDIR}/${P}-musl-clang.patch" ) # bug 714018
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/files/, dev-libs/libixion/
@ 2021-06-10 15:34 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-06-10 15:34 UTC (permalink / raw
To: gentoo-commits
commit: 11f43e479d6732a4a54e2d342a0945a55e8ced8e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 6 17:00:31 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 10 15:32:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f43e47
dev-libs/libixion: Drop 0.15.0
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libixion/Manifest | 1 -
.../libixion/files/libixion-0.15.0-bashism.patch | 32 -----------
.../files/libixion-0.15.0-musl-clang.patch | 24 ---------
dev-libs/libixion/libixion-0.15.0.ebuild | 62 ----------------------
4 files changed, 119 deletions(-)
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index e4e60e0c3e7..55952aeb461 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,2 +1 @@
-DIST libixion-0.15.0.tar.xz 447388 BLAKE2B 55df3417783f1653b0aa4b80a5f0107a3794fcb403c1c1263ce9829b31ee5263a104fa210be151535c1ff091d5dc2519f694ef3cdb16074f86dab4d48a127afd SHA512 feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543
DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
diff --git a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
deleted file mode 100644
index 9df7b04a865..00000000000
--- a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 076f6576e7398842457d34fd68140512795c7e00 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 15 May 2020 12:42:20 +0200
-Subject: [PATCH] configure.ac: avoid bashisms
-
-or else we end up with unpredictable results if shell != /bin/bash:
-
- ./configure: 19427: test: xno: unexpected operator
-
-Reported-by: Matt Whitlock <gentoo@mattwhitlock.name>
-Gentoo-bug: https://bugs.gentoo.org/723128
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3a07dd8..505aeba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -182,7 +182,7 @@ AC_ARG_ENABLE([werror],
- [enable_werror="$enableval"],
- [enable_werror=no]
- )
--AS_IF([test x"$enable_werror" == "xyes"], [
-+AS_IF([test x"$enable_werror" = "xyes"], [
- CXXFLAGS="$CXXFLAGS -Werror"
- ])
-
---
-2.26.2
-
diff --git a/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch b/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch
deleted file mode 100644
index be5d2e6ecae..00000000000
--- a/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a8fe2c542b16ee30723ab3d7f3b643ee479e9723 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 23 Aug 2019 08:50:28 -0700
-Subject: [PATCH] Fix build with clang.
-
----
- include/ixion/model_context.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/ixion/model_context.hpp b/include/ixion/model_context.hpp
-index 6ff5b67..dc27ed0 100644
---- a/include/ixion/model_context.hpp
-+++ b/include/ixion/model_context.hpp
-@@ -61,7 +61,7 @@ public:
- } value;
-
- /** Initializes the cell to be empty. */
-- input_cell(nullptr_t);
-+ input_cell(std::nullptr_t);
- /** Boolean cell value. */
- input_cell(bool b);
- /** The char array must be null-terminated. */
---
-2.24.1
diff --git a/dev-libs/libixion/libixion-0.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild
deleted file mode 100644
index 9d8cd6a883d..00000000000
--- a/dev-libs/libixion/libixion-0.15.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools python-single-r1
-
-DESCRIPTION="General purpose formula parser & interpreter"
-HOMEPAGE="https://gitlab.com/ixion/ixion"
-
-if [[ ${PV} == *9999 ]]; then
- EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
- inherit git-r3
-else
- SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.15" # based on SONAME of libixion.so
-IUSE="debug python +threads"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- dev-libs/boost:=
- dev-util/mdds:1/1.5
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
- dev-libs/spdlog
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-musl-clang.patch" # bug 714018
- "${FILESDIR}/${P}-bashism.patch" # bug 723128
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- $(use_enable debug)
- $(use_enable python)
- $(use_enable threads)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -type f -delete || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/files/, dev-libs/libixion/
@ 2021-12-01 16:42 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-12-01 16:42 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-01 16:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-23 0:34 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/files/, dev-libs/libixion/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-12-01 16:42 Sam James
2021-06-10 15:34 Andreas Sturmlechner
2016-02-22 17:07 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox