pangomm: remove overrides, add transitive_libs=True

conan-io · Oct 31, 2023 · f9e7f7b · f9e7f7b
1 parent ba63288
commit f9e7f7b
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/recipes/pangomm/all/conanfile.py b/recipes/pangomm/all/conanfile.py
@@ -59,20 +59,14 @@ def layout(self):
         basic_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("pango/1.50.14", transitive_headers=True)
-
-        # FIXME: temporary fix for dependency versions mismatch
-        # once dependencies versions are bumped remove these requirements
-        self.requires("expat/2.5.0", override=True)
-        self.requires("zlib/1.2.13", override=True)
-        self.requires("glib/2.77.1", override=True)
+        self.requires("pango/1.50.14", transitive_headers=True, transitive_libs=True)
 
         if self._is_2_48_api:
-            self.requires("glibmm/2.75.0", transitive_headers=True)
-            self.requires("cairomm/1.16.1", transitive_headers=True)
+            self.requires("glibmm/2.75.0", transitive_headers=True, transitive_libs=True)
+            self.requires("cairomm/1.16.1", transitive_headers=True, transitive_libs=True)
         elif self._is_1_4_api:
-            self.requires("glibmm/2.66.4", transitive_headers=True)
-            self.requires("cairomm/1.14.3", transitive_headers=True)
+            self.requires("glibmm/2.66.4", transitive_headers=True, transitive_libs=True)
+            self.requires("cairomm/1.14.3", transitive_headers=True, transitive_libs=True)
 
     def validate(self):
         if hasattr(self, "settings_build") and cross_building(self):
@@ -85,9 +79,9 @@ def validate(self):
                 check_min_cppstd(self, 11)
 
     def build_requirements(self):
-        self.tool_requires("meson/1.2.0")
+        self.tool_requires("meson/1.2.3")
         if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
-            self.tool_requires("pkgconf/1.9.5")
+            self.tool_requires("pkgconf/2.0.3")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)