<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/142792e2b4900dfc8a39d071c6e93677f45794a4">https://github.com/macports/macports-ports/commit/142792e2b4900dfc8a39d071c6e93677f45794a4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 142792e2b4900dfc8a39d071c6e93677f45794a4
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Apr 18 17:50:03 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: update to 2.74.7 (latest bugfix release)
</span>---
devel/glib2-devel/Portfile | 8 ++++----
.../glib2-devel/files/patch-meson-build-python-path.diff | 16 +++++-----------
2 files changed, 9 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d55172c7555..40b767906aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,12 +14,12 @@ PortGroup legacysupport 1.1
</span> name glib2-devel
conflicts glib2 glib2-upstream
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.74.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.74.7
</span> revision 0
epoch 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7f3943b84afb3e0ac56142246cb7d05ff626d3ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5183072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0b778d88789937ac218f9780643a182362eb2569 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 196ab86c27127a61b7a70c3ba6af7b97bdc01c07cd3b21abd5e778b955eccb1b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5207684
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-meson-build-python-path.diff b/devel/glib2-devel/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f0aba55065..6af6fd34af5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GLib2 tries to find "python3" and if it can't find it, it will go for "python"; if port select wasn't explicitly run, this will likely end-up with Python 2.7. As a fallback, meson can use whatever python it's running on if the argument to find_installation is empty.
</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;'>---- meson.build.orig 2019-11-21 00:41:53.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2019-11-21 00:44:00.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1992,9 +1992,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2023-04-14 06:42:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2023-04-18 17:35:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2290,7 +2290,7 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--python = import('python').find_installation('python3')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+python = import('python').find_installation('')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python = import('python').find_installation()
</span> # used for '#!/usr/bin/env <name>'
-python_name = 'python3'
+python_name = '@PYTHON@'
python_version = python.language_version()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- python_version_req = '>=3.4'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_version_req = '>=3.5'
</span></pre><pre style='margin:0'>
</pre>