Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Weekly update 2023-09-30 #1091

Merged
merged 5 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions gvsbuild/patches/meson/0001-find-tool-pkgconfig-variable.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From ea6f3546310ebd4a6ad7517993bb6d8a4241c7c2 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
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)
4 changes: 2 additions & 2 deletions gvsbuild/projects/gtk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions gvsbuild/projects/libvpx.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions gvsbuild/projects/pycairo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)

Expand Down
5 changes: 3 additions & 2 deletions gvsbuild/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,13 @@ 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",
patches=["0001-find-tool-pkgconfig-variable.patch"],
)

def unpack(self):
Expand Down