commit: f61d916a311ab33f4baac7053d0ad3d28b87d6ee Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com> AuthorDate: Mon Jan 6 04:28:29 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 8 09:24:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61d916a
net-wireless/gnuradio: fix build w/ libfmt-11.0 patch from upstream Closes: https://bugs.gentoo.org/947618 Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40002 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/gnuradio-3.10.9.2-libfmt-11.patch | 50 ++++++++++++++++++++++ net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild | 7 ++- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch b/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch new file mode 100644 index 000000000000..60304a36ea16 --- /dev/null +++ b/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch @@ -0,0 +1,50 @@ +From 19b070051c1c2b5fb6f2da8fb6422b27418c3dfa Mon Sep 17 00:00:00 2001 +From: Kefu Chai <tchai...@gmail.com> +Date: Mon, 15 Jul 2024 09:27:16 +0800 +Subject: [PATCH] blocks,runtime: io_signature: include spdlog/*/ranges.h for + using fmt::join() + +fmt::join() was moved into fmt/ranges.h since fmt 11, so let's +include the corresponding header in spdlog for using it. + +Signed-off-by: Kefu Chai <tchai...@gmail.com> +--- + gnuradio-runtime/lib/io_signature.cc | 5 +++++ + gr-blocks/lib/message_debug_impl.cc | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/gnuradio-runtime/lib/io_signature.cc b/gnuradio-runtime/lib/io_signature.cc +index 812f444f8..76bb2aba6 100644 +--- a/gnuradio-runtime/lib/io_signature.cc ++++ b/gnuradio-runtime/lib/io_signature.cc +@@ -16,6 +16,11 @@ + #include <spdlog/tweakme.h> + + #include <spdlog/fmt/fmt.h> ++#if __has_include(<spdlog/fmt/ranges.h>) ++#include <spdlog/fmt/ranges.h> ++#elif __has_include(<spdlog/fmt/bundled/ranges.h>) ++#include <spdlog/fmt/bundled/ranges.h> ++#endif + #include <string_view> + #include <algorithm> + #include <memory> +diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc +index 41d312e43..373287b02 100644 +--- a/gr-blocks/lib/message_debug_impl.cc ++++ b/gr-blocks/lib/message_debug_impl.cc +@@ -19,6 +19,11 @@ + #include <pmt/pmt.h> + #include <spdlog/common.h> + #include <spdlog/fmt/fmt.h> ++#if __has_include(<spdlog/fmt/ranges.h>) ++#include <spdlog/fmt/ranges.h> ++#elif __has_include(<spdlog/fmt/bundled/ranges.h>) ++#include <spdlog/fmt/bundled/ranges.h> ++#endif + #include <functional> + #include <utility> + #include <vector> +-- +2.45.2 + diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild index f4eaff739bf2..e2b0ef2bca50 100644 --- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -131,7 +131,10 @@ DEPEND="${RDEPEND} zeromq? ( net-libs/cppzmq ) " -PATCHES=( "${FILESDIR}/PR7093.patch" ) +PATCHES=( + "${FILESDIR}/PR7093.patch" + "${FILESDIR}"/${PN}-3.10.9.2-libfmt-11.patch +) src_prepare() { xdg_environment_reset #534582
