From 87b9e04ece8170f6b6e1445c68981ce841c148cc Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Fri, 8 Mar 2024 17:25:43 -0500 Subject: [PATCH 1/7] Fix lastversion ApiCredentialsError --- gvsbuild/outdated.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gvsbuild/outdated.py b/gvsbuild/outdated.py index faab5eeec..f1ad3819a 100644 --- a/gvsbuild/outdated.py +++ b/gvsbuild/outdated.py @@ -58,7 +58,7 @@ def outdated(): ) except version.InvalidVersion: print(f"Project {project.name} does not have a valid version") - except lastversion.utils.ApiCredentialsError: + except lastversion.exceptions.ApiCredentialsError: print( "Create or update the GITHUB token at https://github.com/settings/tokens, then set or update the token environmental variable with:\n$env:GITHUB_API_TOKEN=xxxxxxxxxxxxxxx" ) From edfc39c55eac4db0ce96745a4ecf8f6df345347e Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Fri, 8 Mar 2024 18:17:16 -0500 Subject: [PATCH 2/7] Update glib to version 2.80.0 --- gvsbuild/projects/glib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/glib.py b/gvsbuild/projects/glib.py index c35bd1c64..f53ff9b31 100644 --- a/gvsbuild/projects/glib.py +++ b/gvsbuild/projects/glib.py @@ -24,11 +24,11 @@ def __init__(self): Project.__init__( self, "glib", - version="2.78.4", + version="2.80.0", lastversion_even=True, repository="https://gitlab.gnome.org/GNOME/glib", archive_url="https://download.gnome.org/sources/glib/{major}.{minor}/glib-{version}.tar.xz", - hash="24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63", + hash="8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d", dependencies=[ "ninja", "meson", From 70f6b0e727977619c787389de9f830ed465b2601 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Fri, 8 Mar 2024 20:06:18 -0500 Subject: [PATCH 3/7] Remove upstreamed distutils patch --- .../python-312-distutils-to-packaging.patch | 25 ------------------- gvsbuild/projects/glib.py | 1 - 2 files changed, 26 deletions(-) delete mode 100644 gvsbuild/patches/glib/python-312-distutils-to-packaging.patch diff --git a/gvsbuild/patches/glib/python-312-distutils-to-packaging.patch b/gvsbuild/patches/glib/python-312-distutils-to-packaging.patch deleted file mode 100644 index 4f7eea6fb..000000000 --- a/gvsbuild/patches/glib/python-312-distutils-to-packaging.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 f53ff9b31..28c2b25bc 100644 --- a/gvsbuild/projects/glib.py +++ b/gvsbuild/projects/glib.py @@ -40,7 +40,6 @@ def __init__(self): ], patches=[ "glib-package-installation-directory.patch", - "python-312-distutils-to-packaging.patch", ], ) From 86fe98ae7686106b7b820779351e5ba7eea95821 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 9 Mar 2024 08:55:40 -0500 Subject: [PATCH 4/7] Update libadwaita to version 1.4.4 --- gvsbuild/projects/libadwaita.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libadwaita.py b/gvsbuild/projects/libadwaita.py index d6caa715f..4f9ec6ff0 100644 --- a/gvsbuild/projects/libadwaita.py +++ b/gvsbuild/projects/libadwaita.py @@ -25,10 +25,10 @@ def __init__(self): self, "libadwaita", repository="https://gitlab.gnome.org/GNOME/libadwaita", - version="1.4.3", + version="1.4.4", lastversion_even=True, archive_url="https://download.gnome.org/sources/libadwaita/{major}.{minor}/libadwaita-{version}.tar.xz", - hash="ae9622222b0eb18e23675655ad2ba01741db4d8655a796f4cf077b093e2f5841", + hash="f802b7d8d5ae33be4650ef571a580f144a806202a26f527dacd57d1560938828", dependencies=[ "ninja", "meson", From 5e266db36041b2e68e8e5ed94d94300996a4f6c7 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 9 Mar 2024 09:23:41 -0500 Subject: [PATCH 5/7] Update Pango to version 1.52.1 --- gvsbuild/projects/pango.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/pango.py b/gvsbuild/projects/pango.py index 6be5fc9ad..3b0828577 100644 --- a/gvsbuild/projects/pango.py +++ b/gvsbuild/projects/pango.py @@ -24,10 +24,10 @@ def __init__(self): Project.__init__( self, "pango", - version="1.52.0", + version="1.52.1", repository="https://gitlab.gnome.org/GNOME/pango", archive_url="https://download.gnome.org/sources/pango/{major}.{minor}/pango-{version}.tar.xz", - hash="1ec8518879c3f43224499f08e8ecbbdf4a5d302ed6cd3853b4fa949f82b89a9b", + hash="58728a0a2d86f60761208df9493033d18ecb2497abac80ee1a274ad0c6e55f0f", dependencies=[ "ninja", "meson", From 26773a760eb2ccafaf827aa1574236035f1ff867 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 9 Mar 2024 09:25:53 -0500 Subject: [PATCH 6/7] Update Go to version 1.22.1 --- gvsbuild/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index 66a38c791..8cfa79acc 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -209,9 +209,9 @@ def __init__(self): Tool.__init__( self, "go", - version="1.22.0", + version="1.22.1", archive_url="https://go.dev/dl/go{version}.windows-amd64.zip", - hash="78b3158fe3aa358e0b6c9f26ecd338f9a11441e88bc434ae2e9f0ca2b0cc4dd3", + hash="cf9c66a208a106402a527f5b956269ca506cfe535fc388e828d249ea88ed28ba", dir_part="go-{version}", ) From 27e18d04e5d092ebf4172d41e973708d6bde41aa Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 9 Mar 2024 09:28:33 -0500 Subject: [PATCH 7/7] Update librsvg to version 2.57.2 --- gvsbuild/projects/librsvg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/librsvg.py b/gvsbuild/projects/librsvg.py index a9f8dad92..abc84dd92 100644 --- a/gvsbuild/projects/librsvg.py +++ b/gvsbuild/projects/librsvg.py @@ -24,10 +24,10 @@ def __init__(self): Project.__init__( self, "librsvg", - version="2.57.1", + version="2.57.2", repository="https://gitlab.gnome.org/GNOME/librsvg", archive_url="https://download.gnome.org/sources/librsvg/{major}.{minor}/librsvg-{version}.tar.xz", - hash="074671a3ed6fbcd67cae2a40e539107f4f097ca8a4ab1a894c05e2524ff340ef", + hash="9c2b73947924d3f0f5653436c3ee3b170128930ab6abd2303bb6d727b88d6471", dependencies=[ "cargo", "cairo",