From ce913794e71bdf2e3a3d46b613d7952f4f2d27a4 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 13 Apr 2024 11:13:22 +0200 Subject: [PATCH 1/2] harfbuzz: bump deps Fix conflict with cairo when building pango --- recipes/harfbuzz/all/conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/harfbuzz/all/conanfile.py b/recipes/harfbuzz/all/conanfile.py index a0f1c1c55554a..ccecfa6b2917d 100644 --- a/recipes/harfbuzz/all/conanfile.py +++ b/recipes/harfbuzz/all/conanfile.py @@ -82,9 +82,9 @@ def requirements(self): if self.options.with_freetype: self.requires("freetype/2.13.2") if self.options.with_icu: - self.requires("icu/74.1") + self.requires("icu/74.2") if self.options.with_glib: - self.requires("glib/2.78.1") + self.requires("glib/2.78.3") def validate(self): if self.options.shared and self.options.with_glib and not self.dependencies["glib"].options.shared: @@ -100,7 +100,7 @@ def validate(self): ) def build_requirements(self): - self.tool_requires("meson/1.3.2") + self.tool_requires("meson/1.4.0") if not self.conf.get("tools.gnu:pkg_config", check_type=str): self.tool_requires("pkgconf/2.1.0") if self.options.with_glib: @@ -108,7 +108,7 @@ def build_requirements(self): if self.settings.os == "Macos": # Ensure that the gettext we use at build time is compatible # with the libiconv that is transitively exposed by glib - self.tool_requires("gettext/0.21") + self.tool_requires("gettext/0.22.5") def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) From 70b22311b30c962b8dce27e5b7500683cee6ba6c Mon Sep 17 00:00:00 2001 From: mayeut Date: Mon, 15 Apr 2024 21:15:54 +0200 Subject: [PATCH 2/2] revert icu bump --- recipes/harfbuzz/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/harfbuzz/all/conanfile.py b/recipes/harfbuzz/all/conanfile.py index ccecfa6b2917d..07396cf397511 100644 --- a/recipes/harfbuzz/all/conanfile.py +++ b/recipes/harfbuzz/all/conanfile.py @@ -82,7 +82,7 @@ def requirements(self): if self.options.with_freetype: self.requires("freetype/2.13.2") if self.options.with_icu: - self.requires("icu/74.2") + self.requires("icu/74.1") if self.options.with_glib: self.requires("glib/2.78.3")