<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/ba9ade52b881ae76834bba886482fafba5932d4d">https://github.com/macports/macports-ports/commit/ba9ade52b881ae76834bba886482fafba5932d4d</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 ba9ade52b88 gnuradio (3.8): add patch to fix Python3.6+ usage with SWIG41
</span>ba9ade52b88 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ba9ade52b881ae76834bba886482fafba5932d4d
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Feb 7 13:58:33 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> gnuradio (3.8): add patch to fix Python3.6+ usage with SWIG41
</span>---
science/gnuradio/Portfile | 8 +++--
.../gnuradio/files/patch-Py3-swig41-fixes.38.diff | 36 ++++++++++++++++++++++
2 files changed, 42 insertions(+), 2 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 78594c84484..8faff67fba6 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;'>@@ -19,7 +19,7 @@ if {${subport} eq ${name}} {
</span> checksums rmd160 098825a19d8962bac72f2f2e14fcdfee8500f307 \
sha256 dd336400034b57b7bce7b1fec6c5cd99f1e9dde7b78faa2cd28105877c213b14 \
size 3399901
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
long_description ${description}: \
This port is kept up with the GNU Radio release, \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,11 @@ if {${subport} eq ${name}} {
</span> patch-quartz_drop_crash.38.diff
# fix https://github.com/gnuradio/gnuradio/pull/3981
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-pkg-config.38.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-pkg-config.38.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix SWIG41 and Python3.6+ usage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/66389
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Py3-swig41-fixes.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-Py3-swig41-fixes.38.diff b/science/gnuradio/files/patch-Py3-swig41-fixes.38.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fa5d7b361db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-Py3-swig41-fixes.38.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/Modules/GrSwig.cmake.orig 2023-02-07 13:13:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/Modules/GrSwig.cmake 2023-02-07 13:13:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,16 +118,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(INSERT GR_SWIG_INCLUDE_DIRS 0 "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(INSERT GR_SWIG_INCLUDE_DIRS 0 "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (PYTHON3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(py3 "-py3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif (PYTHON3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #setup the swig flags with flags and include directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(modern_keyword "-modern")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("${SWIG_VERSION}" VERSION_GREATER "3.0.12")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(modern_keyword "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_SWIG_FLAGS -fvirtual ${modern_keyword} -keyword -w511 -w314 -relativeimport ${py3} -module ${name} ${GR_SWIG_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_SWIG_FLAGS -fvirtual ${modern_keyword} -keyword -w511 -w314 -relativeimport -module ${name} ${GR_SWIG_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #set the C++ property on the swig .i file so it builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_source_files_properties(${ifiles} PROPERTIES CPLUSPLUS ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./gnuradio-runtime/swig/gnuradio.i.orig 2023-02-07 13:09:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./gnuradio-runtime/swig/gnuradio.i 2023-02-07 13:12:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Disable warning about base class types
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma SWIG nowarn=401
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Turn on function annotations and variable annotations globally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Required Python 3.6 or newer. This fix is for MacPorts only,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// and we limit Python to 3.7 or newer, so we're safe here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// See also https://trac.macports.org/ticket/66389 and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// https://www.swig.org/Doc4.1/Python.html#Python_annotations_c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++%feature("python:annotations", "c");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ////////////////////////////////////////////////////////////////////////
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // gnuradio.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // SWIG interface definition
</span></pre><pre style='margin:0'>
</pre>