gentoo auto-resync : 17:08:2022 - 14:32:40

5 files changed, 203 insertions, 1 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 00f53d7662a3..99d3cfc9947b 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 6d013d295906..752f973ce6a5 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,6 +1,8 @@
+AUX gnuradio-3.10.3.0-fix-fmt-v9.patch 4393 BLAKE2B eb915d3e63a96e0527b8525da35fa6ad9870f7ed8b113b7aeda5d616e235a89937f2187e6bd862ec3703ba2d763ae0f0d4821ed0d27f3fba290af2e7c8c1eb92 SHA512 cb45360160325fb8904a7d2edf2eaf09143327c3133575f91cfe2fb41a4ce06102b1ba364ac5917fddd78b24ebc0038f1eabc02476e211429410a39242069851
+AUX gnuradio-3.10.3.0-fix-gcc12.patch 1846 BLAKE2B eccb753a970b759509537ce221e0ef7e2f086573ea7feea735feca66c3204bbf01274f4c7f1b7ba5b87bec1bcfb5099464bd2e9ecd4dfb6762e9cf6b27243c82 SHA512 106348f3f1284529052ee9c6a80d3cfae8745b7312d1ae74c153357c895d1249addf2d64b712e17ed384ee9a0e22224ded8e14f2714acbe127162da38da798da
 DIST gnuradio-3.10.3.0.tar.gz 4376594 BLAKE2B 676c16dda6c4b01ca922fe942e1572653c57dd8f6240ad74af2b10351470ad53ecc5c4a7347e04cb1c898388c48f561f7871c39140f77c50f9217963355793a6 SHA512 fe4cd2204257b65129f148bbdd6a1c192559b8824a131bd99cc2ac854e1880ee4fa07b702170452b3b6070df34d99db27ef0fe064c50e6e5a6335e61e38e6645
 DIST gnuradio-3.8.5.0.tar.gz 3399660 BLAKE2B 19e3eecb40d7cdafe6fe551d3d36c0fcd34bb92ceb316537f4ebdc1c90d3c649daa1383f3642e2f64bba23026ed6638168fa77da0f21db03330b066e3108c880 SHA512 9b367c8afeb278b90e8ddd835e0ba301f07a53da26791e74913c812bde251daaa8f9611f21969938b215c9a110c9e69dfb6ec8b6d0db9c64013707c57596819a
