Merge branch 'master' into boost/clang16-compat

conan-io · Sep 23, 2024 · efc6abd · efc6abd
2 parents eb2a73a + 64b65c3
commit efc6abd
Show file tree

Hide file tree

Showing 36 changed files with 231 additions and 61 deletions.
diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml
@@ -1426,3 +1426,4 @@ authorized_users:
 - raplonu
 - mattkretz
 - DannyLihard
+- stevenwdv
diff --git a/docs/linters.md b/docs/linters.md
@@ -14,8 +14,7 @@ to configure plugins, warnings and errors which should be enabled or disabled.
 
   * [Understanding the different linters](#understanding-the-different-linters)
   * [Running the linters locally](#running-the-linters-locally)
-  * [Pylint configuration files](#pylint-configuration-files)
-  <!-- endToc -->
+  * [Pylint configuration files](#pylint-configuration-files)<!-- endToc -->
 
 ## Understanding the different linters
 

diff --git a/recipes/aws-c-io/all/conanfile.py b/recipes/aws-c-io/all/conanfile.py
@@ -39,11 +39,13 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
+        # These versions come from aws-sdl-cpp prefetch_crt_dependency.sh file,
+        # dont bump them independently, check the file and update all the dependencies at once
         if self.version == "0.14.7":
             self.requires("aws-c-common/0.9.15", transitive_headers=True, transitive_libs=True)
             self.requires("aws-c-cal/0.6.14")
             if self.settings.os in ["Linux", "FreeBSD", "Android"]:
-                self.requires("s2n/1.4.1")
+                self.requires("s2n/1.4.16")  # 1.4.11 not available, using next available version
         if self.version == "0.10.9":
             self.requires("aws-c-common/0.6.11", transitive_headers=True, transitive_libs=True)
             self.requires("aws-c-cal/0.5.12")

diff --git a/recipes/dlpack/all/conandata.yml b/recipes/dlpack/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.0":
+    url: "https://github.com/dmlc/dlpack/archive/v1.0.tar.gz"
+    sha256: "f8cfdcb634ff3cf0e3d9a3426e019e1c6469780a3b0020c9bc4ecc09cf9abcb1"
   "0.8":
     url: "https://github.com/dmlc/dlpack/archive/v0.8.tar.gz"
     sha256: "cf965c26a5430ba4cc53d61963f288edddcd77443aa4c85ce722aaf1e2f29513"

diff --git a/recipes/dlpack/all/test_package/test_package.cpp b/recipes/dlpack/all/test_package/test_package.cpp
@@ -4,7 +4,11 @@
 
 int main()
 {
-#if DLPACK_VERSION < 60
+#ifdef DLPACK_MAJOR_VERSION // Since 1.0
+    int major = DLPACK_MAJOR_VERSION;
+    int minor = DLPACK_MINOR_VERSION;
+    int patch = 0;
+#elif DLPACK_VERSION < 60
     int major = (DLPACK_VERSION >> 6) & 7;
     int minor = (DLPACK_VERSION >> 3) & 7;
     int patch = DLPACK_VERSION & 7;

diff --git a/recipes/dlpack/config.yml b/recipes/dlpack/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.0":
+    folder: "all"
   "0.8":
     folder: "all"
   "0.6":

diff --git a/recipes/greg7mdp-gtl/all/conandata.yml b/recipes/greg7mdp-gtl/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.2.0":
+    url: "https://github.com/greg7mdp/gtl/archive/refs/tags/v1.2.0.tar.gz"
+    sha256: "1547ab78f62725c380f50972f7a49ffd3671ded17a3cb34305da5c953c6ba8e7"
   "1.1.8":
     url: "https://github.com/greg7mdp/gtl/archive/v1.1.8.tar.gz"
     sha256: "6bda4c07bd966a88740ee07e3df23863a93d7b5365e0eea7f13cde9eda961b86"

diff --git a/recipes/greg7mdp-gtl/config.yml b/recipes/greg7mdp-gtl/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.2.0":
+    folder: all
   "1.1.8":
     folder: all
   "1.1.5":

diff --git a/recipes/imgui/all/conandata.yml b/recipes/imgui/all/conandata.yml
@@ -1,4 +1,10 @@
 sources:
+  "1.91.2":
+    url: "https://github.com/ocornut/imgui/archive/v1.91.2.tar.gz"
+    sha256: "a3c4fd857a0a48f6edad3e25de68fa1e96d2437f1665039714d1de9ad579b8d0"
+  "1.91.2-docking":
+    url: "https://github.com/ocornut/imgui/archive/v1.91.2-docking.tar.gz"
+    sha256: "bd6e9e6dc0451060152cea2a610256969c77a360659f4bd3836d6d4c9267229b"
   "1.91.0":
     url: "https://github.com/ocornut/imgui/archive/v1.91.0.tar.gz"
     sha256: "6e62c87252e6b3725ba478a1c04dc604aa0aaeec78fedcf4011f1e52548f4cc9"

diff --git a/recipes/imgui/config.yml b/recipes/imgui/config.yml
@@ -1,4 +1,8 @@
 versions:
+  "1.91.2":
+    folder: all
+  "1.91.2-docking":
+    folder: all
   "1.91.0":
     folder: all
   "1.91.0-docking":

diff --git a/recipes/json-c/all/conandata.yml b/recipes/json-c/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "0.18":
+    url: "https://github.com/json-c/json-c/archive/json-c-0.18-20240915.tar.gz"
+    sha256: "3112c1f25d39eca661fe3fc663431e130cc6e2f900c081738317fba49d29e298"
   "0.17":
     url: "https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz"
     sha256: "024d302a3aadcbf9f78735320a6d5aedf8b77876c8ac8bbb95081ca55054c7eb"

diff --git a/recipes/json-c/all/conanfile.py b/recipes/json-c/all/conanfile.py
@@ -1,6 +1,6 @@
 from conan import ConanFile
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
-from conan.tools.files import collect_libs, copy, get, rmdir
+from conan.tools.files import copy, get, rmdir
 from conan.tools.scm import Version
 import os
 
@@ -9,13 +9,13 @@
 
 class JSONCConan(ConanFile):
     name = "json-c"
-    package_type = "library"
-    description = "JSON-C - A JSON implementation in C"
-    topics = ("json", "encoding", "decoding", "manipulation")
+    description = "A JSON implementation in C"
+    license = "MIT"
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://github.com/json-c/json-c"
-    license = "MIT"
+    topics = ("json", "encoding", "decoding", "manipulation")
 
+    package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
@@ -64,8 +64,12 @@ def package(self):
         rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
 
     def package_info(self):
+        self.cpp_info.libs = ["json-c"]
+
         self.cpp_info.set_property("cmake_file_name", "json-c")
         self.cpp_info.set_property("cmake_target_name", "json-c::json-c")
         self.cpp_info.set_property("pkg_config_name", "json-c")
-        self.cpp_info.libs = collect_libs(self)
-        self.cpp_info.includedirs = ["include", "include/json-c"]
+        self.cpp_info.includedirs = ["include", os.path.join("include", "json-c")]
+
+        if Version(self.version) >= "0.17" and self.settings.os in ["Linux", "FreeBSD"]:
+            self.cpp_info.system_libs.extend(["m",])
diff --git a/recipes/json-c/config.yml b/recipes/json-c/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "0.18":
+    folder: all
   "0.17":
     folder: all
   "0.16":

diff --git a/recipes/libzip/all/conandata.yml b/recipes/libzip/all/conandata.yml
@@ -1,4 +1,9 @@
 sources:
+  "1.11.1":
+    url:
+      - "https://libzip.org/download/libzip-1.11.1.tar.gz"
+      - "https://github.com/nih-at/libzip/releases/download/v1.11.1/libzip-1.11.1.tar.gz"
+    sha256: "c0e6fa52a62ba11efd30262290dc6970947aef32e0cc294ee50e9005ceac092a"
   "1.10.1":
     url:
       - "https://libzip.org/download/libzip-1.10.1.tar.gz"
@@ -20,6 +25,13 @@ sources:
       - "https://github.com/nih-at/libzip/releases/download/v1.7.3/libzip-1.7.3.tar.gz"
     sha256: "0e2276c550c5a310d4ebf3a2c3dfc43fb3b4602a072ff625842ad4f3238cb9cc"
 patches:
+  "1.11.1":
+    - patch_file: "patches/1.7.3-0001-cmake-install-bundle.patch"
+      patch_description: "fix installation path of utilities"
+      patch_type: "conan"
+    - patch_file: "patches/1.11.1-0002-remove-rpath.patch"
+      patch_description: "remove rpath feature"
+      patch_type: "conan"
   "1.10.1":
     - patch_file: "patches/1.7.3-0001-cmake-install-bundle.patch"
       patch_description: "fix installation path of utilities"

diff --git a/recipes/libzip/all/conanfile.py b/recipes/libzip/all/conanfile.py
@@ -11,9 +11,9 @@
 class LibZipConan(ConanFile):
     name = "libzip"
     description = "A C library for reading, creating, and modifying zip archives"
+    license = "BSD-3-Clause"
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://github.com/nih-at/libzip"
-    license = "BSD-3-Clause"
     topics = ("zip", "zip-archives", "zip-editing")
     package_type = "library"
     settings = "os", "arch", "compiler", "build_type"

diff --git a/recipes/libzip/all/patches/1.11.1-0002-remove-rpath.patch b/recipes/libzip/all/patches/1.11.1-0002-remove-rpath.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d019b9..5cd6a81 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -290,7 +290,7 @@ if(WIN32)
+ endif(WIN32)
+
+ # rpath handling: use rpath in installed binaries
+-if(NOT CMAKE_SYSTEM_NAME MATCHES Linux)
++if(0)
+   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ endif()
diff --git a/recipes/libzip/config.yml b/recipes/libzip/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.11.1":
+    folder: all
   "1.10.1":
     folder: all
   "1.9.2":

diff --git a/recipes/pango/all/conandata.yml b/recipes/pango/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.54.0":
+    url: "https://download.gnome.org/sources/pango/1.54/pango-1.54.0.tar.xz"
+    sha256: "8a9eed75021ee734d7fc0fdf3a65c3bba51dfefe4ae51a9b414a60c70b2d1ed8"
   "1.51.0":
     url: "https://download.gnome.org/sources/pango/1.51/pango-1.51.0.tar.xz"
     sha256: "74efc109ae6f903bbe6af77eaa2ac6094b8ee245a2e23f132a7a8f0862d1a9f5"