From eb8cd75e20f571cfa86546081b448dfc2a297f40 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 30 Sep 2023 09:36:12 -0400 Subject: [PATCH 1/5] Update libvpx to version 1.13.1 --- gvsbuild/projects/libvpx.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/libvpx.py b/gvsbuild/projects/libvpx.py index 5cd86f12b..85d3206fe 100644 --- a/gvsbuild/projects/libvpx.py +++ b/gvsbuild/projects/libvpx.py @@ -26,10 +26,10 @@ def __init__(self): Project.__init__( self, "libvpx", - version="1.13.0", + version="1.13.1", archive_url="https://github.com/webmproject/libvpx/archive/v{version}.tar.gz", archive_file_name="libvpx-v{version}.tar.gz", - hash="cb2a393c9c1fae7aba76b950bb0ad393ba105409fe1a147ccd61b0aaa1501066", + hash="00dae80465567272abd077f59355f95ac91d7809a2d3006f9ace2637dd429d14", dependencies=["nasm", "msys2", "libyuv", "perl"], patches=[ "0006-gen_msvs_vcxproj.sh-Select-current-Windows-SDK-if-av.patch", From 4cd77e795c64ff8360388e37aeef2a8b62581f21 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 30 Sep 2023 09:37:50 -0400 Subject: [PATCH 2/5] Update meson to version 1.2.2 --- gvsbuild/tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index 6f72cd8cc..d92a493fc 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -93,10 +93,10 @@ def __init__(self): Tool.__init__( self, "meson", - version="1.2.1", + version="1.2.2", archive_url="https://github.com/mesonbuild/meson/archive/refs/tags/{version}.tar.gz", archive_file_name="meson-{version}.tar.gz", - hash="e1f3b32b636cc86496261bd89e63f00f206754697c7069788b62beed5e042713", + hash="1caa0ef6082e311bdca9836e7907f548b8c3f041a42ed41f0ff916b83ac7dddd", dir_part="meson-{version}", exe_name="meson.py", ) From f4f36dd03640a5cd33f0bbcfc66469d5aca8d0b7 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 30 Sep 2023 09:38:39 -0400 Subject: [PATCH 3/5] Update pycairo to version 1.25.0 --- gvsbuild/projects/pycairo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/pycairo.py b/gvsbuild/projects/pycairo.py index 943cbab51..481697ccc 100644 --- a/gvsbuild/projects/pycairo.py +++ b/gvsbuild/projects/pycairo.py @@ -26,9 +26,9 @@ def __init__(self): Meson.__init__( self, "pycairo", - version="1.24.0", + version="1.25.0", archive_url="https://github.com/pygobject/pycairo/releases/download/v{version}/pycairo-{version}.tar.gz", - hash="1444d52f1bb4cc79a4a0c0fe2ccec4bd78ff885ab01ebe1c0f637d8392bcafb6", + hash="37842b9bfa6339c45a5025f752e1d78d5840b1a0f82303bdd5610846ad8b5c4f", dependencies=["cairo"], ) From 89c2d33c27d4ba67d31647d3617db442fcf7a3ae Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 30 Sep 2023 09:25:34 -0400 Subject: [PATCH 4/5] Update GTK to version 4.12.3 --- gvsbuild/projects/gtk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvsbuild/projects/gtk.py b/gvsbuild/projects/gtk.py index 6df4016ca..742c97e5e 100644 --- a/gvsbuild/projects/gtk.py +++ b/gvsbuild/projects/gtk.py @@ -122,12 +122,12 @@ def __init__(self): self, "gtk4", prj_dir="gtk4", - version="4.12.2", + version="4.12.3", lastversion_major=4, lastversion_even=True, repository="https://gitlab.gnome.org/GNOME/gtk", archive_url="https://download.gnome.org/sources/gtk/{major}.{minor}/gtk-{version}.tar.xz", - hash="2f4f4d4f92e09f216d386cfdadd54d33d97f23a4555d67b97decfa6f815b6b81", + hash="148ce262f6c86487455fb1d9793c3f58bc3e1da477a29617fadb0420f5870a89", dependencies=[ "gdk-pixbuf", "pango", From c59b0964035fcf876ef8d43d2d612e93cafb3a80 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Sat, 30 Sep 2023 15:28:01 -0400 Subject: [PATCH 5/5] Add patch for glib-compile-resources not found --- .../0001-find-tool-pkgconfig-variable.patch | 32 +++++++++++++++++++ gvsbuild/tools.py | 1 + 2 files changed, 33 insertions(+) create mode 100644 gvsbuild/patches/meson/0001-find-tool-pkgconfig-variable.patch diff --git a/gvsbuild/patches/meson/0001-find-tool-pkgconfig-variable.patch b/gvsbuild/patches/meson/0001-find-tool-pkgconfig-variable.patch new file mode 100644 index 000000000..ad9c1f5c0 --- /dev/null +++ b/gvsbuild/patches/meson/0001-find-tool-pkgconfig-variable.patch @@ -0,0 +1,32 @@ +From ea6f3546310ebd4a6ad7517993bb6d8a4241c7c2 Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Sat, 30 Sep 2023 15:03:36 +0200 +Subject: [PATCH] find_tool: don't assume the pkgconfig variable is a valid + command + +ExternalProgram currently assumes that if a command is passed it exists +and can be used as is. In case we extract the path from pkgconfig the +path might not exist, on Windows it might be missing the ".exe" suffix. + +By passing the variables as a name ExternalProgram will validate that +the command exists at configure time and will fail if not, and it will +try to fixup the command by appending .exe etc. + +Fixes #12271 +--- + mesonbuild/modules/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py +index eef67a1c7431..a1aa2334495a 100644 +--- a/mesonbuild/modules/__init__.py ++++ b/mesonbuild/modules/__init__.py +@@ -112,7 +112,7 @@ def find_tool(self, name: str, depname: str, varname: str, required: bool = True + if dep.found() and dep.type_name == 'pkgconfig': + value = dep.get_variable(pkgconfig=varname) + if value: +- return ExternalProgram(name, [value]) ++ return ExternalProgram(value) + + # Normal program lookup + return self.find_program(name, required=required, wanted=wanted) diff --git a/gvsbuild/tools.py b/gvsbuild/tools.py index d92a493fc..7bb4cfabf 100644 --- a/gvsbuild/tools.py +++ b/gvsbuild/tools.py @@ -99,6 +99,7 @@ def __init__(self): hash="1caa0ef6082e311bdca9836e7907f548b8c3f041a42ed41f0ff916b83ac7dddd", dir_part="meson-{version}", exe_name="meson.py", + patches=["0001-find-tool-pkgconfig-variable.patch"], ) def unpack(self):