* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
@ 2024-08-15 20:15 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-08-15 20:15 UTC (permalink / raw
To: gentoo-commits
commit: dc4a14ea0d2fcc7c30abbf640ee4228929fa33e3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 20:10:20 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 20:10:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc4a14ea
dev-libs/libixion: fix build w/ gcc-15
Closes: https://bugs.gentoo.org/937388
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libixion-0.19.0-gcc15-cstdint.patch | 22 ++++++++++++++++++++++
dev-libs/libixion/libixion-0.19.0.ebuild | 4 ++++
2 files changed, 26 insertions(+)
diff --git a/dev-libs/libixion/files/libixion-0.19.0-gcc15-cstdint.patch b/dev-libs/libixion/files/libixion-0.19.0-gcc15-cstdint.patch
new file mode 100644
index 000000000000..2991d7fdbb68
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.19.0-gcc15-cstdint.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/937388
+https://gitlab.com/ixion/ixion/-/issues/63
+https://gitlab.com/ixion/ixion/-/merge_requests/70
+
+From cb662d675aaa419972d39c5606713919e3e1d6f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kacper=20S=C5=82omi=C5=84ski?=
+ <kacper.slominski72@gmail.com>
+Date: Wed, 14 Aug 2024 03:41:24 +0200
+Subject: [PATCH] Add a missing <cstdint> include
+
+--- a/include/ixion/compute_engine.hpp
++++ b/include/ixion/compute_engine.hpp
+@@ -13,6 +13,7 @@
+
+ #include <memory>
+ #include <string>
++#include <cstdint>
+
+ namespace ixion { namespace draft {
+
+--
+GitLab
diff --git a/dev-libs/libixion/libixion-0.19.0.ebuild b/dev-libs/libixion/libixion-0.19.0.ebuild
index 13874bfc6440..3c5c285817ae 100644
--- a/dev-libs/libixion/libixion-0.19.0.ebuild
+++ b/dev-libs/libixion/libixion-0.19.0.ebuild
@@ -32,6 +32,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc15-cstdint.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
@ 2024-09-20 21:01 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-09-20 21:01 UTC (permalink / raw
To: gentoo-commits
commit: c40d63dfb6d7020445d1bb1494efacfafaf33e32
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 20:51:03 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 21:01:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40d63df
dev-libs/libixion: Fix "_WIN32" is not defined in header
Fixes revdeps like sci-visualization/labplot[ods]
Closes: https://bugs.gentoo.org/939807
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libixion-0.19.0-fix-win32-ifdef.patch | 25 +++++++++
dev-libs/libixion/libixion-0.19.0-r1.ebuild | 62 ++++++++++++++++++++++
2 files changed, 87 insertions(+)
diff --git a/dev-libs/libixion/files/libixion-0.19.0-fix-win32-ifdef.patch b/dev-libs/libixion/files/libixion-0.19.0-fix-win32-ifdef.patch
new file mode 100644
index 000000000000..c5aa33a041cf
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.19.0-fix-win32-ifdef.patch
@@ -0,0 +1,25 @@
+From 7b1df6fc2b989d8a64edaa47fe04edea95c45174 Mon Sep 17 00:00:00 2001
+From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
+Date: Thu, 25 Jul 2024 08:21:38 +0000
+Subject: [PATCH] Fix "_WIN32" is not defined when not on Windows.
+
+---
+ include/ixion/env.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/ixion/env.hpp b/include/ixion/env.hpp
+index 92812e3e..7fee0702 100644
+--- a/include/ixion/env.hpp
++++ b/include/ixion/env.hpp
+@@ -33,7 +33,7 @@
+ #define IXION_DLLPUBLIC_VAR IXION_DLLPUBLIC extern
+ #endif
+
+-#if _WIN32
++#ifdef _WIN32
+ #define IXION_MOD_EXPORT __declspec(dllexport)
+ #else
+ #define IXION_MOD_EXPORT __attribute__ ((visibility ("default")))
+--
+GitLab
+
diff --git a/dev-libs/libixion/libixion-0.19.0-r1.ebuild b/dev-libs/libixion/libixion-0.19.0-r1.ebuild
new file mode 100644
index 000000000000..e6e85ddecd3e
--- /dev/null
+++ b/dev-libs/libixion/libixion-0.19.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit python-single-r1
+
+DESCRIPTION="General purpose formula parser & interpreter"
+HOMEPAGE="https://gitlab.com/ixion/ixion"
+
+if [[ ${PV} == *9999* ]]; then
+ MDDS_SLOT="1/3.0"
+ EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
+ inherit git-r3 autotools
+else
+ MDDS_SLOT="1/2.1"
+ SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/0.18" # based on SONAME of libixion.so
+IUSE="debug python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-util/mdds:${MDDS_SLOT}
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc15-cstdint.patch # bug 937388
+ "${FILESDIR}"/${P}-fix-win32-ifdef.patch # bug 939807
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ [[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable debug debug-utils)
+ $(use_enable debug log-debug)
+ $(use_enable python)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
@ 2022-06-14 15:20 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-06-14 15:20 UTC (permalink / raw
To: gentoo-commits
commit: 6c639c8f0a66a951d04d27b6190262d54e07e5ba
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 13:33:11 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 15:19:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c639c8f
dev-libs/libixion: Drop 0.16.1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libixion/Manifest | 1 -
.../libixion/files/libixion-0.16.1-clang.patch | 18 -------
dev-libs/libixion/libixion-0.16.1.ebuild | 63 ----------------------
3 files changed, 82 deletions(-)
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index aff640dd2314..5513636ebc08 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,2 +1 @@
-DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
DIST libixion-0.17.0.tar.xz 499836 BLAKE2B c8c31b07ad14dd49be259686af3e39e6f5d4aeeb8680030ea7bd2697c8baa72123f2659b3087f224f956612dc444c97e6a6d331fd3deff780981bab4d5b6ad25 SHA512 0acdb2eae5250236a94b1a3344ca990058ea8db7b1e741545bcb7160f9e28d21a3c2ec336621fd590df10188a4d5feadfbb3a63f57e9bfd2cc1bffc04009ffad
diff --git a/dev-libs/libixion/files/libixion-0.16.1-clang.patch b/dev-libs/libixion/files/libixion-0.16.1-clang.patch
deleted file mode 100644
index 802d43e71592..000000000000
--- a/dev-libs/libixion/files/libixion-0.16.1-clang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 0f397c8828ef..000000000000
--- a/dev-libs/libixion/libixion-0.16.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-single-r1
-
-DESCRIPTION="General purpose formula parser & interpreter"
-HOMEPAGE="https://gitlab.com/ixion/ixion"
-
-if [[ ${PV} == *9999 ]]; then
- MDDS_SLOT="1/9999"
- EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
- inherit git-r3 autotools
-else
- MDDS_SLOT="1/1.5"
- SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.16" # based on SONAME of libixion.so
-IUSE="debug python +threads"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- dev-libs/boost:=
- dev-util/mdds:${MDDS_SLOT}
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-clang.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- [[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- $(use_enable debug)
- $(use_enable debug debug-utils)
- $(use_enable debug log-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] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
@ 2020-05-28 17:09 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-05-28 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 69f45f358a48821fdfa0294b602163dbfe68c691
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 16:59:00 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 28 17:09:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f45f35
dev-libs/libixion: Fix bashisms in configure.ac, --disable-static
Reported-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Thanks-to: Lars Wendler <polynomial-c <AT> gentoo.org>
Closes: https://bugs.gentoo.org/723128
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libixion/files/libixion-0.15.0-bashism.patch | 32 ++++++++++++++++++++++
dev-libs/libixion/libixion-0.15.0.ebuild | 15 ++++++----
dev-libs/libixion/libixion-9999.ebuild | 4 +--
3 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
new file mode 100644
index 00000000000..9df7b04a865
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
@@ -0,0 +1,32 @@
+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/libixion-0.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild
index d3155185dc5..b93481abbca 100644
--- a/dev-libs/libixion/libixion-0.15.0.ebuild
+++ b/dev-libs/libixion/libixion-0.15.0.ebuild
@@ -4,14 +4,14 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1
+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 autotools
+ inherit git-r3
else
SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
@@ -19,7 +19,7 @@ fi
LICENSE="MIT"
SLOT="0/0.15" # based on SONAME of libixion.so
-IUSE="debug python static-libs +threads"
+IUSE="debug python +threads"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -32,7 +32,10 @@ DEPEND="${RDEPEND}
dev-libs/spdlog
"
-PATCHES=( "${FILESDIR}/${P}-musl-clang.patch" ) # bug 714018
+PATCHES=(
+ "${FILESDIR}/${P}-musl-clang.patch" # bug 714018
+ "${FILESDIR}/${P}-bashism.patch" # bug 723128
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
@@ -40,14 +43,14 @@ pkg_setup() {
src_prepare() {
default
- [[ ${PV} == *9999 ]] && eautoreconf
+ eautoreconf
}
src_configure() {
local myeconfargs=(
+ --disable-static
$(use_enable debug)
$(use_enable python)
- $(use_enable static-libs static)
$(use_enable threads)
)
econf "${myeconfargs[@]}"
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index 28084226f1e..e3b55ff9101 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -21,7 +21,7 @@ fi
LICENSE="MIT"
SLOT="0/0.16" # based on SONAME of libixion.so
-IUSE="debug python static-libs +threads"
+IUSE="debug python +threads"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -45,9 +45,9 @@ src_prepare() {
src_configure() {
local myeconfargs=(
+ --disable-static
$(use_enable debug)
$(use_enable python)
- $(use_enable static-libs static)
$(use_enable threads)
)
econf "${myeconfargs[@]}"
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
@ 2019-07-24 20:19 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-07-24 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 78bbce2bbe7f81596cc75e5ea83e755e9f130bbe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 20:19:18 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 20:19:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78bbce2b
dev-libs/libixion: Patch already upstreamed
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libixion-9999-spdlog-non-bundled-fmt.patch | 25 ----------------------
dev-libs/libixion/libixion-9999.ebuild | 2 --
2 files changed, 27 deletions(-)
diff --git a/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch b/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch
deleted file mode 100644
index 2cf5cb0a184..00000000000
--- a/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 389c8def65406ae92077686a2e9095afebab28f4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 24 Jul 2019 20:01:01 +0200
-Subject: [PATCH] Fix build when built against spdlog without bundled fmt
-
----
- src/libixion/dirty_cell_tracker.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libixion/dirty_cell_tracker.cpp b/src/libixion/dirty_cell_tracker.cpp
-index 42d338b..7e6e3cc 100644
---- a/src/libixion/dirty_cell_tracker.cpp
-+++ b/src/libixion/dirty_cell_tracker.cpp
-@@ -16,7 +16,7 @@
- #include <limits>
-
- #include <spdlog/spdlog.h>
--#include <spdlog/fmt/bundled/ostream.h>
-+#include <spdlog/fmt/ostr.h>
-
- namespace ixion {
-
---
-2.22.0
-
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index 92f685ee869..ff21270e742 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -32,8 +32,6 @@ DEPEND="${RDEPEND}
dev-libs/spdlog
"
-PATCHES=( "${FILESDIR}"/${P}-spdlog-non-bundled-fmt.patch )
-
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
@ 2019-07-24 18:23 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-07-24 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 8b1a5167748d9c6a6fb012c9c8c4e478a26bb09f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 18:21:53 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 18:22:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1a5167
dev-libs/libixion: Add new DEPEND, raise mdds minimum dep to 1.5.0
Closes: https://bugs.gentoo.org/680342
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libixion-9999-spdlog-non-bundled-fmt.patch | 25 ++++++++++++++++++++++
dev-libs/libixion/libixion-9999.ebuild | 10 ++++++---
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch b/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch
new file mode 100644
index 00000000000..2cf5cb0a184
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch
@@ -0,0 +1,25 @@
+From 389c8def65406ae92077686a2e9095afebab28f4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 24 Jul 2019 20:01:01 +0200
+Subject: [PATCH] Fix build when built against spdlog without bundled fmt
+
+---
+ src/libixion/dirty_cell_tracker.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libixion/dirty_cell_tracker.cpp b/src/libixion/dirty_cell_tracker.cpp
+index 42d338b..7e6e3cc 100644
+--- a/src/libixion/dirty_cell_tracker.cpp
++++ b/src/libixion/dirty_cell_tracker.cpp
+@@ -16,7 +16,7 @@
+ #include <limits>
+
+ #include <spdlog/spdlog.h>
+-#include <spdlog/fmt/bundled/ostream.h>
++#include <spdlog/fmt/ostr.h>
+
+ namespace ixion {
+
+--
+2.22.0
+
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index 860c13488fc..92f685ee869 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -23,12 +23,16 @@ IUSE="debug python static-libs +threads"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-DEPEND="
+RDEPEND="
dev-libs/boost:=
- >=dev-util/mdds-1.4.1:1=
+ >=dev-util/mdds-1.5.0:1=
python? ( ${PYTHON_DEPS} )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ dev-libs/spdlog
+"
+
+PATCHES=( "${FILESDIR}"/${P}-spdlog-non-bundled-fmt.patch )
pkg_setup() {
use python && python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
@ 2016-02-25 4:20 Andreas Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2016-02-25 4:20 UTC (permalink / raw
To: gentoo-commits
commit: 287d369fccff7bffb877dd06ce5c8bcb30c248c6
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb 24 11:14:39 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 11:20:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=287d369f
dev-libs/libixion: Fix build, EAPI=6
- ${P}-python-optional.patch was removing -DMDDS_HASH_CONTAINER_BOOST,
fixed and removed any python-unrelated parts from the patch
- Removed unnecessary ${P}-python-symbol.patch
Package-Manager: portage-2.2.27
.../files/libixion-0.9.1-python-optional.patch | 42 +++++++---------------
.../files/libixion-0.9.1-python-symbol.patch | 13 -------
...ixion-0.9.1.ebuild => libixion-0.9.1-r1.ebuild} | 12 ++++---
3 files changed, 19 insertions(+), 48 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 df945ab..632fa07 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,21 +1,21 @@
--- 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 @@
+@@ -15,18 +15,22 @@
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,
--[
-- --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_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])],
+ [enable_python="$enableval"],
@@ -24,25 +24,7 @@
IXION_API_VERSION=ixion_api_version
IXION_MAJOR_VERSION=ixion_major_version
-@@ -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.
+@@ -70,7 +74,11 @@
PKG_CHECK_MODULES([MDDS],[mdds >= 0.12.0])
# Check for python.
@@ -55,7 +37,7 @@
CPPFLAGS="$CPPFLAGS -g -Os -fvisibility=hidden"
-@@ -101,3 +92,10 @@
+@@ -101,3 +109,10 @@
src/libixion/constants.inl
src/python/Makefile])
AC_OUTPUT
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
deleted file mode 100644
index 1a62bbc..0000000
--- a/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.1.ebuild b/dev-libs/libixion/libixion-0.9.1-r1.ebuild
similarity index 85%
rename from dev-libs/libixion/libixion-0.9.1.ebuild
rename to dev-libs/libixion/libixion-0.9.1-r1.ebuild
index 9c993be..6dc3c0e 100644
--- a/dev-libs/libixion/libixion-0.9.1.ebuild
+++ b/dev-libs/libixion/libixion-0.9.1-r1.ebuild
@@ -2,7 +2,7 @@
# 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"
@@ -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.10"
+SLOT="0/0.10" # based on SONAME of libixion.so
[[ ${PV} == 9999 ]] || \
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="python static-libs"
@@ -37,9 +37,11 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/${PN}-0.9.1-typo.patch" \
- "${FILESDIR}/${PN}-0.9.1-python-optional.patch" \
- "${FILESDIR}/${PN}-0.9.1-python-symbol.patch"
+ eapply_user
+
+ eapply "${FILESDIR}/${PN}-0.9.1-typo.patch" \
+ "${FILESDIR}/${PN}-0.9.1-python-optional.patch"
+
eautoreconf
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-09-20 21:01 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-15 20:15 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-20 21:01 Andreas Sturmlechner
2022-06-14 15:20 Andreas Sturmlechner
2020-05-28 17:09 Andreas Sturmlechner
2019-07-24 20:19 Andreas Sturmlechner
2019-07-24 18:23 Andreas Sturmlechner
2016-02-25 4:20 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