Merge branch 'master' into migrate/qt-advanced-docking-system

conan-io · Apr 20, 2024 · cf528af · cf528af
2 parents 3266740 + 4d82681
commit cf528af
Show file tree

Hide file tree

Showing 750 changed files with 12,668 additions and 10,543 deletions.
diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml
@@ -1313,3 +1313,26 @@ authorized_users:
 - Ruwei-Liu
 - msparapa
 - pzheltov
+- igadmg
+- eljonny
+- VladimirShaleev
+- phwissmann
+- ybogo
+- ujos
+- nclindroos
+- es20490446e
+- victimsnino
+- dmpriso
+- darakelian
+- sivachandran
+- oteffahi
+- Ruwei
+- TibiIius
+- MattBelanger321
+- X1aomu
+- datalogics-rgailiunas
+- yhsng
+- omdxp
+- pierricgimmig
+- laci-aura
+- BenBudr
diff --git a/.c3i/conan_v2_ready_references.yml b/.c3i/conan_v2_ready_references.yml
@@ -90,6 +90,7 @@ required_for_references:
 - bdwgc
 - bear
 - beauty
+- behaviortree.cpp
 - benchmark
 - bertrand
 - bezier
@@ -208,6 +209,7 @@ required_for_references:
 - cose-c
 - cotila
 - coz
+- cpp-channel
 - cpp-httplib
 - cpp-ipc
 - cpp-jwt
@@ -236,6 +238,7 @@ required_for_references:
 - cprocessing
 - cpu_features
 - cpuinfo
+- cpython
 - cqrlib
 - crc32c
 - crc_cpp
@@ -533,6 +536,7 @@ required_for_references:
 - id3v2lib
 - idna
 - ignition-cmake
+- iguana
 - iir1
 - im95able-rea
 - imagl
@@ -629,6 +633,7 @@ required_for_references:
 - libbacktrace
 - libbasisu
 - libbigwig
+- libboxes
 - libbpf
 - libbsd
 - libcap
@@ -644,6 +649,7 @@ required_for_references:
 - libcpuid
 - libcuckoo
 - libcurl
+- libcvd
 - libdaemon
 - libdb
 - libdc1394
@@ -670,9 +676,11 @@ required_for_references:
 - libexif
 - libfdk_aac
 - libffi
+- libfork
 - libfreenect
 - libfreenect2
 - libftdi
+- libftp
 - libfuse
 - libgcrypt
 - libgd
@@ -690,6 +698,7 @@ required_for_references:
 - libiberty
 - libiconv
 - libid3tag
+- libinput
 - libinterpolate
 - libipt
 - libjpeg
@@ -767,6 +776,7 @@ required_for_references:
 - libspng
 - libsquish
 - libsrtp
+- libssh
 - libssh2
 - libsvm
 - libsvtav1
@@ -847,6 +857,7 @@ required_for_references:
 - lzma_sdk
 - lzo
 - m4
+- macdylibbundler
 - maddy
 - magic_enum
 - mailio
@@ -893,6 +904,7 @@ required_for_references:
 - mingw-builds
 - mingw-w64
 - miniaudio
+- minicoro
 - minimp3
 - minisat
 - miniscript
@@ -903,6 +915,7 @@ required_for_references:
 - minizip-ng
 - mio
 - mm_file
+- mocknetworkaccessmanager
 - modern-cpp-kafka
 - mold
 - moltenvk
@@ -970,6 +983,7 @@ required_for_references:
 - numcpp
 - nuraft
 - nv-codec-headers
+- nvcloth
 - nvtx
 - oatpp
 - oatpp-libressl
@@ -1026,12 +1040,14 @@ required_for_references:
 - openmesh
 - openmvg
 - openpam
+- openssh
 - openssl
 - opensubdiv
 - opentdf-client
 - opentelemetry-cpp
 - opentelemetry-proto
 - opentracing-cpp
+- openvdb
 - openvino
 - openvr
 - openxlsx
@@ -1042,6 +1058,7 @@ required_for_references:
 - orcania
 - osmanip
 - osqp
+- ouster_sdk
 - out_ptr
 - outcome
 - ozz-animation
@@ -1123,6 +1140,7 @@ required_for_references:
 - protobuf-c
 - protopuf
 - protozero
+- proxy
 - psimd
 - psyinf-gmtl
 - ptex
@@ -1146,6 +1164,7 @@ required_for_references:
 - quantlib
 - quaternions
 - quazip
+- quickcpplib
 - quickfix
 - quickjs
 - quill
@@ -1274,13 +1293,15 @@ required_for_references:
 - span-lite
 - spdlog
 - spectra
+- speedb
 - spirv-cross
 - spirv-headers
 - spirv-tools
 - spscqueue
 - spy
 - sqlcipher
 - sqlite3
+- sqlite3mc
 - sqlite_orm
 - sqlitecpp
 - sqlpp11
