[libyaml/sqlpp11/xeus/uvatlas/xxhash] Update to the latest version (#13657)

* [many ports] Update to the latest version

* [xeus] Fix static build

* [usd] Revert change

* [xeus] Fix build error

* [sqlpp11] Update latest version

* [libyaml] Fix build error on Linux

* [sqlpp11] Fix build error

5 files changed, 27 insertions, 33 deletions

diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL
index aafd8c00b..20ad500f3 100644
--- a/ports/xeus/CONTROL
+++ b/ports/xeus/CONTROL
@@ -1,4 +1,5 @@
 Source: xeus

-Version: 0.20.0-1
+Version: 0.24.1

+Homepage: https://github.com/jupyter-xeus/xeus
 Description: C++ implementation of the Jupyter kernel protocol

 Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq

diff --git a/ports/xeus/Fix-Compile-nlohmann-json.patch b/ports/xeus/Fix-Compile-nlohmann-json.patch
index 7381d14ca..463c09170 100644
--- a/ports/xeus/Fix-Compile-nlohmann-json.patch
+++ b/ports/xeus/Fix-Compile-nlohmann-json.patch
@@ -1,12 +1,12 @@
 diff --git a/src/xmessage.cpp b/src/xmessage.cpp
-index 0d6ad99..621d838 100644
+index 1ab9544..5a14ba0 100644
 --- a/src/xmessage.cpp
 +++ b/src/xmessage.cpp
-@@ -12,6 +12,7 @@
+@@ -13,6 +13,7 @@
  #include <sstream>
  #include <string>
  #include <utility>
 +#include <ciso646>
  
- #include "xeus/xguid.hpp"
- #include "xeus/xmessage.hpp"
+ #include "nlohmann/json.hpp"
+ 
diff --git a/ports/xeus/Fix-TypeConversion.patch b/ports/xeus/Fix-TypeConversion.patch
deleted file mode 100644
index 72a8c484e..000000000
--- a/ports/xeus/Fix-TypeConversion.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/xkernel_configuration.cpp b/src/xkernel_configuration.cpp
-index 681b45d..b5a68eb 100644
---- a/src/xkernel_configuration.cpp
-+++ b/src/xkernel_configuration.cpp
-@@ -25,8 +25,8 @@ namespace xeus
-         ifs >> doc;
- 
-         xconfiguration res;
--        res.m_transport = doc["transport"];
--        res.m_ip = doc["ip"];
-+        res.m_transport = doc["transport"].get<std::string>();
-+        res.m_ip = doc["ip"].get<std::string>();
-         res.m_control_port = std::to_string(doc["control_port"].get<int>());
-         res.m_shell_port = std::to_string(doc["shell_port"].get<int>());
-         res.m_stdin_port = std::to_string(doc["stdin_port"].get<int>());
-@@ -35,7 +35,7 @@ namespace xeus
-         res.m_signature_scheme = doc.value("signature_scheme", "");
-         if (res.m_signature_scheme != "")
-         {
--            res.m_key = doc["key"];
-+            res.m_key = doc["key"].get<std::string>();
-         }
-         else
-         {
diff --git a/ports/xeus/Fix-static-build.patch b/ports/xeus/Fix-static-build.patch
new file mode 100644
index 000000000..4caf0138f
--- /dev/null
+++ b/ports/xeus/Fix-static-build.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d02b5d6..6484131 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,7 +244,10 @@ macro(xeus_create_target target_name linkage output_name)
+         PUBLIC xtl
+     )
+ 
+-    target_link_libraries(${target_name} PUBLIC OpenSSL::Crypto)
++	if (MSVC)
++	    target_link_libraries(OpenSSL::Crypto INTERFACE crypt32)
++    endif ()
++	target_link_libraries(${target_name} PUBLIC OpenSSL::Crypto)
+ 
+     if (NOT MSVC)
+         if (APPLE)
diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake
index 577dbff1c..e68b872d5 100644
--- a/ports/xeus/portfile.cmake
+++ b/ports/xeus/portfile.cmake
@@ -1,12 +1,12 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO QuantStack/xeus

-    REF 8408f237f33514610a59d19a5ff045ee70dfa02b
-    SHA512 41282addbe5519b6d357e802c48483834cd951604bfeb8c99d96f02d03dec2fc66ea4c091f40ec09348bb60587e8a6efef5e6eb2bb950ba720fc8ceb7a107960

+    REF 424b7cd177886906a59eee535b7de59088461910 # 0.24.1
+    SHA512 877ca45bf649b567a9921d3e8f0adb0299dbe956978bd6e217d0c06617cf3466d08d90d607fd33e129089472e1a96ecec78b1fc21346bc13ba268168a5a6b068

     HEAD_REF master

     PATCHES
-		Fix-TypeConversion.patch
-		Fix-Compile-nlohmann-json.patch
+		Fix-Compile-nlohmann-json.patch

+		Fix-static-build.patch
 )

 

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)

@@ -43,6 +43,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
         "#ifdef XEUS_STATIC_LIB"

         "#if 1 // #ifdef XEUS_STATIC_LIB"

     )

+	file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")

 endif()

 

 # Handle copyright