<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a65887fc80ea2fda532ecb30690cee35ef563984">https://github.com/macports/macports-ports/commit/a65887fc80ea2fda532ecb30690cee35ef563984</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a65887fc80ea2fda532ecb30690cee35ef563984
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Nov 4 22:51:29 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    spice-gtk: fix build failure due to pyparsing
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/63751
</span>---
 gnome/spice-gtk/Portfile                                    |  3 ++-
 ...atch-pyparsing-subprojects_spice-common_meson.build.diff | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

<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 092671b0490..99407f31ebd 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;'>@@ -33,7 +33,8 @@ 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:#e0ffe0;'>+patchfiles-append   patch-meson-python.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-pyparsing-subprojects_spice-common_meson.build.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-pyparsing-subprojects_spice-common_meson.build.diff b/gnome/spice-gtk/files/patch-pyparsing-subprojects_spice-common_meson.build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..23fad51e65a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/spice-gtk/files/patch-pyparsing-subprojects_spice-common_meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Build fails with pyparsing 3.x branch, see:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.freedesktop.org/spice/spice-common/-/issues/5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- subprojects/spice-common/meson.build.orig      2021-11-04 22:47:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ subprojects/spice-common/meson.build   2021-11-04 22:48:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,7 +132,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if get_option('python-checks')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     foreach module : ['six', 'pyparsing']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       message('Checking for python module @0@'.format(module))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      cmd = run_command(python, '-m', module)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      cmd = run_command(python, '-c', 'import @0@'.format(module))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if cmd.returncode() != 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         error('Python module @0@ not found'.format(module))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       endif
</span></pre><pre style='margin:0'>

</pre>