<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5bcc5bfb99f546a24b7f083f37a02ac289cd55a6">https://github.com/macports/macports-ports/commit/5bcc5bfb99f546a24b7f083f37a02ac289cd55a6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5bcc5bfb99f gnuradio: update to 3.8.2.0
</span>5bcc5bfb99f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5bcc5bfb99f546a24b7f083f37a02ac289cd55a6
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat Aug 22 16:49:48 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio: update to 3.8.2.0
</span>---
science/gnuradio/Portfile | 18 ++--
.../patch-fix-digital_lib_map_bb_impl.38.diff | 31 -------
science/gnuradio/files/patch-use_meta_key.diff | 98 ----------------------
3 files changed, 5 insertions(+), 142 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/Portfile b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 740f7bbd897..5cc54628d14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +22,11 @@ compiler.cxx_standard 2011
</span>
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio 3.8.1.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4c4a4eb71cf4ed7f3782167a17e979059103d99a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 97763da635063d472eae7cbb7680f36c69359ea5b88348d26f8fa7f8b5e7289a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3377964
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio 3.8.2.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 0e3582fdca19c219e4f158f15bde4c943310fa97 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c9aa8795f76075484dc50fcbad89988a39c91610c80d72182650b700a1529fd3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3381987
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
long_description ${description}: \
This port is kept up with the GNU Radio release, \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,14 +52,6 @@ if {${subport} eq ${name}} {
</span> patchfiles-append \
patch-quartz_drag_n_drop.38.diff \
patch-quartz_drop_crash.38.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # REMOVE with next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use Meta as modifier key
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-use_meta_key.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix building using certain "static const"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # declarations on older compilers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-digital_lib_map_bb_impl.38.diff
</span>
set GR_VERSION_INFO "Release 3.8"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix-digital_lib_map_bb_impl.38.diff b/science/gnuradio/files/patch-fix-digital_lib_map_bb_impl.38.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d95132e3f4c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fix-digital_lib_map_bb_impl.38.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gr-digital/lib/map_bb_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gr-digital/lib/map_bb_impl.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,6 +35,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return gnuradio::get_initial_sptr(new map_bb_impl(map));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+const size_t map_bb_impl::s_map_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- map_bb_impl::map_bb_impl(const std::vector<int>& map)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : sync_block("map_bb",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- io_signature::make(1, 1, sizeof(unsigned char)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gr::thread::scoped_lock guard(d_mutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (int i = 0; i < s_map_size; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (unsigned int i = 0; i < s_map_size; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d_map[i] = i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gr-digital/lib/map_bb_impl.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gr-digital/lib/map_bb_impl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class map_bb_impl : public map_bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static constexpr size_t s_map_size = 0x100;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const size_t s_map_size = 0x100;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned char d_map[s_map_size];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mutable gr::thread::mutex d_mutex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-use_meta_key.diff b/science/gnuradio/files/patch-use_meta_key.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index aa2d23c0b6c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-use_meta_key.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,98 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 859a205e307e99eab0c7ba56175cdb1e3c7c184b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Davide Gerhard <rainbow@irh.it>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 14 Apr 2020 10:01:33 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] gnuradio-companion: add Meta modifier key for macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-implements support for the Meta key on macOS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Others platforms continue to use Ctrl.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- grc/gui/Actions.py | 6 +++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- grc/gui/Dialogs.py | 4 +++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- grc/gui/Utils.py | 22 ++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 30 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cf81e63ac7..edbc4f8405 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- grc/gui/Actions.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ grc/gui/Actions.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,6 +13,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi.repository import Gtk, Gdk, Gio, GLib, GObject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from . import Utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log = logging.getLogger(__name__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,7 +126,10 @@ def __init__(self, name, parameter=None, label=None, tooltip=None,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.label = label
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.tooltip = tooltip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.icon_name = icon_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.keypresses = keypresses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if keypresses:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.keypresses = [kp.replace("<Ctrl>", Utils.get_modifier_key(True)) for kp in keypresses]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.keypresses = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.prefix = prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.preference_name = preference_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.default = default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index af8e0230f1..f55d21bdb8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- grc/gui/Dialogs.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ grc/gui/Dialogs.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -287,9 +287,10 @@ def show_help(parent):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <u>Remove connection</u>: select the connection and press delete, or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- drag the connection.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *Press CTRL+K or see menu for Keyboard - Shortcuts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *Press Ctrl+K or see menu for Keyboard - Shortcuts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ markup = markup.replace("Ctrl", Utils.get_modifier_key())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MessageDialogWrapper(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parent, Gtk.MessageType.INFO, Gtk.ButtonsType.CLOSE, title='Help', markup=markup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -328,6 +329,7 @@ def show_keyboard_shortcuts(parent):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- selected block.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ markup = markup.replace("Ctrl", Utils.get_modifier_key())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MessageDialogWrapper(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parent, Gtk.MessageType.INFO, Gtk.ButtonsType.CLOSE, title='Keyboard - Shortcuts', markup=markup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/grc/gui/Utils.py b/grc/gui/Utils.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index acfe054cfc..5d710532bd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- grc/gui/Utils.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ grc/gui/Utils.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,6 +8,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from __future__ import absolute_import
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from sys import platform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import numbers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi.repository import GLib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,3 +153,24 @@ def scale(coor, reverse=False):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def scale_scalar(coor, reverse=False):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- factor = Constants.DPI_SCALING if not reverse else 1 / Constants.DPI_SCALING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return int(coor * factor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def get_modifier_key(angle_brackets=False):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Get the modifier key based on platform.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Args:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ angle_brackets: if return the modifier key with <> or not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Returns:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return the string with the modifier key
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if platform == "darwin":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if angle_brackets:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "<Meta>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "Meta"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if angle_brackets:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "<Ctrl>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "Ctrl"
</span></pre><pre style='margin:0'>
</pre>