summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2024-01-20 09:19:02 +0100
committerConrad Kostecki <conikost@gentoo.org>2024-01-20 22:21:46 +0100
commit9c1bed70c098610a510b99a747ca0486a2e16599 (patch)
treeda567bdb23fd1f41016f5e08e2d52e65fda002cd /net-wireless
parentnet-firewall/ipset: remove unused patch (diff)
downloadgentoo-9c1bed70c098610a510b99a747ca0486a2e16599.tar.gz
gentoo-9c1bed70c098610a510b99a747ca0486a2e16599.tar.bz2
gentoo-9c1bed70c098610a510b99a747ca0486a2e16599.zip
net-wireless/gnuradio: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-fmt-v9.patch145
-rw-r--r--net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch26
-rw-r--r--net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch20
3 files changed, 0 insertions, 191 deletions
diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-fmt-v9.patch b/net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-fmt-v9.patch
deleted file mode 100644
index 7b17021213d8..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-fmt-v9.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From e63ee41fd455cdd39ae983c258d8632c3ea57fc6 Mon Sep 17 00:00:00 2001
-From: Huang Rui <vowstar@gmail.com>
-Date: Sun, 7 Aug 2022 22:06:30 +0800
-Subject: [PATCH] Fix build failures with libfmt-9.0.0
-
-libfmt-9.0.0 require explicit tagging of ARG types. This commit
-adds those tags for the types that are currently formatted via fmt.
-
-Bug: https://bugs.gentoo.org/858659
-Closes: https://github.com/gnuradio/gnuradio/issues/6052
-Signed-off-by: Huang Rui <vowstar@gmail.com>
----
- gnuradio-runtime/lib/flat_flowgraph.cc | 25 ++++++++++++++++++++++
- gnuradio-runtime/lib/flowgraph.cc | 10 +++++++++
- gnuradio-runtime/lib/hier_block2_detail.cc | 19 ++++++++++++++++
- gr-analog/lib/sig_source_impl.cc | 10 +++++++++
- gr-uhd/lib/usrp_block_impl.cc | 7 ++++++
- 5 files changed, 71 insertions(+)
-
-diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc
-index 42875fb4c32..ac7c8ce9109 100644
---- a/gnuradio-runtime/lib/flat_flowgraph.cc
-+++ b/gnuradio-runtime/lib/flat_flowgraph.cc
-@@ -25,6 +25,31 @@
- #include <map>
- #include <numeric>
-
-+#if FMT_VERSION >= 90000
-+#include <fmt/ostream.h>
-+template <>
-+struct fmt::formatter<gr::edge> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<gr::msg_endpoint> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<std::shared_ptr<gr::block_detail>> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<std::shared_ptr<gr::buffer_reader>> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<std::shared_ptr<gr::buffer>> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter {
-+};
-+#endif // FMT_VERSION >= 90000
-+
- namespace gr {
-
-
-diff --git a/gnuradio-runtime/lib/flowgraph.cc b/gnuradio-runtime/lib/flowgraph.cc
-index 0bc04adc22c..6c63b834a89 100644
---- a/gnuradio-runtime/lib/flowgraph.cc
-+++ b/gnuradio-runtime/lib/flowgraph.cc
-@@ -20,6 +20,16 @@
- // TODO: Replace with GNU Radio logging
- #include <iostream>
-
-+#if FMT_VERSION >= 90000
-+#include <fmt/ostream.h>
-+template <>
-+struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter {
-+};
-+#endif // FMT_VERSION >= 90000
-+
- namespace gr {
-
- edge::~edge() {}
-diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc
-index 5cb42030dca..d3e27aee5b4 100644
---- a/gnuradio-runtime/lib/hier_block2_detail.cc
-+++ b/gnuradio-runtime/lib/hier_block2_detail.cc
-@@ -22,6 +22,25 @@
- // TODO: Replace with GNU Radio logging
- #include <iostream>
-
-+#if FMT_VERSION >= 90000
-+#include <fmt/ostream.h>
-+template <>
-+struct fmt::formatter<gr::edge> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<gr::endpoint> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<gr::msg_endpoint> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter {
-+};
-+#endif // FMT_VERSION >= 90000
-+
- namespace gr {
-
- hier_block2_detail::hier_block2_detail(hier_block2* owner)
-diff --git a/gr-analog/lib/sig_source_impl.cc b/gr-analog/lib/sig_source_impl.cc
-index 0e1db81648a..afa6d779cb0 100644
---- a/gr-analog/lib/sig_source_impl.cc
-+++ b/gr-analog/lib/sig_source_impl.cc
-@@ -21,6 +21,16 @@
- #include <algorithm>
- #include <stdexcept>
-
-+#if FMT_VERSION >= 90000
-+#include <fmt/ostream.h>
-+template <>
-+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter {
-+};
-+template <>
-+struct fmt::formatter<gr::analog::gr_waveform_t&> : ostream_formatter {
-+};
-+#endif // FMT_VERSION >= 90000
-+
- namespace gr {
- namespace analog {
-
-diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc
-index cb6dccfcdea..b11b82a9e70 100644
---- a/gr-uhd/lib/usrp_block_impl.cc
-+++ b/gr-uhd/lib/usrp_block_impl.cc
-@@ -12,6 +12,13 @@
- #include <chrono>
- #include <thread>
-
-+#if FMT_VERSION >= 90000
-+#include <fmt/ostream.h>
-+template <>
-+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter {
-+};
-+#endif // FMT_VERSION >= 90000
-+
- using namespace gr::uhd;
- using namespace std::chrono_literals;
-
diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch b/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch
deleted file mode 100644
index b2c8270338c5..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-index 9d4e0f2..f6b8bc6 100644
---- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-@@ -12,7 +12,8 @@
- #define INCLUDED_GR_BLOCKS_BLOCKINTERLEAVING_H
-
- #include <gnuradio/blocks/api.h>
--
-+#include <cstddef>
-+#include <vector>
-
- namespace gr {
- namespace blocks {
-diff --git a/gr-blocks/lib/blockinterleaving.cc b/gr-blocks/lib/blockinterleaving.cc
-index fc5873e..768ad9e 100644
---- a/gr-blocks/lib/blockinterleaving.cc
-+++ b/gr-blocks/lib/blockinterleaving.cc
-@@ -12,6 +12,7 @@
- #include <spdlog/fmt/fmt.h>
- #include <algorithm>
- #include <numeric>
-+#include <vector>
-
- namespace gr {
- namespace blocks {
diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch b/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch
deleted file mode 100644
index 6252d96fd8b5..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Christian Inci <chris.gh@broke-the-inter.net>
-Date: Mon May 15 21:26:05 2023 +0200
-Upstream: https://github.com/gnuradio/gnuradio/pull/6667
-
- Include cstdint in gr-fec's alist.h
-
- GCC 13 will error out otherwise.
-
- Signed-off-by: Christian Inci <chris.gh@broke-the-inter.net>
-
---- a/gr-fec/include/gnuradio/fec/alist.h
-+++ b/gr-fec/include/gnuradio/fec/alist.h
-@@ -23,6 +23,7 @@
- #define ALIST_H
-
- #include <gnuradio/fec/api.h>
-+#include <cstdint>
- #include <cstdlib>
- #include <fstream>
- #include <sstream>