(#23668) libgphoto2: use version range for libxml2

* libgphoto2: use version range for libxml2 * Remove reduntant patch --------- Co-authored-by: Abril Rincón Blanco <[email protected]>
conan-io · Oct 11, 2024 · 9c4849d · 9c4849d
1 parent 1e357d7
commit 9c4849d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/recipes/libgphoto2/all/conandata.yml b/recipes/libgphoto2/all/conandata.yml
@@ -6,7 +6,5 @@ sources:
     url: "https://github.com/gphoto/libgphoto2/releases/download/v2.5.27/libgphoto2-2.5.27.tar.xz"
     sha256: "a7253bd18c6ef65352150ac36a668f883a5ad2634eb6455b3ca9aa6ac98d0073"
 patches:
-  "2.5.31":
-    - patch_file: "patches/2.5.27-0001-macos_snprintf.patch"
   "2.5.27":
     - patch_file: "patches/2.5.27-0001-macos_snprintf.patch"
diff --git a/recipes/libgphoto2/all/conanfile.py b/recipes/libgphoto2/all/conanfile.py
@@ -57,7 +57,7 @@ def requirements(self):
         if self.options.with_libcurl:
             self.requires("libcurl/[>=7.78.0 <9]")
         if self.options.with_libxml2:
-            self.requires("libxml2/2.12.3")
+            self.requires("libxml2/[>=2.12.5 <3]")
         if self.options.with_libexif:
             self.requires("libexif/0.6.24")
         if self.options.with_libjpeg:
@@ -69,7 +69,7 @@ def validate(self):
 
     def build_requirements(self):
         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]")
         if self._settings_build.os == "Windows":
             self.win_bash = True
             if not self.conf.get("tools.microsoft.bash:path", check_type=str):