* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsemigroups/files/, sci-libs/libsemigroups/
@ 2024-07-30 20:11 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2024-07-30 20:11 UTC (permalink / raw
To: gentoo-commits
commit: 02af742b0ca05dcbf5ae3ae1648b3ff58d9d4d13
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 20:09:10 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 20:10:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02af742b
sci-libs/libsemigroups: backport gcc-15 build fix
Closes: https://bugs.gentoo.org/936564
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../libsemigroups-2.7.3-gcc-15-buildfix.patch | 22 ++++++++++++++++++++++
...-2.7.3.ebuild => libsemigroups-2.7.3-r1.ebuild} | 2 ++
2 files changed, 24 insertions(+)
diff --git a/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch b/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch
new file mode 100644
index 000000000000..40214b18b9ad
--- /dev/null
+++ b/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch
@@ -0,0 +1,22 @@
+From b7a413284e408280336ee681dd031877d779d0ea Mon Sep 17 00:00:00 2001
+From: "James D. Mitchell" <jdm3@st-andrews.ac.uk>
+Date: Mon, 29 Jul 2024 11:13:32 +0100
+Subject: [PATCH] sims: fix issue 557
+
+---
+ include/libsemigroups/sims1.tpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/libsemigroups/sims1.tpp b/include/libsemigroups/sims1.tpp
+index bc8bda372..698845222 100644
+--- a/include/libsemigroups/sims1.tpp
++++ b/include/libsemigroups/sims1.tpp
+@@ -619,7 +619,7 @@ namespace libsemigroups {
+ typename Sims1<T>::iterator_base&
+ Sims1<T>::iterator_base::operator=(Sims1<T>::iterator_base&& that) {
+ _extra = std::move(that._extra);
+- _longs = std::move(that.long_rules());
++ _longs = std::move(that._longs);
+ _max_num_classes = std::move(that._max_num_classes);
+ _min_target_node = std::move(that._min_target_node);
+ _felsch_graph = std::move(that._felsch_graph);
diff --git a/sci-libs/libsemigroups/libsemigroups-2.7.3.ebuild b/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild
similarity index 92%
rename from sci-libs/libsemigroups/libsemigroups-2.7.3.ebuild
rename to sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild
index 04bbfd48d7b9..15fff4b3b57d 100644
--- a/sci-libs/libsemigroups/libsemigroups-2.7.3.ebuild
+++ b/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild
@@ -13,6 +13,8 @@ SLOT="0/2"
KEYWORDS="~amd64 ~x86"
IUSE="cpu_flags_x86_popcnt"
+PATCHES=( "${FILESDIR}/${P}-gcc-15-buildfix.patch" )
+
src_configure() {
econf \
$(use_enable cpu_flags_x86_popcnt popcnt) \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsemigroups/files/, sci-libs/libsemigroups/
@ 2025-04-07 14:42 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2025-04-07 14:42 UTC (permalink / raw
To: gentoo-commits
commit: ef823d5aa9b4afa2de955304a4e3da48b126b2a9
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 7 14:30:52 2025 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Apr 7 14:31:34 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef823d5a
sci-libs/libsemigroups: fix the test suite build with gcc-15
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../files/libsemigroups-3.0.2-gcc15-testfix.patch | 34 ++++++++++++++++++++++
sci-libs/libsemigroups/libsemigroups-3.0.2.ebuild | 2 ++
2 files changed, 36 insertions(+)
diff --git a/sci-libs/libsemigroups/files/libsemigroups-3.0.2-gcc15-testfix.patch b/sci-libs/libsemigroups/files/libsemigroups-3.0.2-gcc15-testfix.patch
new file mode 100644
index 000000000000..9047066c51bc
--- /dev/null
+++ b/sci-libs/libsemigroups/files/libsemigroups-3.0.2-gcc15-testfix.patch
@@ -0,0 +1,34 @@
+From 2575288a19cc9f75f239b777b327e0807debb62d Mon Sep 17 00:00:00 2001
+From: "James D. Mitchell" <jdm3@st-andrews.ac.uk>
+Date: Mon, 7 Apr 2025 14:30:27 +0200
+Subject: [PATCH] Try to resolve #557
+
+---
+ include/libsemigroups/detail/todd-coxeter-impl.hpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/include/libsemigroups/detail/todd-coxeter-impl.hpp b/include/libsemigroups/detail/todd-coxeter-impl.hpp
+index a8e66af50..253b0ba19 100644
+--- a/include/libsemigroups/detail/todd-coxeter-impl.hpp
++++ b/include/libsemigroups/detail/todd-coxeter-impl.hpp
+@@ -505,13 +505,16 @@ namespace libsemigroups {
+ ////////////////////////////////////////////////////////////////////////
+
+ #ifndef LIBSEMIGROUPS_PARSED_BY_DOXYGEN
+- // This is documented in Runner, so we don't duplicate the doc here.
+- template <typename T>
+- void report_every(T val) {
++ // This is documented in Reporter, so we don't duplicate the doc here.
++ template <typename Time>
++ void report_every(Time val) {
+ detail::CongruenceCommon::report_every(val);
+ _word_graph.report_every(val);
+ }
+- using Reporter::report_every;
++
++ [[nodiscard]] nanoseconds report_every() const noexcept {
++ return Reporter::report_every();
++ }
+ #endif
+
+ //! \ingroup todd_coxeter_class_settings_group
diff --git a/sci-libs/libsemigroups/libsemigroups-3.0.2.ebuild b/sci-libs/libsemigroups/libsemigroups-3.0.2.ebuild
index c463836802d5..b5db4bb9cba4 100644
--- a/sci-libs/libsemigroups/libsemigroups-3.0.2.ebuild
+++ b/sci-libs/libsemigroups/libsemigroups-3.0.2.ebuild
@@ -24,6 +24,8 @@ BDEPEND="eigen? ( dev-cpp/eigen )"
DEPEND="dev-libs/libfmt"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-gcc15-testfix.patch" )
+
src_prepare() {
# Remove bundled deps that we should not be using.
rm -rf third_party/fmt-* \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsemigroups/files/, sci-libs/libsemigroups/
@ 2025-07-29 22:43 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2025-07-29 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 98b794cb4c1f6b7b8127e21b91c6c6d93429e440
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 29 22:24:42 2025 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 22:41:12 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b794cb
sci-libs/libsemigroups: drop 2.7.3-r1
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-libs/libsemigroups/Manifest | 1 -
.../libsemigroups-2.7.3-gcc-15-buildfix.patch | 22 ----------------
.../libsemigroups/libsemigroups-2.7.3-r1.ebuild | 29 ----------------------
3 files changed, 52 deletions(-)
diff --git a/sci-libs/libsemigroups/Manifest b/sci-libs/libsemigroups/Manifest
index 199ec7c2fd25..0c7b984a221e 100644
--- a/sci-libs/libsemigroups/Manifest
+++ b/sci-libs/libsemigroups/Manifest
@@ -1,3 +1,2 @@
-DIST libsemigroups-2.7.3.tar.gz 2543883 BLAKE2B 02700cb9f132d7121ce42f978e9a1c01ed9f1957fab0da45c60837240639f7a049d3b7e1f9b989be71de8b85a669b475733aeb0e96760eda846b50db903da895 SHA512 001cfdfc55ee9a0bb3fe0914229905083e8eaaec682952bb23b2dc44680631909478bf32e67e93488a7347bfb674305b0cc3b713afa9bce1997a0b1a5693ad36
DIST libsemigroups-2.7.4.tar.gz 8682905 BLAKE2B afe04ad3de2e7fde508c16aebad5e435f66332aff5a1b005774065a0f91166942c237ff0beb6c6878567a9c5446ea546534e1d4dc27b4cf33eccce4d93ea9378 SHA512 c1af30bef6ad3b2a6d49c0eff5d604b72f7b2dabce482382640a8eca0bdfc6a1be7474c21f5b75214496191590bee4f379ba54159cc2b6d09ae90bb3444f6d23
DIST libsemigroups-3.0.3.tar.gz 12155044 BLAKE2B 32b8ad3485b44309712bb9aad26e9aa9e867bdc5910552f63af615a50c47834e49bad3282590917eb95f310f2d23e3d6b8cb3613f90c5050b7b530e935bf75f2 SHA512 5e3a9503bf7151c29aeff2a908219932796243acec2f4b91a1b3fa6e449e9cfbdfc6783c4ba46280ce1896b7c6410f13faf4db4f445bfe45d6538d1a68f2bef1
diff --git a/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch b/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch
deleted file mode 100644
index 40214b18b9ad..000000000000
--- a/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b7a413284e408280336ee681dd031877d779d0ea Mon Sep 17 00:00:00 2001
-From: "James D. Mitchell" <jdm3@st-andrews.ac.uk>
-Date: Mon, 29 Jul 2024 11:13:32 +0100
-Subject: [PATCH] sims: fix issue 557
-
----
- include/libsemigroups/sims1.tpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/libsemigroups/sims1.tpp b/include/libsemigroups/sims1.tpp
-index bc8bda372..698845222 100644
---- a/include/libsemigroups/sims1.tpp
-+++ b/include/libsemigroups/sims1.tpp
-@@ -619,7 +619,7 @@ namespace libsemigroups {
- typename Sims1<T>::iterator_base&
- Sims1<T>::iterator_base::operator=(Sims1<T>::iterator_base&& that) {
- _extra = std::move(that._extra);
-- _longs = std::move(that.long_rules());
-+ _longs = std::move(that._longs);
- _max_num_classes = std::move(that._max_num_classes);
- _min_target_node = std::move(that._min_target_node);
- _felsch_graph = std::move(that._felsch_graph);
diff --git a/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild b/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild
deleted file mode 100644
index 15469f067cb7..000000000000
--- a/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="C++ library for semigroups and monoids"
-HOMEPAGE="https://github.com/libsemigroups/libsemigroups"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-# Source headers have "or any later version"
-LICENSE="GPL-3+"
-SLOT="0/2"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="cpu_flags_x86_popcnt"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-15-buildfix.patch" )
-
-src_configure() {
- econf \
- $(use_enable cpu_flags_x86_popcnt popcnt) \
- --disable-eigen \
- --disable-hpcombi \
- --disable-fmt
-}
-
-src_install() {
- default
- find "${ED}" -type f -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-07-29 22:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-29 22:43 [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsemigroups/files/, sci-libs/libsemigroups/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2025-04-07 14:42 Michael Orlitzky
2024-07-30 20:11 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox