From e65a78b984f778056f1e8c25dc38b705d98bf682 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:26:54 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0fbdf5f6bf95e2965aaff84e265418214a14c0d8 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 16 Jan 2025 09:53:58 -0500 Subject: [PATCH 2/8] Fix a few typos that cause failure to compile with GCC 15 --- ...that-cause-failure-to-compile-with-G.patch | 41 +++++++++++++++++++ arbor.spec | 5 +++ 2 files changed, 46 insertions(+) create mode 100644 0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch diff --git a/0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch b/0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch new file mode 100644 index 0000000..d337a29 --- /dev/null +++ b/0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch @@ -0,0 +1,41 @@ +From 8880ff435f69b515a57e60e8b7434dad9e47847e Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Thu, 16 Jan 2025 09:49:20 -0500 +Subject: [PATCH] Fix a few typos that cause failure to compile with GCC 15 + +These were eventually included in +76120d16c00ae67128c3c69421ab712f985f3445, along with many other changes. +--- + arbor/include/arbor/util/expected.hpp | 2 +- + python/strprintf.hpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arbor/include/arbor/util/expected.hpp b/arbor/include/arbor/util/expected.hpp +index 9d860f65..1af88eb4 100644 +--- a/arbor/include/arbor/util/expected.hpp ++++ b/arbor/include/arbor/util/expected.hpp +@@ -486,7 +486,7 @@ struct expected { + // Swap ops. + + void swap(expected& other) { +- data_.swap(other.data); ++ data_.swap(other.data_); + } + + // Accessors. +diff --git a/python/strprintf.hpp b/python/strprintf.hpp +index 63801677..2ccf12c1 100644 +--- a/python/strprintf.hpp ++++ b/python/strprintf.hpp +@@ -168,7 +168,7 @@ namespace impl { + for (auto& x: s.seq_) { + if (!first) o << s.sep_; + first = false; +- o << s.f(x); ++ o << s.f_(x); + } + return o; + } +-- +2.47.1 + diff --git a/arbor.spec b/arbor.spec index 0710547..ebd3875 100644 --- a/arbor.spec +++ b/arbor.spec @@ -44,6 +44,11 @@ License: BSD-3-Clause Patch: 0001-Quote-various-cmake-var-values.patch # Tests are failing to compile due to some missing includes Patch: fix-missing-includes.patch +# Fix a few typos that cause failure to compile with GCC 15 +# +# These were eventually included in +# 76120d16c00ae67128c3c69421ab712f985f3445, along with many other changes. +Patch: 0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch # Random123 does not support: # mips64r2 mips32r2 s390 From a8a86bb6e2b0e10e806548f0e7d137460c3f267b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 22:57:55 +0200 Subject: [PATCH 3/8] Rebuilt for Python 3.14 From f00866be761625ef567ad22d64b4681e40eb6872 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:11:20 +0000 Subject: [PATCH 4/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From da8dc566a0becf9a0cf4c63d07a552d65de10cbc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:38:25 +0200 Subject: [PATCH 5/8] Rebuilt for Python 3.14.0rc2 bytecode From fb5798ff20cff15bf5e5e2be12e3b8cb8f905bd4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:07:31 +0200 Subject: [PATCH 6/8] Rebuilt for Python 3.14.0rc3 bytecode From 6e948adaf65b421b7cd945798d66f3f3d25e1fbc Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 3 Nov 2025 08:25:35 +0000 Subject: [PATCH 7/8] Remove pybind11 version check so we can use pybind11 3.0 --- arbor-0.9.0-pybind11-3.0.patch | 22 ++++++++++++++++++++++ arbor.spec | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 arbor-0.9.0-pybind11-3.0.patch diff --git a/arbor-0.9.0-pybind11-3.0.patch b/arbor-0.9.0-pybind11-3.0.patch new file mode 100644 index 0000000..6fc58db --- /dev/null +++ b/arbor-0.9.0-pybind11-3.0.patch @@ -0,0 +1,22 @@ +diff -Naur arbor-0.9.0-original/python/pyarb.hpp arbor-0.9.0/python/pyarb.hpp +--- arbor-0.9.0-original/python/pyarb.hpp 2023-08-10 10:47:38.000000000 +0100 ++++ arbor-0.9.0/python/pyarb.hpp 2025-11-03 08:24:00.093256311 +0000 +@@ -13,18 +13,6 @@ + + #include + +-// Version check +-#define mk_tok(x) #x +-#define mk_ver(M, m, p) mk_tok(M) "." mk_tok(m) "." mk_tok(p) +-#define PB11_ERR(M, m, p) "Required version of pybind11 is 2.8.1 <= version < 3.0.0 Found " mk_ver(M, m, p) +-static_assert((PYBIND11_VERSION_HEX >= 0x02080100) +- && +- (PYBIND11_VERSION_HEX < 0x03000000), +- PB11_ERR(PYBIND11_VERSION_MAJOR, PYBIND11_VERSION_MINOR, PYBIND11_VERSION_PATCH)); +-#undef PB11_ERR +-#undef mk_ver +-#undef mk_tok +- + namespace pyarb { + + // Sample recorder object interface. diff --git a/arbor.spec b/arbor.spec index ebd3875..8e76de4 100644 --- a/arbor.spec +++ b/arbor.spec @@ -49,6 +49,9 @@ Patch: fix-missing-includes.patch # These were eventually included in # 76120d16c00ae67128c3c69421ab712f985f3445, along with many other changes. Patch: 0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch +# Remove the hard-coded pybind11 version check so that we can build with +# pybind11 3.0; this is part of https://github.com/arbor-sim/arbor/pull/2481. +Patch: arbor-0.9.0-pybind11-3.0.patch # Random123 does not support: # mips64r2 mips32r2 s390 From 72e9933a9a4d03477802e939d9483be40e67e80f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:52:17 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild