<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/8a3004bd6dff9b81b67bb16160072fd76a50b1b0">https://github.com/macports/macports-ports/commit/8a3004bd6dff9b81b67bb16160072fd76a50b1b0</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 8a3004bd6df mm-common: update to 1.0.6; switch to py 3.12
</span>8a3004bd6df is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8a3004bd6dff9b81b67bb16160072fd76a50b1b0
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Apr 19 14:11:12 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> mm-common: update to 1.0.6; switch to py 3.12
</span>---
gnome/mm-common/Portfile | 30 ++++--
gnome/mm-common/files/patch-meson-python3.diff | 22 +++++
gnome/mm-common/files/patch-use-our-python3.diff | 115 -----------------------
3 files changed, 43 insertions(+), 124 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/mm-common/Portfile b/gnome/mm-common/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 190ed3483b8..c5971c5ee23 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/mm-common/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/mm-common/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup meson 1.0
name mm-common
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0.6
</span> revision 0
categories gnome devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,16 +28,19 @@ set branch [join [lrange [split ${version} .] 0 1] .]
</span> master_sites gnome:sources/${name}/${branch}/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 705c6d29f4116a29bde4e36cfc1b046c92b6ef8c6dae4eaec85018747e6da5aa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 122bd124ca6e2cfd541c9902a069f0dbf6e71ce4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 290608
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 b55c46037dbcdabc5cee3b389ea11cc3910adb68ebe883e9477847aa660862e7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 dee3bcc1b20cdd776634d61cb6ade4ab552220b0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 287832
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set py_ver 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable unexpected download of subprojects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+meson.wrap_mode nodownload
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.12
</span> set py_ver_nodot [string map {. {}} ${py_ver}]
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gsed \
</span> port:curl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsed \
</span> port:wget
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,15 +48,24 @@ depends_lib-append \
</span>
configure.python ${prefix}/bin/python${py_ver}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#patchfiles-append patch-use-our-python3.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-python3.diff
</span> post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON3_BIN@@|${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson.build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skeletonmm/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python3$|${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ util/mm-common-get.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> fs-traverse f ${worksrcpath} {
if {[string match *.py ${f}]} {
ui_info "patching script: ${f}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|/usr/bin/env python3$|${configure.python}|" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python3$|${configure.python}|" ${f}
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Duse-network=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/mm-common/files/patch-meson-python3.diff b/gnome/mm-common/files/patch-meson-python3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d2b69546971
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/mm-common/files/patch-meson-python3.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;'>+--- meson.build.orig 2024-04-19 13:36:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2024-04-19 13:37:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and meson.add_install_script(python3, ...)
</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;'>+-python3 = find_program('python3', version: '>= 3.5')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python3 = find_program('@@PYTHON3_BIN@@', version: '>= 3.5')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use these instead of meson.source_root() and meson.build_root().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # source_root() and build_root() are not useful, if this is a subproject.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- skeletonmm/meson.build.orig 2024-04-19 13:40:40.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ skeletonmm/meson.build 2024-04-19 13:41:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project_source_root = meson.project_source_root()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project_build_root = meson.project_build_root()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python3 = find_program('python3', version: '>= 3.5')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python3 = find_program('@@PYTHON3_BIN@@', version: '>= 3.5')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do we build from a git repository?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Suppose we do if and only if the meson.build file is tracked by git.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/mm-common/files/patch-use-our-python3.diff b/gnome/mm-common/files/patch-use-our-python3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 43c3370fbbf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/mm-common/files/patch-use-our-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,115 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2022-02-11 09:09:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2022-09-13 11:29:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and meson.add_install_script(python3, ...)
</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;'>--python3 = import('python').find_installation()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+python3 = import('python').find_installation('@@PYTHON3_BIN@@')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python_version = python3.language_version()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python_version_req = '>= 3.5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not python_version.version_compare(python_version_req)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/mm-common-get.in.orig 2019-10-29 10:37:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/mm-common-get.in 2020-03-27 14:49:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2019 The gtkmm Development Team
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/build_scripts/dist-build-scripts.py.orig 2019-10-29 10:37:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/build_scripts/dist-build-scripts.py 2020-03-27 14:50:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # External command, intended to be called with meson.add_dist_script() in meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/build_scripts/doc-reference.py.orig 2022-02-11 08:09:51.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/build_scripts/doc-reference.py 2022-10-26 22:47:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # External command, intended to be called with run_command(), custom_target(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # meson.add_install_script() or meson.add_dist_script() in meson.build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/build_scripts/dist-changelog.py.orig 2019-10-29 10:37:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/build_scripts/dist-changelog.py 2020-03-27 14:52:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # External command, intended to be called with meson.add_dist_script() in meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/build_scripts/generate-binding.py.orig 2019-10-29 10:37:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/build_scripts/generate-binding.py 2020-03-27 14:53:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # External command, intended to be called with run_command(), custom_target(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # meson.add_install_script() and meson.add_dist_script().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/build_scripts/check-dllexport-usage.py.orig 2022-09-18 13:51:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/build_scripts/check-dllexport-usage.py 2022-09-18 13:59:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check for the first line in a file generated with gmmproc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to see which gmmproc version was used, to see whether
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/doc_install.py.orig 2022-02-11 09:09:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/doc_install.py 2022-09-18 13:59:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # doc_install.py [OPTION]... [-T] SOURCE DEST
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # doc_install.py [OPTION]... SOURCE... DIRECTORY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/doc_postprocess.py.orig 2022-02-11 09:09:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/doc_postprocess.py 2022-09-18 13:59:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # doc_postprocess.py [-h|--help] <pattern>...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/meson_aux/copy-files.py.orig 2022-02-11 09:09:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/meson_aux/copy-files.py 2022-09-18 13:59:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # External command, intended to be called with run_command() in meson.build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/meson_aux/extra-dist-cmd.py.orig 2022-02-11 09:09:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/meson_aux/extra-dist-cmd.py 2022-09-18 13:59:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # External command, intended to be called with meson.add_dist_script() in meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/meson_aux/extra-install-cmd.py.orig 2022-02-11 09:09:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/meson_aux/extra-install-cmd.py 2022-09-18 13:59:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # External command, intended to be called with meson.add_install_script() in meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/meson_aux/libstdcxx-tag.py.orig 2022-02-11 09:09:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/meson_aux/libstdcxx-tag.py 2022-09-18 13:59:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # External command, intended to be called with custom_target() in meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/meson_aux/skeletonmm-tarball.py.orig 2022-02-11 09:09:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/meson_aux/skeletonmm-tarball.py 2022-09-18 13:59:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PYTHON3_BIN@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # External command, intended to be called with run_command() or custom_target()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in meson.build
</span></pre><pre style='margin:0'>
</pre>