Merge branch 'master' into update/tk

conan-io · Apr 18, 2024 · 8c84d3f · 8c84d3f
2 parents d42431c + cc08e2f
commit 8c84d3f
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 11 deletions.
diff --git a/recipes/aaf/all/conanfile.py b/recipes/aaf/all/conanfile.py
@@ -35,7 +35,7 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("expat/2.5.0")
+        self.requires("expat/[>=2.6.2 <3]")
         self.requires("libjpeg/9e")
         if self.settings.os in ("FreeBSD", "Linux"):
             self.requires("util-linux-libuuid/2.39")

diff --git a/recipes/apr-util/all/conanfile.py b/recipes/apr-util/all/conanfile.py
@@ -90,7 +90,7 @@ def requirements(self):
         if self.options.with_sqlite3:
             self.requires("sqlite3/3.45.0")
         if self.options.with_expat:
-            self.requires("expat/2.5.0")
+            self.requires("expat/[>=2.6.2 <3]")
         if self.options.with_postgresql:
             self.requires("libpq/15.4")
 

diff --git a/recipes/asio/all/conandata.yml b/recipes/asio/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.30.2":
+    url: "https://github.com/chriskohlhoff/asio/archive/asio-1-30-2.tar.gz"
+    sha256: "755bd7f85a4b269c67ae0ea254907c078d408cce8e1a352ad2ed664d233780e8"
   "1.30.1":
     url: "https://github.com/chriskohlhoff/asio/archive/asio-1-30-1.tar.gz"
     sha256: "94b121cc2016680f2314ef58eadf169c2d34fff97fba01df325a192d502d3a58"

diff --git a/recipes/asio/config.yml b/recipes/asio/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.30.2":
+    folder: all
   "1.30.1":
     folder: all
   "1.29.0":

diff --git a/recipes/exiv2/all/conanfile.py b/recipes/exiv2/all/conanfile.py
@@ -76,7 +76,7 @@ def requirements(self):
             self.requires("libpng/[>=1.6 <2]")
             self.requires("zlib/[>=1.2.11 <2]")
         if self.options.with_xmp == "bundled":
-            self.requires("expat/2.5.0")
+            self.requires("expat/[>=2.6.2 <3]")
         if self.options.with_curl:
             self.requires("libcurl/[>=7.78.0 <9]")
         if self.options.get_safe("with_brotli"):

diff --git a/recipes/hwloc/all/conanfile.py b/recipes/hwloc/all/conanfile.py
@@ -32,7 +32,7 @@ def configure(self):
 
     def requirements(self):
         if self.options.with_libxml2:
-            self.requires("libxml2/2.12.3")
+            self.requires("libxml2/[>=2.12.5 <3]")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)

diff --git a/recipes/jsbsim/all/conanfile.py b/recipes/jsbsim/all/conanfile.py
@@ -48,7 +48,7 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("expat/2.5.0")
+        self.requires("expat/[>=2.6.2 <3]")
 
     def validate(self):
         if self.settings.compiler.get_safe("cppstd"):

diff --git a/recipes/libarchive/all/conanfile.py b/recipes/libarchive/all/conanfile.py
@@ -87,7 +87,7 @@ def requirements(self):
         if self.options.with_bzip2:
             self.requires("bzip2/1.0.8")
         if self.options.with_libxml2:
-            self.requires("libxml2/2.12.5")
+            self.requires("libxml2/[>=2.12.5 <3]")
         if self.options.with_expat:
             self.requires("expat/[>=2.6.2 <3]")
         if self.options.with_iconv:

diff --git a/recipes/libmetalink/all/conanfile.py b/recipes/libmetalink/all/conanfile.py
@@ -53,9 +53,9 @@ def layout(self):
 
     def requirements(self):
         if self.options.xml_backend == "expat":
-            self.requires("expat/2.5.0")
+            self.requires("expat/[>=2.6.2 <3]")
         elif self.options.xml_backend == "libxml2":
-            self.requires("libxml2/2.12.3")
+            self.requires("libxml2/[>=2.12.5 <3]")
 
     def validate(self):
         if is_msvc(self):

diff --git a/recipes/norm/all/conanfile.py b/recipes/norm/all/conanfile.py
@@ -39,7 +39,7 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("libxml2/2.12.3") # dependency of protolib actually
+        self.requires("libxml2/[>=2.12.5 <3]") # dependency of protolib actually
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version])

diff --git a/recipes/proxy/all/conandata.yml b/recipes/proxy/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.3.1":
+    url: "https://github.com/microsoft/proxy/archive/refs/tags/2.3.1.tar.gz"
+    sha256: "bfec45ada9cd3dc576df34bbe877c5d03a81906a00759970c0197c3fa041c5c7"
   "2.3.0":
     url: "https://github.com/microsoft/proxy/archive/refs/tags/2.3.0.tar.gz"
     sha256: "ff6f17c5360895776d29ce2b1235de7b42912468b52729810506431e352a78d0"

diff --git a/recipes/proxy/config.yml b/recipes/proxy/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "2.3.1":
+    folder: all
   "2.3.0":
     folder: all
   "2.2.1":

diff --git a/recipes/xkbcommon/all/conanfile.py b/recipes/xkbcommon/all/conanfile.py
@@ -66,7 +66,7 @@ def requirements(self):
         if self.options.with_x11:
             self.requires("xorg/system")
         if self.options.get_safe("xkbregistry"):
-            self.requires("libxml2/2.12.3")
+            self.requires("libxml2/[>=2.12.5 <3]")
         if self.options.get_safe("with_wayland"):
             self.requires("wayland/1.22.0")
 

diff --git a/recipes/xlsxio/all/conanfile.py b/recipes/xlsxio/all/conanfile.py
@@ -62,7 +62,7 @@ def requirements(self):
             self.requires("minizip-ng/4.0.1")
         else:
             self.requires("minizip/1.2.13")
-        self.requires("expat/2.5.0")
+        self.requires("expat/[>=2.6.2 <3]")
 
     def validate(self):
         if Version(self.version) >= "0.2.34":