<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/1bd311e4734d389381fa614e83bac09e2006a6c9">https://github.com/macports/macports-ports/commit/1bd311e4734d389381fa614e83bac09e2006a6c9</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 1bd311e4734 glib2: Fix code generator with Python 3.13
</span>1bd311e4734 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1bd311e4734d389381fa614e83bac09e2006a6c9
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Thu Jan 9 15:38:33 2025 +0100
<span style='display:block; white-space:pre;color:#404040;'> glib2: Fix code generator with Python 3.13
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This was broken by aa0ed802cb96987a14af16d7974f68dbc218cdf5 and breaks
</span><span style='display:block; white-space:pre;color:#404040;'> the build of gtk3.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Backport the upstream patches to remove the dependency completely.
</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/71745
</span>---
devel/glib2/Portfile | 2 +-
devel/glib2/files/no-distutils.patch | 244 ++++++++++++++++++++++++++++++++++-
2 files changed, 238 insertions(+), 8 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 289c77712a1..9245e01a9c2 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;'>@@ -15,7 +15,7 @@ name glib2
</span> conflicts glib2-devel
set my_name glib
version 2.78.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> epoch 1
checksums rmd160 7941be85af18c428d86f4a00e52f41542b061aa9 \
<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><span style='display:block; white-space:pre;color:#808080;'>index 0a2d1c5b277..cc4655b455d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/no-distutils.patch
</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;'>@@ -1,17 +1,88 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6ef967a0f930ce37a8c9b5aff969693b34714291 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a828672e2dcff0bb621aa30e9f370b09fd15b8b0 Mon Sep 17 00:00:00 2001
</span> From: Jordan Williams <jordan@jwillikers.com>
Date: Fri, 1 Dec 2023 09:53:50 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Switch from the deprecated distutils module to the packaging
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] Switch from the deprecated distutils module to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ packaging module
</span>
The distutils module was removed in Python 3.12.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 6ef967a0f930ce37a8c9b5aff969693b34714291)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291]
</span> ---
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ .gitlab-ci.yml | 7 ++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .gitlab-ci/debian-stable.Dockerfile | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .gitlab-ci/fedora.Dockerfile | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .gitlab-ci/mingw.Dockerfile | 4 +++-
</span> gio/gdbus-2.0/codegen/utils.py | 4 ++--
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 11 insertions(+), 6 deletions(-)
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bd10823a2..b812e6b7d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./.gitlab-ci.yml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./.gitlab-ci.yml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,10 +11,10 @@ cache:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - _ccache/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variables:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v20"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v24"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v14"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v10"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v18"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v14"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESON_TEST_TIMEOUT_MULTIPLIER: 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_MESSAGES_DEBUG: all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -551,6 +551,7 @@ macos-x86_64:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - source .venv/bin/activate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - pip3 install meson==1.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - pip3 install ninja==1.11.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - pip3 install packaging==23.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ script:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FIXME: Use --wrap-mode=default so we download dependencies each time,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # until the macOS runner is a VM where we can use a pre-made image which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b2559cad6..6f07e2ec1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./.gitlab-ci/debian-stable.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./.gitlab-ci/debian-stable.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ locales \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ninja-build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ python3-packaging \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-pip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-wheel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 85f910cb9..1b477d56e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./.gitlab-ci/fedora.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./.gitlab-ci/fedora.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,7 @@ RUN dnf -y update \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ninja-build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcre2-devel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "python3-dbusmock >= 0.18.3-2" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ python3-packaging \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-pip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-pygments \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-wheel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b109122fc..ac6e3ed77 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./.gitlab-ci/mingw.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./.gitlab-ci/mingw.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FROM fedora:34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FROM registry.gitlab.gnome.org/gnome/glib/fedora:v24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++USER root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RUN dnf -y install \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bindfs \
</span> diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 02046108da..08f1ba9731 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gdbus-2.0/codegen/utils.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gdbus-2.0/codegen/utils.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 02046108d..08f1ba973 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> @@ -19,7 +19,7 @@
#
# Author: David Zeuthen <davidz@redhat.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,5 +99,164 @@ index 02046108da..08f1ba9731 100644
</span> - return (distutils.version.LooseVersion(v), key[1])
+ return (packaging.version.Version(v), key[1])
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.47.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b855c4ebd117fbc1ff64f501ea0e5ed76690ca69 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ernesto de Gracia Herranz <ernestodgh@jfrog.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 4 Jul 2024 11:04:38 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] replace package.version.Version by internal code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This drops the dependency on the Python `packaging` module.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Ernesto de Gracia Herranz <ernestodgh@jfrog.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 38faeca62ebd5be89b1ec3e6c530e499ce2d7240)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/38faeca62ebd5be89b1ec3e6c530e499ce2d7240]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .gitlab-ci.yml | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .gitlab-ci/debian-stable.Dockerfile | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .gitlab-ci/fedora.Dockerfile | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .gitlab-ci/test-msvc.bat | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio/gdbus-2.0/codegen/utils.py | 29 +++++++++++++++++++++++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 29 insertions(+), 8 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b812e6b7d..68f66db4e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./.gitlab-ci.yml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./.gitlab-ci.yml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -551,7 +551,6 @@ macos-x86_64:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - source .venv/bin/activate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - pip3 install meson==1.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - pip3 install ninja==1.11.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- - pip3 install packaging==23.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ script:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FIXME: Use --wrap-mode=default so we download dependencies each time,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # until the macOS runner is a VM where we can use a pre-made image which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6f07e2ec1..b2559cad6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./.gitlab-ci/debian-stable.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./.gitlab-ci/debian-stable.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,6 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ locales \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ninja-build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- python3-packaging \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-pip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-wheel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1b477d56e..d827516b9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./.gitlab-ci/fedora.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./.gitlab-ci/fedora.Dockerfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,7 @@ RUN dnf -y update \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ninja-build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcre2-devel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "python3-dbusmock >= 0.18.3-2" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- python3-packaging \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ python3-docutils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-pip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-pygments \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python3-wheel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aee77d33d..23906920b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./.gitlab-ci/test-msvc.bat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./.gitlab-ci/test-msvc.bat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@ for %%x in (%*) do (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set args=%args:~1%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ :: FIXME: make warnings fatal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pip3 install --upgrade --user meson==1.0.0 || goto :error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pip3 install --upgrade --user meson==1.2.3 || goto :error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson setup %args% _build || goto :error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python .gitlab-ci/check-missing-install-tag.py _build || goto :error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson compile -C _build || goto :error
</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 08f1ba973..753756923 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;'>+@@ -22,6 +22,7 @@
</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;'>++import re
</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;'>+ # pylint: disable=too-few-public-methods
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -159,11 +160,35 @@ def lookup_brief_docs(annotations):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def version_cmp_key(key):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If the 'since' version is 'UNRELEASED', compare higher than anything else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If it is empty put a 0 in its place as this will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # allow LooseVersion to work and will always compare lower.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # allow _parse_version() to work and will always compare lower.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if key[0] == "UNRELEASED":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v = "9999"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif key[0]:
</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 (packaging.version.Version(v), key[1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (_parse_version(v), key[1])
</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;'>++def _parse_version(version):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Parse a version string into a list of integers and strings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ This function takes a version string and breaks it down into its component parts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ It separates numeric and non-numeric segments, converting numeric segments to integers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Args:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ version (str): The version string to parse.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Returns:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list: A list where each element is either an integer (for numeric parts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ or a string (for non-numeric parts).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Example:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ >>> parseversion("1.2.3a")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [1, 2, 3, 'a']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ >>> parseversion("2.0.0-rc1")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [2, 0, 0, 'rc1']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blocks = re.findall(r"(\d+|\w+)", version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return [int(b) if b.isdigit() else b for b in blocks]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.47.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e024bc6a187f2b282ebe8e8e9e0983d12f9978c5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Philip Withnall <pwithnall@gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 7 Jul 2024 13:48:46 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] codegen: Drop unused import
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This should have been dropped in commit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+38faeca62ebd5be89b1ec3e6c530e499ce2d7240 but somehow that didn’t happen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and somehow it wasn’t caught by the CI until afterwards.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: https://gitlab.gnome.org/GNOME/glib/-/jobs/4049254
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Philip Withnall <pwithnall@gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 3993d8db52f1426920285543fbcd8d7ee9327825)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Stauts: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/3993d8db52f1426920285543fbcd8d7ee9327825]
</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 | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 deletion(-)
</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 753756923..649ed5b67 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,6 @@
</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 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;'>+ import re
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.47.1
</span>
</pre><pre style='margin:0'>
</pre>