@@ -1380,6 +1401,7 @@ required_for_references:
 - tng
 - toml11
 - tomlplusplus
+- toon
 - tqdm-cpp
 - tracy
 - transwarp
@@ -1474,6 +1496,7 @@ required_for_references:
 - whisper-cpp
 - wide-integer
 - wil
+- wildcards
 - wildmidi
 - winflexbison
 - winmd

diff --git a/.c3i/config_v1.yml b/.c3i/config_v1.yml
@@ -3,7 +3,7 @@
 id: 'conan-io/conan-center-index'
 
 conan:
-  version: 1.62.0
+  version: 1.64.0
 
 artifactory:
   url: "https://c3i.jfrog.io/c3i"

diff --git a/.c3i/config_v2.yml b/.c3i/config_v2.yml
@@ -3,7 +3,7 @@
 id: 'conan-io/conan-center-index'
 
 conan:
-  version: 2.0.16
+  version: 2.2.2
   backup_sources:
     upload_url: "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"
     download_url: "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"

diff --git a/.github/workflows/alert-community.yml b/.github/workflows/alert-community.yml
@@ -316,6 +316,11 @@ jobs:
           files: "recipes/lz4/*/*"
           reviewers: "@Hopobcn"
 
+      - uses: ./.github/actions/alert-community
+        with:
+          files: "recipes/mocknetworkaccessmanager/*/*"
+          reviewers: "@MartinDelille"
+
       - uses: ./.github/actions/alert-community
         with:
           files: "recipes/ms-gsl/*/*"
@@ -376,6 +381,11 @@ jobs:
           files: "recipes/psimd/*/*"
           reviewers: "@Hopobcn"
 
+      - uses: ./.github/actions/alert-community
+        with:
+          files: "recipes/qtawesome/*/*"
+          reviewers: "@MartinDelille"
+
       - uses: ./.github/actions/alert-community
         with:
           files: "recipes/qt/*/*"

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,9 +1,19 @@
 # Changelog
 
-### 13-Mar-2024 - 11:08 CET
+### 03-April-2024 - 13:53 CEST
 
-- [feature]: Build with both */*:shared=True/False option when package type is declared as ``shared-library``.
-- [fix]: Fix ValidateInfra python version check to be aligned with the latest Jenkins version.
+- [feature] Add support for Conan 2.2.2 in the CI
+- [feature] Add support for Conan 1.63.0 in the CI
+
+### 20-March-2024 - 11:13 CET
+
+- [fix] Changing Version Ranges in dependencies is now bump dependencies
+- [fix] Static library package type should be built with both all static and all shared dependencies
+
+### 13-March-2024 - 11:08 CET
+
+- [feature] Build with both */*:shared=True/False option when package type is declared as ``shared-library``.
+- [fix] Fix ValidateInfra python version check to be aligned with the latest Jenkins version.
 
 ### 07-February-2024 - 15:43 CET
 

