<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d36cc45de5bf4cdab5e24a52fe55e87fe0da7f96">https://github.com/macports/macports-ports/commit/d36cc45de5bf4cdab5e24a52fe55e87fe0da7f96</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d36cc45de5bf4cdab5e24a52fe55e87fe0da7f96
</span>Author: Filippe LeMarchand <gasinvein@gmail.com>
AuthorDate: Wed Aug 31 20:16:15 2022 +0300

<span style='display:block; white-space:pre;color:#404040;'>    spice-gtk: update to 0.41
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * update to version 0.41
</span><span style='display:block; white-space:pre;color:#404040;'>    * rebase python interpreter select patch
</span><span style='display:block; white-space:pre;color:#404040;'>    * drop python module search patch
</span>---
 gnome/spice-gtk/Portfile                              | 13 ++++++-------
 gnome/spice-gtk/files/patch-meson-python.diff         | 19 ++++++++++++-------
 ...yparsing-subprojects_spice-common_meson.build.diff | 13 -------------
 3 files changed, 18 insertions(+), 27 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/spice-gtk/Portfile b/gnome/spice-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec0de11f77c..fb049a16c76 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/spice-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/spice-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,11 @@ PortGroup           active_variants 1.1
</span> PortGroup           meson 1.0
 
 name                spice-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             0.39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  488a6513a3f8140336d37ce691e05c698a5dfea5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  23acbee197eaaec9bce6e6bfd885bd8f79708332639243ff04833020865713cd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    845528
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             0.41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  4f66fd847ec37fc51fd9d36ef690d7f8629e0392 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  d8f8b5cbea9184702eeb8cc276a67d72acdb6e36e7c73349fb8445e5bca0969f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    827320
</span> 
 categories          gnome devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +30,7 @@ use_xz              yes
</span> set python_version  3.9
 set python_ver_no_dot [string map {. {}} ${python_version}]
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-meson-python.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-pyparsing-subprojects_spice-common_meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-meson-python.diff
</span> 
 post-patch {
     reinplace "s|@@PYTHON_BIN@@|${prefix}/bin/python${python_version}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/spice-gtk/files/patch-meson-python.diff b/gnome/spice-gtk/files/patch-meson-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f433d734824..9eab40d4396 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/spice-gtk/files/patch-meson-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/spice-gtk/files/patch-meson-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/meson.build.orig   2020-12-01 10:31:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/meson.build        2021-07-24 09:14:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -300,7 +300,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/meson.build src/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c742fde..4569647 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -300,7 +300,7 @@ if spice_gtk_has_gtk
</span>    endif
  
    # keymaps
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,13 +11,16 @@
</span>    keymaps = ['xorgevdev',
               'xorgkbd',
               'xorgxquartz',
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- subprojects/spice-common/meson.build.orig   2020-12-01 10:32:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ subprojects/spice-common/meson.build   2021-07-24 09:15:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,7 +127,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Submodule subprojects/spice-common contains modified content
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git subprojects/spice-common/meson.build subprojects/spice-common/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index eeccecd..dcef6c9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- subprojects/spice-common/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ subprojects/spice-common/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,7 +127,7 @@ endforeach
</span>  # Python
  if spice_common_generate_client_code or spice_common_generate_server_code
    py_module = import('python')
<span style='display:block; white-space:pre;background:#ffe0e0;'>--  python = py_module.find_installation()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  python = py_module.find_installation('python3')
</span> +  python = py_module.find_installation('@@PYTHON_BIN@@')
  
    if get_option('python-checks')
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/spice-gtk/files/patch-pyparsing-subprojects_spice-common_meson.build.diff b/gnome/spice-gtk/files/patch-pyparsing-subprojects_spice-common_meson.build.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 23fad51e65a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/spice-gtk/files/patch-pyparsing-subprojects_spice-common_meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Build fails with pyparsing 3.x branch, see:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.freedesktop.org/spice/spice-common/-/issues/5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- subprojects/spice-common/meson.build.orig      2021-11-04 22:47:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ subprojects/spice-common/meson.build   2021-11-04 22:48:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,7 +132,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   if get_option('python-checks')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     foreach module : ['six', 'pyparsing']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       message('Checking for python module @0@'.format(module))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--      cmd = run_command(python, '-m', module)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+      cmd = run_command(python, '-c', 'import @0@'.format(module))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       if cmd.returncode() != 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         error('Python module @0@ not found'.format(module))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       endif
</span></pre><pre style='margin:0'>

</pre>