From 21a486f4cb5f325511784ad940f5b18ac6649dcc Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Sun, 1 Oct 2023 04:15:38 +0200 Subject: [PATCH] (#19935) glib/all: bump deps * glib/all: bump deps Generated and committed by [Conan Center Bump Deps](https://github.com/ericLemanissier/conan-center-index-bump-deps) Find more updatable recipes in the [GitHub Pages](https://ericlemanissier.github.io/conan-center-index-bump-deps/) * use range for zlib --- recipes/glib/all/conanfile.py | 8 ++++---- recipes/glib/all/test_package/conanfile.py | 2 +- recipes/glib/all/test_v1_package/conanfile.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/glib/all/conanfile.py b/recipes/glib/all/conanfile.py index 95fb7a1a6aec3..a90b8bbde49a8 100644 --- a/recipes/glib/all/conanfile.py +++ b/recipes/glib/all/conanfile.py @@ -65,7 +65,7 @@ def layout(self): basic_layout(self, src_folder="src") def requirements(self): - self.requires("zlib/1.2.13") + self.requires("zlib/[>=1.2.11 <2]") self.requires("libffi/3.4.4") if Version(self.version) >= "2.73.2": self.requires("pcre2/10.42") @@ -74,7 +74,7 @@ def requirements(self): if self.options.get_safe("with_elf"): self.requires("libelf/0.8.13") if self.options.get_safe("with_mount"): - self.requires("libmount/2.36.2") + self.requires("libmount/2.39") if self.options.get_safe("with_selinux"): self.requires("libselinux/3.3") if self.settings.os != "Linux": @@ -85,9 +85,9 @@ def requirements(self): self.requires("libiconv/1.17") def build_requirements(self): - self.tool_requires("meson/1.1.0") + self.tool_requires("meson/1.2.1") if not self.conf.get("tools.gnu:pkg_config", check_type=str): - self.tool_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.3") def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) diff --git a/recipes/glib/all/test_package/conanfile.py b/recipes/glib/all/test_package/conanfile.py index 2f5458641d6f7..168cdc2e86991 100644 --- a/recipes/glib/all/test_package/conanfile.py +++ b/recipes/glib/all/test_package/conanfile.py @@ -18,7 +18,7 @@ def requirements(self): def build_requirements(self): if self.settings.os != "Windows" and not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str): - self.tool_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.3") def generate(self): tc = CMakeToolchain(self) diff --git a/recipes/glib/all/test_v1_package/conanfile.py b/recipes/glib/all/test_v1_package/conanfile.py index ed236807fcf7e..3247118701674 100644 --- a/recipes/glib/all/test_v1_package/conanfile.py +++ b/recipes/glib/all/test_v1_package/conanfile.py @@ -8,7 +8,7 @@ class TestPackageConan(ConanFile): def build_requirements(self): if self.settings.os != "Windows": - self.build_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.3") def build(self): if self.settings.os != "Windows":