diff --git a/docs/faqs.md b/docs/faqs.md
@@ -453,6 +453,8 @@ and does not install libraries with the boost prefix.
 
 Yes, but make sure it does not have Boost in the name. Use the [`author-name` convention](https://github.com/conan-io/conan-center-index/blob/master/docs/faqs.md#what-is-the-policy-on-recipe-name-collisions) so there are no conflicts. In addition to follow the rules outlined above.
 
+**NOTE**: In case you have no intention to submit to Boost, then you can use the project name as is (e.g `boost-foobar`).
+
 ## Can I add options that do not affect `package_id` or the package contents
 
 Generally no, these sorts of options can most likely be set from a profile or downstream recipes. However if the project supports this option from its build script

diff --git a/docs/package_templates/autotools_package/all/conanfile.py b/docs/package_templates/autotools_package/all/conanfile.py
@@ -132,7 +132,7 @@ def generate(self):
         # --enable/disable-shared is automatically managed when 'shared' option is declared
         tc = AutotoolsToolchain(self)
         # autotools usually uses 'yes' and 'no' to enable/disable options
-        yes_no = lambda v: "yes" if v else "no"
+        def yes_no(v): return "yes" if v else "no"
         tc.configure_args.extend([
             f"--with-foobar={yes_no(self.options.with_foobar)}",
             "--enable-tools=no",

diff --git a/docs/supported_platforms_and_configurations.md b/docs/supported_platforms_and_configurations.md
@@ -58,8 +58,8 @@ For more information see [conan-io/conan-docker-tools](https://github.com/conan-
 
 ## Linux
 
-- Python: 3.7.13
-- CMake: 3.15.7, 3.18.2 (same version expected after all use [new docker images](https://github.com/conan-io/conan-docker-tools/tree/master/modern))
+- Python: 3.7.17
+- CMake: 3.15.7, 3.18.6 (same version expected after all use [new docker images](https://github.com/conan-io/conan-docker-tools/tree/master/modern))
 - Compilers:
   - GCC versions: 5, 7, 9, 11
   - Clang versions: 13

diff --git a/recipes/7bitdi/all/conandata.yml b/recipes/7bitdi/all/conandata.yml
@@ -1,4 +1,10 @@
 sources:
+  "3.1.0":
+    url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v3.1.0.tar.gz"
+    sha256: "345bf91e2a33cfe98628cac98c75488ddd55232b8c4bcfeba9b5001fec8d4f7c"
+  "3.0.0":
+    url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v3.0.0.tar.gz"
+    sha256: "aabb8e907c0cafb8e4b7c8367ed5dbb3cba2d83af090bdef9a7f855c0778c8f3"
   "2.1.0":
     url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v2.1.0.tar.gz"
     sha256: "54edceb4f90bf652126310ca0b78150d05a02d7081cef3c9ccaba5f4dd112935"

diff --git a/recipes/7bitdi/config.yml b/recipes/7bitdi/config.yml
@@ -1,4 +1,8 @@
 versions:
+  "3.1.0":
+    folder: all
+  "3.0.0":
+    folder: all
   "2.1.0":
     folder: all
   "2.0.0":

diff --git a/recipes/7zip/19.00/conandata.yml → recipes/7zip/all/conandata.yml b/recipes/7zip/19.00/conandata.yml → recipes/7zip/all/conandata.yml
diff --git a/recipes/7zip/19.00/conanfile.py → recipes/7zip/all/conanfile.py b/recipes/7zip/19.00/conanfile.py → recipes/7zip/all/conanfile.py
@@ -62,9 +62,11 @@ def generate(self):
             tc.generate()
         else:
             tc = AutotoolsToolchain(self)
+            env = None
             if self.settings.os == "Windows" and self.settings.compiler == "gcc":
-                tc.environment().define("IS_MINGW", "1")
-            tc.generate()
+                env = tc.environment()
+                env.define("IS_MINGW", "1")
+            tc.generate(env=env)
             deps = AutotoolsDeps(self)
             deps.generate()
 

diff --git a/recipes/7zip/19.00/test_package/conanfile.py → recipes/7zip/all/test_package/conanfile.py b/recipes/7zip/19.00/test_package/conanfile.py → recipes/7zip/all/test_package/conanfile.py
diff --git a/...s/7zip/19.00/test_v1_package/conanfile.py → ...pes/7zip/all/test_v1_package/conanfile.py b/...s/7zip/19.00/test_v1_package/conanfile.py → ...pes/7zip/all/test_v1_package/conanfile.py
diff --git a/recipes/7zip/config.yml b/recipes/7zip/config.yml
@@ -1,7 +1,7 @@
 versions:
   "23.01":
-    folder: "19.00"
+    folder: "all"
   "22.01":
-    folder: "19.00"
+    folder: "all"
   "19.00":
-    folder: "19.00"
+    folder: "all"
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/abseil/all/conandata.yml b/recipes/abseil/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "20240116.2":
+    url: "https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz"
+    sha256: "733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc"
   "20240116.1":
     url: "https://github.com/abseil/abseil-cpp/archive/20240116.1.tar.gz"
     sha256: "3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a"
@@ -15,6 +18,15 @@ sources:
     url: "https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz"
     sha256: "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4"
 patches:
+  "20240116.2":
+    - patch_file: "patches/0003-absl-string-libm-20240116.patch"
+      patch_description: "link libm to absl string"
+      patch_type: "portability"
+      patch_source: "https://github.com/abseil/abseil-cpp/issues/1100"
+    - patch_file: "patches/20240116.1-0001-fix-filesystem-include.patch"
+      patch_description: "Fix GCC 7 including <filesystem> in C++17 mode when it is not available (until GCC 8)"
+      patch_type: "portability"
+      patch_source: "https://github.com/abseil/abseil-cpp/commit/bb83aceacb554e79e7cd2404856f0be30bd00303"
   "20240116.1":
     - patch_file: "patches/0003-absl-string-libm-20240116.patch"
       patch_description: "link libm to absl string"

diff --git a/recipes/abseil/config.yml b/recipes/abseil/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "20240116.2":
+    folder: all
   "20240116.1":
     folder: all
   "20230802.1":

diff --git a/recipes/ada/all/conandata.yml b/recipes/ada/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.7.8":
+    url: "https://github.com/ada-url/ada/archive/v2.7.8.tar.gz"
+    sha256: "8de067b7cb3da1808bf5439279aee6048d761ba246bf8a854c2af73b16b41c75"
   "2.7.7":
     url: "https://github.com/ada-url/ada/archive/v2.7.7.tar.gz"
     sha256: "7116d86a80b79886efbc9d946d3919801815060ae62daf78de68c508552af554"

diff --git a/recipes/ada/config.yml b/recipes/ada/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "2.7.8":
+    folder: all
   "2.7.7":
     folder: all
   "2.7.5":