From 7e8b33bbf29f4982b32bed4f19c337767373a7b1 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Wed, 11 Sep 2024 20:00:24 +0200 Subject: [PATCH] use version range for xz_utils, zstd, meson & pkgconf + bump versions of libcap & lz4 --- recipes/libsystemd/all/conanfile.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/libsystemd/all/conanfile.py b/recipes/libsystemd/all/conanfile.py index 2f7cbdaadba28..07a75bf2cf2ee 100644 --- a/recipes/libsystemd/all/conanfile.py +++ b/recipes/libsystemd/all/conanfile.py @@ -60,17 +60,17 @@ def _compilers_minimum_version(self): } def requirements(self): - self.requires("libcap/2.69") + self.requires("libcap/2.70") self.requires("libmount/2.39.2") self.requires("libxcrypt/4.4.36") if self.options.with_selinux: self.requires("libselinux/3.6") if self.options.with_lz4: - self.requires("lz4/1.9.4") + self.requires("lz4/1.10.0") if self.options.with_xz: - self.requires("xz_utils/5.4.5") + self.requires("xz_utils/[>=5.4.5 <6]") if self.options.with_zstd: - self.requires("zstd/1.5.5") + self.requires("zstd/[>=1.5 <1.6]") def validate(self): if self.settings.os != "Linux": @@ -82,11 +82,11 @@ def validate(self): ) def build_requirements(self): - self.tool_requires("meson/1.4.0") + self.tool_requires("meson/[>=1.2.3 <2]") self.tool_requires("m4/1.4.19") self.tool_requires("gperf/3.1") if not self.conf.get("tools.gnu:pkg_config", check_type=str): - self.tool_requires("pkgconf/2.1.0") + self.tool_requires("pkgconf/[>=2.2 <3]") def source(self): # Extract using standard Python tools due to Conan's unzip() not handling backslashes in