<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8142ad6b5bc52b1f55903c48fc947f901244d55c">https://github.com/macports/macports-ports/commit/8142ad6b5bc52b1f55903c48fc947f901244d55c</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 8142ad6b5bc glib2: fix gdbus-codegen
</span>8142ad6b5bc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8142ad6b5bc52b1f55903c48fc947f901244d55c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jan 23 22:25:48 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> glib2: fix gdbus-codegen
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use the packaging module instead of the removed distutils.
</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/69036
</span>---
devel/glib2/Portfile | 6 ++++--
devel/glib2/files/no-distutils.patch | 32 ++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a0d8c99ac8c..444570df333 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ name glib2
</span> conflicts glib2-devel
set my_name glib
version 2.78.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 6f4e18d58ad6eac3f38251f24b6495cf5a96e2a3 \
sha256 609801dd373796e515972bf95fc0b2daa44545481ee2f465c4f204d224b2bc21 \
size 5321388
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,8 @@ patchfiles-append libintl.patch \
</span> patch-meson_build-atomic-test-older-clang-versions.diff \
universal.patch \
patch-glib2-findfolders-before-SL.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-declarations.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-distutils.patch
</span>
platform darwin {
if {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,6 +83,7 @@ depends_lib-append port:gettext-runtime \
</span> port:libiconv \
port:pcre2 \
port:python${py_ver_nodot} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-packaging \
</span> port:zlib
# Python only needed for scripts
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/no-distutils.patch b/devel/glib2/files/no-distutils.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0a2d1c5b277
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/no-distutils.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6ef967a0f930ce37a8c9b5aff969693b34714291 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jordan Williams <jordan@jwillikers.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 1 Dec 2023 09:53:50 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Switch from the deprecated distutils module to the packaging
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The distutils module was removed in Python 3.12.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio/gdbus-2.0/codegen/utils.py | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 02046108da..08f1ba9731 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/gdbus-2.0/codegen/utils.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/gdbus-2.0/codegen/utils.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Author: David Zeuthen <davidz@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import distutils.version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import packaging.version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,4 +166,4 @@ def version_cmp_key(key):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v = str(key[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v = "0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (distutils.version.LooseVersion(v), key[1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (packaging.version.Version(v), key[1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>