-EBUILD gnuradio-3.10.3.0.ebuild 6575 BLAKE2B d9dadb0262fc6dee8c5d19055b10ab22a2c09a23aeb6cf8610d7c86f8bbabd1bc35760cf73e1470b0e26703faf4d97e27eca188eed46ac57f71fe1156f97184c SHA512 2eab4b6acc89fb5179a2aa80f27d5cfd7cbc85f4055428c5f219c5f76b5d829c066501746865f9be56e86604ed17626c5db29cb468714655baf41df5f917d045
+EBUILD gnuradio-3.10.3.0.ebuild 6697 BLAKE2B e18dfe2726774362543e4b1f652eaf7aff6da8b8161a0725803a62923a3d6ce0c4122704fc16bd3254f77974b96917925b102bd074d617a4a5b0b44185006c3d SHA512 76afbbc6096ab75a1f472b41c59ef166bbe309a1d9b9ce85afd9a5e90bce10ed0c9fd308f4c4cceb036b708ce013fd3aaa9f81535b45875a7f431e3136f504c3
 EBUILD gnuradio-3.8.5.0-r1.ebuild 6179 BLAKE2B 0a80d18deaf566e360a3ac27f9f9be82b1ca77f863e55f63d33e2db2963be501fbb48ff40d803f517ab9d1d6942f70e1308403283ba02994869c583ce8a798cf SHA512 2cb684eb7e6ed1720789adb1a856b0b789d78973f288c02288ecfce734118f7d5d27feda40816981e9633ee925d23d4252317587941983ef1e6829654ffe4b7e
 EBUILD gnuradio-3.8.5.0.ebuild 6125 BLAKE2B 80ff9f450051087bf7d4801115097ca83423c9bb30149c416141bd09fd6b054d6c19a477a09dac84cbfecda14b731d48265e6be0ad50173bf8f47868b4025eab SHA512 5ec39ebc2b28a720a1c19573ad20ff2e7c4a992e3467c7ac999d47044ad212d6ef88f840dcc5cdf7526153656eba58c159c47a2e13c3c61459170788b9e7c74d
 EBUILD gnuradio-9999.ebuild 6575 BLAKE2B d9dadb0262fc6dee8c5d19055b10ab22a2c09a23aeb6cf8610d7c86f8bbabd1bc35760cf73e1470b0e26703faf4d97e27eca188eed46ac57f71fe1156f97184c SHA512 2eab4b6acc89fb5179a2aa80f27d5cfd7cbc85f4055428c5f219c5f76b5d829c066501746865f9be56e86604ed17626c5db29cb468714655baf41df5f917d045
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
new file mode 100644
index 000000000000..7b17021213d8
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-fmt-v9.patch
@@ -0,0 +1,145 @@
+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.3.0-fix-gcc12.patch b/net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-gcc12.patch
new file mode 100644
index 000000000000..5db69aa60a75
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-gcc12.patch
@@ -0,0 +1,50 @@
+From 9bf18900418e1d16e30072765bff1cbffdf8c0a9 Mon Sep 17 00:00:00 2001
+From: danielnachun <daniel.nachun@gmail.com>
+Date: Fri, 8 Jul 2022 12:53:47 -0700
+Subject: [PATCH] add missing includes
+
+Signed-off-by: danielnachun <daniel.nachun@gmail.com>
+---
+ gr-qtgui/lib/FrequencyDisplayPlot.cc | 2 +-
+ gr-qtgui/lib/VectorDisplayPlot.cc    | 2 ++
+ gr-qtgui/lib/WaterfallDisplayPlot.cc | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc
+index f6f673e7ec6..2171f26e7d8 100644
+--- a/gr-qtgui/lib/FrequencyDisplayPlot.cc
++++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc
+@@ -16,7 +16,7 @@
+ #include <gnuradio/qtgui/qtgui_types.h>
+ #include <qwt_scale_draw.h>
+ #include <QColor>
+-
++#include <cmath>
+ 
+ /***********************************************************************
+  * Widget to provide mouse pointer coordinate text
+diff --git a/gr-qtgui/lib/VectorDisplayPlot.cc b/gr-qtgui/lib/VectorDisplayPlot.cc
+index d5c2ecc27e5..2e5f3f422b9 100644
+--- a/gr-qtgui/lib/VectorDisplayPlot.cc
++++ b/gr-qtgui/lib/VectorDisplayPlot.cc
+@@ -25,6 +25,8 @@
+ #include <qwt_legend_label.h>
+ #endif /* QWT_VERSION < 0x060100 */
+ 
++#include <cmath>
++
+ /***********************************************************************
+  * Widget to provide mouse pointer coordinate text
+  **********************************************************************/
+diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc
+index 69d82fdae86..d999fe046da 100644
+--- a/gr-qtgui/lib/WaterfallDisplayPlot.cc
++++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc
+@@ -28,6 +28,7 @@
+ #endif /* QWT_VERSION < 0x060100 */
+ 
+ #include <QDebug>
++#include <cmath>
+ 
+ /***********************************************************************
+  * Text scale widget to provide Y (time) axis text
diff --git a/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild
index 87023a4ce0be..f9e22ca10894 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild
@@ -130,6 +130,11 @@ DEPEND="${RDEPEND}
 	zeromq? ( net-libs/cppzmq )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659
+	"${FILESDIR}/${PN}-3.10.3.0-fix-gcc12.patch" #858665
+)
+
 src_prepare() {
 	xdg_environment_reset #534582