<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/744522eb4a6b6f0b2ce97886e3da4e6aa410d1b7">https://github.com/macports/macports-ports/commit/744522eb4a6b6f0b2ce97886e3da4e6aa410d1b7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 744522eb4a6b6f0b2ce97886e3da4e6aa410d1b7
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Jun 11 15:08:31 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> spice-gtk: specify Python version used for build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62212
</span>---
gnome/spice-gtk/Portfile | 20 +++++++++++++++-----
gnome/spice-gtk/files/patch-meson-python.diff | 22 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 5 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 803e9f92abc..77424db5b81 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;'>@@ -6,7 +6,7 @@ PortGroup meson 1.0
</span>
name spice-gtk
version 0.38
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
categories gnome devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,12 +34,22 @@ checksums rmd160 a9e44097fa0b7cc0b658e39a879fec205d9288f2 \
</span>
patchfiles no-werror.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version 3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_ver_no_dot [string map {. {}} ${python_version}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON_BIN@@|${prefix}/bin/python${python_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/meson.build ${worksrcpath}/subprojects/spice-common/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-six \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-parsing \
</span> port:intltool \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_ver_no_dot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_ver_no_dot}-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_ver_no_dot}-parsing \
</span> port:vala
depends_lib-append port:spice-protocol \
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6d00ebe4d52
</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-meson-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/meson.build.orig 2020-03-16 08:39:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/meson.build 2021-06-11 17:21:21.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -298,7 +298,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # keymaps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- python = import('python').find_installation()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ python = import('python').find_installation('@@PYTHON_BIN@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keymaps = ['xorgevdev',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'xorgkbd',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'xorgxquartz',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- subprojects/spice-common/meson.build.orig 2021-06-11 17:23:21.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ subprojects/spice-common/meson.build 2021-06-11 17:23:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_module = import('python')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python = py_module.find_installation()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python = py_module.find_installation('@@PYTHON_BIN@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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></pre><pre style='margin:0'>
</pre>