Skip to content

Commit

Permalink
(#19935) glib/all: bump deps
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
ericLemanissier authored Oct 1, 2023
1 parent b578790 commit 21a486f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions recipes/glib/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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":
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion recipes/glib/all/test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion recipes/glib/all/test_v1_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down

0 comments on commit 21a486f

Please sign in to comment.