music pushed to rpms/arbor (rawhide). "Add some missing #include
directives (..more)"
by notifications@fedoraproject.org
Notification time stamped 2023-01-19 15:32:12 UTC
From f6ca2c9dba54a87eac47e11fc97a829e4ec20d28 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Jan 19 2023 15:30:39 +0000
Subject: Add some missing #include directives
Fixes failure to compile with GCC 13.
---
diff --git a/2080.patch b/2080.patch
new file mode 100644
index 0000000..acb984d
--- /dev/null
+++ b/2080.patch
@@ -0,0 +1,33 @@
+From 884c568f96bc10079f28f4b2b7c8fc120c020053 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code(a)musicinmybrain.net>
+Date: Thu, 19 Jan 2023 10:10:21 -0500
+Subject: [PATCH] Add some missing #include directives
+
+Fixes failure to compile with GCC 13.
+---
+ arbor/include/arbor/morph/primitives.hpp | 1 +
+ arbor/threading/threading.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/arbor/include/arbor/morph/primitives.hpp b/arbor/include/arbor/morph/primitives.hpp
+index 4be04670b..9d75060df 100644
+--- a/arbor/include/arbor/morph/primitives.hpp
++++ b/arbor/include/arbor/morph/primitives.hpp
+@@ -2,6 +2,7 @@
+
+ #include <algorithm>
+ #include <cstdlib>
++#include <cstdint>
+ #include <ostream>
+ #include <vector>
+
+diff --git a/arbor/threading/threading.cpp b/arbor/threading/threading.cpp
+index 552fda90a..4c786b867 100644
+--- a/arbor/threading/threading.cpp
++++ b/arbor/threading/threading.cpp
+@@ -1,4 +1,5 @@
+ #include <atomic>
++#include <stdexcept>
+
+ #include <arbor/assert.hpp>
+ #include <arbor/util/scope_exit.hpp>
diff --git a/arbor.spec b/arbor.spec
index b4a120a..b6f2482 100644
--- a/arbor.spec
+++ b/arbor.spec
@@ -35,7 +35,11 @@ Source1: https://raw.githubusercontent.com/arbor-sim/arbor/master/scripts
Source2: https://raw.githubusercontent.com/arbor-sim/arbor/master/scripts/run_cpp_...
License: BSD
-Patch1: 0001-Quote-various-cmake-var-values.patch
+Patch: 0001-Quote-various-cmake-var-values.patch
+# Add some missing #include directives
+# Fixes failure to compile with GCC 13.
+# https://github.com/arbor-sim/arbor/pull/2080
+Patch: %{forgeurl}/pull/2080.patch
# Random123 does not support:
# mips64r2 mips32r2 s390
@@ -136,8 +140,7 @@ Provides: arbor-openmpi-static = %{version}-%{release}
%endif
%prep
-%forgesetup
-%patch1 -p1
+%forgeautosetup -p1
# correct catalogue location
sed -i 's|dummy-catalogue.so|lib/dummy-catalogue.so|' python/test/unit/test_catalogues.py
https://src.fedoraproject.org/rpms/arbor/c/f6ca2c9dba54a87eac47e11fc97a82...
1 year, 4 months