glib: Bump libmount to 2.39.2 to avoid conflicts with libsystemd

Also avoids conflicts with libwebsockets.
conan-io · Mar 8, 2024 · 8a788fd · 8a788fd
1 parent 72b035c
commit 8a788fd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 39 deletions.
diff --git a/recipes/glib/all/conanfile.py b/recipes/glib/all/conanfile.py
@@ -70,7 +70,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.39")
+            self.requires("libmount/2.39.2")
         if self.options.get_safe("with_selinux"):
             self.requires("libselinux/3.5")
         if self.settings.os != "Linux":
@@ -81,9 +81,9 @@ def requirements(self):
             self.requires("libiconv/1.17")
 
     def build_requirements(self):
-        self.tool_requires("meson/1.2.2")
+        self.tool_requires("meson/1.3.2")
         if not self.conf.get("tools.gnu:pkg_config", check_type=str):
-            self.tool_requires("pkgconf/2.0.3")
+            self.tool_requires("pkgconf/2.1.0")
 
     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
@@ -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/2.0.3")
+            self.tool_requires("pkgconf/2.1.0")
 
     def generate(self):
         tc = CMakeToolchain(self)

diff --git a/recipes/glib/all/test_v1_package/CMakeLists.txt b/recipes/glib/all/test_v1_package/CMakeLists.txt
diff --git a/recipes/glib/all/test_v1_package/conanfile.py b/recipes/glib/all/test_v1_package/conanfile.py