From e8ad70b640fa0d77e13b36c2271609c4205e1127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 26 Aug 2022 17:00:31 +0700 Subject: [PATCH] gnuradio: rebuild for boost-1.80 --- .../gnuradio/patches/boost-1.80-fmt-9.patch | 79 +++++++++++++++++++ srcpkgs/gnuradio/template | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch new file mode 100644 index 00000000000..a0c3f6d4701 --- /dev/null +++ b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch @@ -0,0 +1,79 @@ +Upstream: no + +Honestly, I don't care much. I tries to print as much as it makes sense +--- a/gnuradio-runtime/include/gnuradio/logger.h ++++ b/gnuradio-runtime/include/gnuradio/logger.h +@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr + #include + #include + #include ++#include ++#include ++#include + + #include + +@@ -285,6 +288,52 @@ struct fmt::formatter : f + } + }; + ++namespace fmt { ++template ++struct formatter< ++ T, ++ typename std::enable_if< ++ std::is_convertible< ++ decltype(std::declval().identifier()), ++ std::string ++ >::value, ++ char ++ >::type > : fmt::formatter { ++ template ++ auto format(const T& value, FormatCtx& ctx) ++ -> decltype(fmt::formatter::format(value.identifier(), ctx)) ++ { ++ return fmt::formatter::format(value.identifier(), ctx); ++ } ++}; ++template ++struct formatter, Ch> : fmt::formatter { ++ template ++ auto format(const std::shared_ptr& ptr, FormatCtx& ctx) ++ -> decltype(fmt::formatter::format(fmt::ptr(ptr), ctx)) ++ { ++ return fmt::formatter::format(fmt::ptr(ptr), ctx); ++ } ++}; ++template ++struct formatter< ++ std::shared_ptr, ++ typename std::enable_if< ++ std::is_convertible< ++ decltype(std::declval().identifier()), ++ std::string ++ >::value, ++ char ++ >::type > : fmt::formatter { ++ template ++ auto format(const std::shared_ptr& ptr, FormatCtx& ctx) ++ -> decltype(fmt::formatter::format(ptr->identifier(), ctx)) ++ { ++ return fmt::formatter::format(ptr->identifier(), ctx); ++ } ++}; ++} ++ + #endif + + #endif /* INCLUDED_GR_LOGGER_H */ +--- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc ++++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc +@@ -15,7 +15,7 @@ + /* BINDTOOL_GEN_AUTOMATIC(0) */ + /* BINDTOOL_USE_PYGCCXML(0) */ + /* BINDTOOL_HEADER_FILE(logger.h) */ +-/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */ ++/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */ + /***********************************************************************************/ + + #include diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 43ae4e1cb1b..973339f9292 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.10.3.0 -revision=1 +revision=2 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax