From 87529b7b77461bdc223ea7abb8ca5edf2f1da0da Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 9 Jan 2025 20:28:20 -0500 Subject: [PATCH 1/9] Update Cargo to version 1.84.0 --- gvsbuild/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index 13b1d320f..d4cfc82d1 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -28,7 +28,7 @@ def __init__(self): Tool.__init__( self, "cargo", - version="1.83.0", + version="1.84.0", repository="rust-lang/rust", archive_url="https://win.rustup.rs/x86_64", archive_filename="rustup-init.exe", From 1d18ed86c3fb5b0bd166822f3faddea3f41ab354 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 9 Jan 2025 20:29:35 -0500 Subject: [PATCH 2/9] Update libpng to version 1.6.45 --- gvsbuild/projects/libpng.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libpng.py b/gvsbuild/projects/libpng.py index 66d064399..821724e1a 100644 --- a/gvsbuild/projects/libpng.py +++ b/gvsbuild/projects/libpng.py @@ -24,11 +24,11 @@ def __init__(self): Project.__init__( self, "libpng", - version="1.6.44", + version="1.6.45", repository="https://github.com/pnggroup/libpng", archive_url="https://github.com/pnggroup/libpng/archive/v{version}.tar.gz", archive_filename="libpng-{version}.tar.gz", - hash="0ef5b633d0c65f780c4fced27ff832998e71478c13b45dfb6e94f23a82f64f7c", + hash="7ff6898520645716ddc3d8381d97b6e02937b03da92e6fd0d7cf9d7d2b0da780", dependencies=["cmake", "ninja", "zlib"], ) From 3bee5bac319c112814f517137371ca19ca87d6e2 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 9 Jan 2025 20:30:24 -0500 Subject: [PATCH 3/9] Update glib-networking to version 2.80.1 --- ...add-null-check-in-complete_handshake.patch | 28 ------------------- gvsbuild/projects/glib.py | 8 ++---- 2 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 gvsbuild/patches/glib-networking/add-null-check-in-complete_handshake.patch diff --git a/gvsbuild/patches/glib-networking/add-null-check-in-complete_handshake.patch b/gvsbuild/patches/glib-networking/add-null-check-in-complete_handshake.patch deleted file mode 100644 index bd5ffce69..000000000 --- a/gvsbuild/patches/glib-networking/add-null-check-in-complete_handshake.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 294fed9a26f4a3cb7c2be19d349d0e5e062265a3 Mon Sep 17 00:00:00 2001 -From: Dario Marino Saccavino -Date: Tue, 2 Apr 2024 17:23:40 +0200 -Subject: [PATCH] openssl: add null check in complete_handshake - -Check that the session is valid in g_tls_connection_openssl_complete_handshake, -before calling SSL_SESSION_get_protocol_version. ---- - tls/openssl/gtlsconnection-openssl.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tls/openssl/gtlsconnection-openssl.c b/tls/openssl/gtlsconnection-openssl.c -index 983d1513..591bfba4 100644 ---- a/tls/openssl/gtlsconnection-openssl.c -+++ b/tls/openssl/gtlsconnection-openssl.c -@@ -585,7 +585,8 @@ g_tls_connection_openssl_complete_handshake (GTlsConnectionBase *tls, - *negotiated_protocol = g_strndup ((gchar *)data, len); - } - -- *protocol_version = glib_protocol_version_from_openssl (SSL_SESSION_get_protocol_version (session)); -+ *protocol_version = session ? glib_protocol_version_from_openssl (SSL_SESSION_get_protocol_version (session)) -+ : G_TLS_PROTOCOL_VERSION_UNKNOWN; - *ciphersuite_name = g_strdup (SSL_get_cipher_name (ssl)); - } - --- -GitLab - diff --git a/gvsbuild/projects/glib.py b/gvsbuild/projects/glib.py index df2272dff..61e140ee5 100644 --- a/gvsbuild/projects/glib.py +++ b/gvsbuild/projects/glib.py @@ -102,11 +102,11 @@ def __init__(self): Project.__init__( self, "glib-networking", - version="2.80.0", + version="2.80.1", lastversion_even=True, repository="https://gitlab.gnome.org/GNOME/glib-networking", archive_url="https://download.gnome.org/sources/glib-networking/{major}.{minor}/glib-networking-{version}.tar.xz", - hash="d8f4f1aab213179ae3351617b59dab5de6bcc9e785021eee178998ebd4bb3acf", + hash="b80e2874157cd55071f1b6710fa0b911d5ac5de106a9ee2a4c9c7bee61782f8e", dependencies=[ "pkgconf", "ninja", @@ -115,9 +115,7 @@ def __init__(self): "openssl", "gsettings-desktop-schemas", ], - patches=[ - "add-null-check-in-complete_handshake.patch", - ], + patches=[], ) def build(self): From 1bca081491bf442f289e027a3db6a83837c44299 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 9 Jan 2025 20:58:01 -0500 Subject: [PATCH 4/9] Update GStreamer to version 1.24.11 --- gvsbuild/projects/gstreamer.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gvsbuild/projects/gstreamer.py b/gvsbuild/projects/gstreamer.py index b1df4725e..6bf8a697a 100644 --- a/gvsbuild/projects/gstreamer.py +++ b/gvsbuild/projects/gstreamer.py @@ -40,10 +40,10 @@ def __init__(self): self, "gstreamer", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.24.10", + version="1.24.11", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-{version}.tar.xz", - hash="9fc45b1a332e8f812f09e95c281cd75969f6d1682d062a815db0e7bc047518fd", + hash="093a379602a250d5cd33b88e723757c80198317efde33893edf3c87b6e53b907", dependencies=["meson", "ninja", "glib", "orc"], ) @@ -90,10 +90,10 @@ def __init__(self): self, "gst-plugins-base", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.24.10", + version="1.24.11", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-{version}.tar.xz", - hash="ebd57b1be924c6e24f327dd55bab9d8fbaaebe5e1dc8fca784182ab2b12d23eb", + hash="98572c1f8b710e52673e250cd96e4f2660d79bd66aa172c5dde5f690c1231e1d", dependencies=[ "meson", "ninja", @@ -127,10 +127,10 @@ def __init__(self): self, "gst-plugins-good", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.24.10", + version="1.24.11", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-{version}.tar.xz", - hash="fce748fa66d7a8ee1fb261489e59d01e3fa787623d6d5c35068416fe7cd0acb3", + hash="94bf3b5118dd4213af66048faac830569cc9a94a8c8e59e8a6d33b315f518462", dependencies=[ "meson", "ninja", @@ -151,10 +151,10 @@ def __init__(self): self, "gst-plugins-bad", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.24.10", + version="1.24.11", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-{version}.tar.xz", - hash="1707e3103950c9baed364a8af2ba0495d6b113fcd36e1062dda5f582b8f8904d", + hash="9126c2b7053a5f059db958f43c6a5230d2e843ff9adff8c8c2477ea2457e3315", dependencies=[ "meson", "ninja", @@ -194,10 +194,10 @@ def __init__(self): self, "gst-plugins-ugly", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.24.10", + version="1.24.11", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-{version}.tar.xz", - hash="9df6fd85a7256241efbb25f84b337575e3b345266f5dab3849371e4694779f18", + hash="3a1f58a33aee8d13522865bcb564007a6837ef5711d7dfff8ce4260921013f8a", dependencies=["meson", "ninja", "gst-plugins-base"], ) @@ -213,10 +213,10 @@ def __init__(self): self, "gst-devtools", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.24.10", + version="1.24.11", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-{version}.tar.xz", - hash="2983537148b0a8d52bad2a3f4c9dcca808fd5aa12fccee25acc4a4277f0780ec", + hash="73990a939c1ea9d9ca199b8cd135dd3a7120b495004aaa79299257d9cd897834", dependencies=["meson", "ninja", "json-glib"], ) @@ -240,10 +240,10 @@ def __init__(self): self, "gst-python", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.24.10", + version="1.24.11", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-python/gst-python-{version}.tar.xz", - hash="135bcf8b6f1468bc31e5660409fe8ed38109f01dec44743514aa2fa6b3863309", + hash="f4c8761bfee98508f57e2efd738ef36a99e2f7644860877d54d235a7092cf056", dependencies=["meson", "ninja", "pygobject", "gst-plugins-base"], patches=["0001-fix-python3-not-found.patch"], ) @@ -260,10 +260,10 @@ def __init__(self): self, "gst-libav", repository="https://gitlab.freedesktop.org/gstreamer/gstreamer", - version="1.24.10", + version="1.24.11", lastversion_even=True, archive_url="https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-{version}.tar.xz", - hash="4cf2e2d8204e54ba8af9519a8b9b7ffa6e951a7087afa0dfe83c125d49bbb5fb", + hash="13776fc16f7ce587d437d56d83e08c9224768dddc897dd3c88208d970a6aa422", # TODO try remove gst-plugins-base dependencies=["meson", "ninja", "pygobject", "ffmpeg", "gst-plugins-base"], ) From 5c52c9ddc35ddf10d74bd8232097167ddb21c423 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 9 Jan 2025 20:58:27 -0500 Subject: [PATCH 5/9] Update libsrtp2 to version 2.6.0 --- gvsbuild/projects/libsrtp2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libsrtp2.py b/gvsbuild/projects/libsrtp2.py index dcf45d12e..35df49879 100644 --- a/gvsbuild/projects/libsrtp2.py +++ b/gvsbuild/projects/libsrtp2.py @@ -25,9 +25,9 @@ def __init__(self): self, "libsrtp2", repository="https://github.com/cisco/libsrtp", - version="2.5.0", + version="2.6.0", archive_url="https://github.com/cisco/libsrtp/archive/refs/tags/v{version}.tar.gz", - hash="8a43ef8e9ae2b665292591af62aa1a4ae41e468b6d98d8258f91478735da4e09", + hash="bf641aa654861be10570bfc137d1441283822418e9757dc71ebb69a6cf84ea6b", dependencies=["meson", "ninja"], ) From 4a3d5334767316f5a9c0fdc5f3a04065a138e105 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 9 Jan 2025 20:58:52 -0500 Subject: [PATCH 6/9] Update Pango to version 1.56.0 --- 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 a781cc43d..6c20e9502 100644 --- a/gvsbuild/projects/pango.py +++ b/gvsbuild/projects/pango.py @@ -24,10 +24,10 @@ def __init__(self): Project.__init__( self, "pango", - version="1.55.5", + version="1.56.0", repository="https://gitlab.gnome.org/GNOME/pango", archive_url="https://download.gnome.org/sources/pango/{major}.{minor}/pango-{version}.tar.xz", - hash="e396126ea08203cbd8ef12638e6222e2e1fd8aa9cac6743072fedc5f2d820dd8", + hash="1fb98b338ee6f7cf8ef96153b7d242f4568fe60f9b7434524eca630a57bd538b", dependencies=[ "ninja", "meson", From 1eed483e6a24bb8dcb435fa8fddb779858c627d6 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 9 Jan 2025 21:01:06 -0500 Subject: [PATCH 7/9] Bump version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 747d697a5..bff357c54 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "gvsbuild" -version = "2024.12.0" +version = "2025.1.0" description = "GTK stack for Windows" readme = "README.md" requires-python = "<4.0,>=3.9" From 761b01728151dfb53ebba51ecdbe4b2e4c756082 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 9 Jan 2025 21:46:27 -0500 Subject: [PATCH 8/9] Update libadwaita to version 1.6.3 --- 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 e329ea295..774bce360 100644 --- a/gvsbuild/projects/libadwaita.py +++ b/gvsbuild/projects/libadwaita.py @@ -25,9 +25,9 @@ def __init__(self): self, "libadwaita", repository="https://gitlab.gnome.org/GNOME/libadwaita", - version="1.6.2", + version="1.6.3", archive_url="https://download.gnome.org/sources/libadwaita/{major}.{minor}/libadwaita-{version}.tar.xz", - hash="7542f8354e6808dd4e9a31551bbdfc0170735e4af4d1b3e69186500ccb9c01eb", + hash="c88d4516edd1e0fc61be925f414efc340e149171756064473a082b6ae9a5dc00", dependencies=[ "ninja", "meson", From f11842a0b62686309ebc45b08eaa3d86e7aff9f9 Mon Sep 17 00:00:00 2001 From: danyeaw Date: Fri, 10 Jan 2025 02:02:45 +0000 Subject: [PATCH 9/9] Regenerate uv.lock --- uv.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uv.lock b/uv.lock index 60ee82f22..be452ffe5 100644 --- a/uv.lock +++ b/uv.lock @@ -170,7 +170,7 @@ name = "click" version = "8.1.7" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "colorama", marker = "platform_system == 'Windows'" }, + { name = "colorama", marker = "sys_platform == 'win32'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/96/d3/f04c7bfcf5c1862a2a5b845c6b2b360488cf47af55dfa79c98f6a6bf98b5/click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de", size = 336121 } wheels = [ @@ -236,7 +236,7 @@ wheels = [ [[package]] name = "gvsbuild" -version = "2024.12.0" +version = "2025.1.0" source = { editable = "." } dependencies = [ { name = "build" }, @@ -677,7 +677,7 @@ name = "tqdm" version = "4.66.5" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "colorama", marker = "platform_system == 'Windows'" }, + { name = "colorama", marker = "sys_platform == 'win32'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/58/83/6ba9844a41128c62e810fddddd72473201f3eacde02046066142a2d96cc5/tqdm-4.66.5.tar.gz", hash = "sha256:e1020aef2e5096702d8a025ac7d16b1577279c9d63f8375b63083e9a5f0fcbad", size = 169504 } wheels = [