Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 65 insertions, 13 deletions

diff --git a/nlohmann-json/.footprint b/nlohmann-json/.footprint
index 2c0839fb6..77be89d68 100644
--- a/nlohmann-json/.footprint
+++ b/nlohmann-json/.footprint
@@ -1,12 +1,64 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/nlohmann/
+-rw-r--r--	root/root	usr/include/nlohmann/adl_serializer.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/byte_container_with_subtype.hpp
+drwxr-xr-x	root/root	usr/include/nlohmann/detail/
+-rw-r--r--	root/root	usr/include/nlohmann/detail/abi_macros.hpp
+drwxr-xr-x	root/root	usr/include/nlohmann/detail/conversions/
+-rw-r--r--	root/root	usr/include/nlohmann/detail/conversions/from_json.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/conversions/to_chars.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/conversions/to_json.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/exceptions.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/hash.hpp
+drwxr-xr-x	root/root	usr/include/nlohmann/detail/input/
+-rw-r--r--	root/root	usr/include/nlohmann/detail/input/binary_reader.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/input/input_adapters.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/input/json_sax.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/input/lexer.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/input/parser.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/input/position_t.hpp
+drwxr-xr-x	root/root	usr/include/nlohmann/detail/iterators/
+-rw-r--r--	root/root	usr/include/nlohmann/detail/iterators/internal_iterator.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/iterators/iter_impl.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/iterators/iteration_proxy.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/iterators/iterator_traits.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/iterators/json_reverse_iterator.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/iterators/primitive_iterator.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/json_pointer.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/json_ref.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/macro_scope.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/macro_unscope.hpp
+drwxr-xr-x	root/root	usr/include/nlohmann/detail/meta/
+drwxr-xr-x	root/root	usr/include/nlohmann/detail/meta/call_std/
+-rw-r--r--	root/root	usr/include/nlohmann/detail/meta/call_std/begin.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/meta/call_std/end.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/meta/cpp_future.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/meta/detected.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/meta/identity_tag.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/meta/is_sax.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/meta/std_fs.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/meta/type_traits.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/meta/void_t.hpp
+drwxr-xr-x	root/root	usr/include/nlohmann/detail/output/
+-rw-r--r--	root/root	usr/include/nlohmann/detail/output/binary_writer.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/output/output_adapters.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/output/serializer.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/string_concat.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/string_escape.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/detail/value_t.hpp
 -rw-r--r--	root/root	usr/include/nlohmann/json.hpp
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/cmake/
-drwxr-xr-x	root/root	usr/lib/cmake/nlohmann_json/
--rw-r--r--	root/root	usr/lib/cmake/nlohmann_json/nlohmann_jsonConfig.cmake
--rw-r--r--	root/root	usr/lib/cmake/nlohmann_json/nlohmann_jsonConfigVersion.cmake
--rw-r--r--	root/root	usr/lib/cmake/nlohmann_json/nlohmann_jsonTargets.cmake
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/nlohmann_json.pc
+-rw-r--r--	root/root	usr/include/nlohmann/json_fwd.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/ordered_map.hpp
+drwxr-xr-x	root/root	usr/include/nlohmann/thirdparty/
+drwxr-xr-x	root/root	usr/include/nlohmann/thirdparty/hedley/
+-rw-r--r--	root/root	usr/include/nlohmann/thirdparty/hedley/hedley.hpp
+-rw-r--r--	root/root	usr/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/cmake/
+drwxr-xr-x	root/root	usr/share/cmake/nlohmann_json/
+-rw-r--r--	root/root	usr/share/cmake/nlohmann_json/nlohmann_jsonConfig.cmake
+-rw-r--r--	root/root	usr/share/cmake/nlohmann_json/nlohmann_jsonConfigVersion.cmake
+-rw-r--r--	root/root	usr/share/cmake/nlohmann_json/nlohmann_jsonTargets.cmake
+drwxr-xr-x	root/root	usr/share/pkgconfig/
+-rw-r--r--	root/root	usr/share/pkgconfig/nlohmann_json.pc
diff --git a/nlohmann-json/.signature b/nlohmann-json/.signature
index feb98abfe..96caeb24a 100644
--- a/nlohmann-json/.signature
+++ b/nlohmann-json/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33H53IybebifSJ0Zl9l1uuh7ypCBgDekqj2c0etkCKMJdhJO32zwia3pdTKsOpa/Fafll3EDv3RpEB+fe41yoAg=
-SHA256 (Pkgfile) = f7487e79bb6a59721ae36cd12d94b0ffc8a40deb2ba603c4c25b7e5ec84e1e26
-SHA256 (.footprint) = 953f375f30e0113326c4cb165e478ab5ad00e3ee09911b0be04dd429dee9ce03
-SHA256 (nlohmann-json-3.10.5.tar.gz) = 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
+RWSagIOpLGJF3++nj9wpWtyFohdcVCMgz2VKDNBObBTtqx8lmVNheF6QrN6M0KZTwXyHE8W4hPOKBV/8GLYsPQrKGAnz09P8Lw8=
+SHA256 (Pkgfile) = 05f8839e59d0644635ecb2ee23555483a860f3d90bceb8323ea56c4496e8b579
+SHA256 (.footprint) = 06ba37b9334c7301cfefc065fd543f8f511f6d3128a18009ed243fc6d75a3e8a
+SHA256 (nlohmann-json-3.11.1.tar.gz) = 598becb62ee0e01cf32795073c8ae09b6e95335cd43a4417b785d93ce105b0d0
diff --git a/nlohmann-json/Pkgfile b/nlohmann-json/Pkgfile
index 73a4bc90c..8e67d9ee7 100644
--- a/nlohmann-json/Pkgfile
+++ b/nlohmann-json/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:
 
 name=nlohmann-json
-version=3.10.5
+version=3.11.1
 release=1
 source=(https://github.com/nlohmann/json/archive/v$version/$name-$version.tar.gz)