summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina <zerochaos@gentoo.org>2020-12-17 11:20:29 -0500
committerRick Farina <zerochaos@gentoo.org>2020-12-17 11:20:40 -0500
commit6c3860ee42cf5094869af7344f729f3e1c3d9a16 (patch)
tree720cc7edaeeeb554e6cb4e9cdbf692429bff0a7b /net-wireless/gnuradio
parentmedia-sound/supercollider: Bump to 3.11.2 (diff)
downloadgentoo-6c3860ee42cf5094869af7344f729f3e1c3d9a16.tar.gz
gentoo-6c3860ee42cf5094869af7344f729f3e1c3d9a16.tar.bz2
gentoo-6c3860ee42cf5094869af7344f729f3e1c3d9a16.zip
net-wireless/gnuradio: bug #751259
I had hoped that upstream would make a release for this, but they haven't yet and I'm tired of waiting. Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Rick Farina <zerochaos@gentoo.org>
Diffstat (limited to 'net-wireless/gnuradio')
-rw-r--r--net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch58
-rw-r--r--net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild1
2 files changed, 59 insertions, 0 deletions
diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch
new file mode 100644
index 000000000000..bee81049e24e
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch
@@ -0,0 +1,58 @@
+From cbcb968358fad56f3646619b258f18b0e6693a07 Mon Sep 17 00:00:00 2001
+From: Jeff Long <willcode4@gmail.com>
+Date: Wed, 25 Nov 2020 09:44:55 -0500
+Subject: [PATCH 1/2] Boost placeholder scope required (using
+ boost::placeholders)
+
+---
+ gnuradio-runtime/include/gnuradio/basic_block.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h
+index 1d31e2e9b8..0aace8f38d 100644
+--- a/gnuradio-runtime/include/gnuradio/basic_block.h
++++ b/gnuradio-runtime/include/gnuradio/basic_block.h
+@@ -41,7 +41,7 @@
+ #include <gnuradio/rpcregisterhelpers.h>
+
+ namespace gr {
+-
++using namespace boost::placeholders;
+ /*!
+ * \brief The abstract base class for all signal processing blocks.
+ * \ingroup internal
+
+From 951b16756934f28bc3da4b3c442651b2fbe79b05 Mon Sep 17 00:00:00 2001
+From: Jeff Long <willcode4@gmail.com>
+Date: Wed, 25 Nov 2020 11:05:56 -0500
+Subject: [PATCH 2/2] boost bind: make placeholder namespace conditional on
+ boost version
+
+---
+ gnuradio-runtime/include/gnuradio/basic_block.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h
+index 0aace8f38d..c57c1cf553 100644
+--- a/gnuradio-runtime/include/gnuradio/basic_block.h
++++ b/gnuradio-runtime/include/gnuradio/basic_block.h
+@@ -33,6 +33,9 @@
+ #include <boost/foreach.hpp>
+ #include <boost/function.hpp>
+ #include <boost/thread/condition_variable.hpp>
++#if (BOOST_VERSION >= 106000)
++#include <boost/bind/bind.hpp>
++#endif
+ #include <deque>
+ #include <iostream>
+ #include <map>
+@@ -41,7 +44,9 @@
+ #include <gnuradio/rpcregisterhelpers.h>
+
+ namespace gr {
++#if (BOOST_VERSION >= 106000)
+ using namespace boost::placeholders;
++#endif
+ /*!
+ * \brief The abstract base class for all signal processing blocks.
+ * \ingroup internal
diff --git a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
index 601ceea4ed97..81a61888d726 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
@@ -119,6 +119,7 @@ PATCHES=(
"${FILESDIR}/gnuradio-3.8.2.0-lamda-gr-uhd.patch"
"${FILESDIR}/gnuradio-3.8.2.0-lamda-most-components.patch"
"${FILESDIR}/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch"
+ "${FILESDIR}/gnuradio-3.8.2.0-3967.patch"
)
src_prepare() {