diff --git a/gvsbuild/patches/glib/glib-package-installation-directory.patch b/gvsbuild/patches/glib/001-glib-package-installation-directory.patch similarity index 100% rename from gvsbuild/patches/glib/glib-package-installation-directory.patch rename to gvsbuild/patches/glib/001-glib-package-installation-directory.patch diff --git a/gvsbuild/patches/glib/002-python-312-distutils-to-packaging.patch b/gvsbuild/patches/glib/002-python-312-distutils-to-packaging.patch new file mode 100644 index 000000000..4f7eea6fb --- /dev/null +++ b/gvsbuild/patches/glib/002-python-312-distutils-to-packaging.patch @@ -0,0 +1,25 @@ +Subject: [PATCH] Replace distutils with packaging +--- +Index: gio/gdbus-2.0/codegen/utils.py +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py +--- a/gio/gdbus-2.0/codegen/utils.py (revision e93fd4cfc39167cf0ceb9c531238d9800d3d9edb) ++++ b/gio/gdbus-2.0/codegen/utils.py (date 1705782834785) +@@ -19,7 +19,7 @@ + # + # Author: David Zeuthen + +-import distutils.version ++import packaging.version + import os + import sys + +@@ -166,4 +166,4 @@ + v = str(key[0]) + else: + v = "0" +- return (distutils.version.LooseVersion(v), key[1]) ++ return (packaging.version.Version(v), key[1]) diff --git a/gvsbuild/projects/glib.py b/gvsbuild/projects/glib.py index 99c0f49b3..f28c036bd 100644 --- a/gvsbuild/projects/glib.py +++ b/gvsbuild/projects/glib.py @@ -39,7 +39,8 @@ def __init__(self): "pcre2", ], patches=[ - "glib-package-installation-directory.patch", + "001-glib-package-installation-directory.patch", + "002-python-312-distutils-to-packaging.patch", ], ) self.add_param("-Dman=false")