use new libuuid recipe

conan-io · Sep 2, 2023 · bb136dd · bb136dd
1 parent 3238319
commit bb136dd
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/recipes/fontconfig/all/conanfile.py b/recipes/fontconfig/all/conanfile.py
@@ -23,12 +23,10 @@ class FontconfigConan(ConanFile):
     options = {
         "shared": [True, False],
         "fPIC": [True, False],
-        "libuuid": ["libuuid", "util-linux"]
     }
     default_options = {
         "shared": False,
         "fPIC": True,
-        "libuuid": "libuuid",
     }
 
     @property
@@ -52,10 +50,7 @@ def requirements(self):
         self.requires("freetype/2.13.0")
         self.requires("expat/2.5.0")
         if self.settings.os == "Linux":
-            if self.options.libuuid == "libuuid":
-                self.requires("libuuid/1.0.3")
-            else:
-                self.requires("util-linux-libuuid/2.39")
+            self.requires("util-linux-libuuid/2.39")
 
     def validate(self):
         if is_msvc(self):
@@ -64,7 +59,7 @@ def validate(self):
     def build_requirements(self):
         self.tool_requires("gperf/3.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.2")
         if self._settings_build.os == "Windows":
             self.win_bash = True
             if not self.conf.get("tools.microsoft.bash:path", check_type=str):