Fix missing includes

[skip changelog]

0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch

@@ -1,41 +0,0 @@
-From 8880ff435f69b515a57e60e8b7434dad9e47847e Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-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<void, E> {
-     // 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
-

arbor-0.9.0-pybind11-3.0.patch

@@ -1,22 +0,0 @@
-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 <pybind11/pybind11.h>
- 
--// 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.

arbor.spec

@@ -44,14 +44,6 @@ 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
-# 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
@@ -73,6 +65,7 @@ BuildRequires:  python3-setuptools
 BuildRequires:  Random123-devel
 BuildRequires:  tclap-devel
 BuildRequires:  pugixml-devel
+Provides:       python3-arbor = %{version}-%{release}
 
 # For validation, but we don't have these BRs
 # BuildRequires:  julia julia-sundials julia-unitful julia-JSON
@@ -86,9 +79,6 @@ BuildRequires:  %{py3_dist seaborn}
 # Required by arbor
 Requires:       %{py3_dist numpy}
 
-# Provide Python meta data for packages requiring arbor
-%py_provides python3-arbor
-
 %description %{_description}
 
 %package devel