[saucer] update to v6.0.1 (#45727)

2025-06-11 06:30:58 +09:00 · 2025-06-11 06:30:58 +09:00 · ddcf0936d3
parent bc6958a8c4
commit ddcf0936d3
27 changed files with 300 additions and 173 deletions
--- a/ports/eraser/portfile.cmake
+++ b/ports/eraser/portfile.cmake
@ -0,0 +1,13 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Curve/eraser
+    REF "v${VERSION}"
+    SHA512 f0cc02d1bc643239ed648006db0c13e704e803537060930080b2cdd692fa09082a5d73dc7487a6c4e5aa95d0a7bf6fd4623ee8567ebd152c20221a9c8fa0f7eb
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH})
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/eraser/vcpkg.json
+++ b/ports/eraser/vcpkg.json
@ -0,0 +1,13 @@
+{
+  "name": "eraser",
+  "version": "2.2.1",
+  "description": "A C++20 type-erasure library that supports user defined interfaces",
+  "homepage": "https://github.com/Curve/eraser",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
--- a/ports/ereignis/portfile.cmake
+++ b/ports/ereignis/portfile.cmake
@ -1,14 +1,13 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
-    REPO Soundux/ereignis
+    REPO Curve/ereignis
    REF "v${VERSION}"
-    SHA512 b8c8bbb40bf3501e4612cddfbdbf8117f0e89c7781dfa551f1a62e825566dfd9755889d2c953827679d94198ebfbd8f01e85478d7ac0529b0d564d45788ca707
+    SHA512 73b9fbf01caee6f0cc49de771ee5fc5e1da208acd2d3d40647c3e9c19df121b05c3403393539fa4bb510cb8e58769fe9afa5b036ce04c564266fc49b8ddea8e5
    HEAD_REF master
 )

 vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH})
-
 vcpkg_cmake_install()

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/ereignis/vcpkg.json
+++ b/ports/ereignis/vcpkg.json
@ -1,8 +1,8 @@
 {
  "name": "ereignis",
-  "version": "2.3",
+  "version": "4.3",
  "description": "A thread-safe C++17 Event Library",
-  "homepage": "https://github.com/Soundux/ereignis",
+  "homepage": "https://github.com/Curve/ereignis",
  "license": "MIT",
  "dependencies": [
    {
--- a/ports/lockpp/portfile.cmake
+++ b/ports/lockpp/portfile.cmake
@ -1,15 +1,13 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
-    REPO Soundux/lockpp
+    REPO Curve/lockpp
    REF "v${VERSION}"
    SHA512 ce2572ff53096a53cda722e47bbd23e4c3a8b3856de9dfe775b7468cd5f7fcbc86412457af091b8977dd0b41d161c103b679c7a98016f6e9d3ab70aaa360648f
    HEAD_REF master
 )

 vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH})
-
 vcpkg_cmake_install()

-
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/lockpp/vcpkg.json
+++ b/ports/lockpp/vcpkg.json
@ -1,8 +1,9 @@
 {
  "name": "lockpp",
  "version": "3.0",
+  "port-version": 1,
  "description": "A C++17 Library that provides mutex protected objects",
-  "homepage": "https://github.com/Soundux/lockpp",
+  "homepage": "https://github.com/Curve/lockpp",
  "license": "MIT",
  "dependencies": [
    {
--- a/ports/poolparty/portfile.cmake
+++ b/ports/poolparty/portfile.cmake
@ -0,0 +1,13 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Curve/poolparty
+    REF "v${VERSION}"
+    SHA512 ae542b2be6134cf58926e4ede8840bff560c427d45c07fadb7dc465112712df80a89569f5ebd4d57c6045cdd74380a65ed296f32c8904531327207aa7281c1b6
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH})
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/poolparty/vcpkg.json
+++ b/ports/poolparty/vcpkg.json
@ -0,0 +1,13 @@
+{
+  "name": "poolparty",
+  "version": "3.0.1",
+  "description": "A C++20 thread-pool library",
+  "homepage": "https://github.com/Curve/poolparty",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
--- a/ports/rebind/portfile.cmake
+++ b/ports/rebind/portfile.cmake
@ -0,0 +1,13 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Curve/rebind
+    REF "v${VERSION}"
+    SHA512 8c310eba61a65268fb9820aab0529d04900d1e95544e4fbc6c70a004e4cf64152ab8e2b636d6bd5ad16a381dcbad03f303d176848aedd6e3b29e3037371cf624
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH})
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/rebind/vcpkg.json
+++ b/ports/rebind/vcpkg.json
@ -0,0 +1,13 @@
+{
+  "name": "rebind",
+  "version": "5.2.2",
+  "description": "A C++23 reflection library for aggregates and enums",
+  "homepage": "https://github.com/Curve/rebind",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
--- a/ports/saucer/0001-use-local-packages.patch
+++ b/ports/saucer/0001-use-local-packages.patch
@ -0,0 +1,129 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 32fdea7..77892c6 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -286,62 +286,30 @@ endif()
+ include("cmake/nuget.cmake")
+ include("cmake/module.cmake")
+ 
+-CPMFindPackage(
+-  NAME           lockpp
+-  VERSION        3.0
+-  GIT_REPOSITORY "https://github.com/Curve/lockpp"
+-)
+-
+-CPMFindPackage(
+-  NAME           boost_callable_traits
+-  GIT_TAG        boost-1.87.0
+-  GIT_REPOSITORY "https://github.com/boostorg/callable_traits"
+-)
+-
+-CPMFindPackage(
+-  NAME           ereignis
+-  VERSION        4.3
+-  GIT_REPOSITORY "https://github.com/Soundux/ereignis"
+-)
+-
+-CPMFindPackage(
+-  NAME           fmt
+-  GIT_TAG        11.1.1
+-  GIT_REPOSITORY "https://github.com/fmtlib/fmt"
+-)
+-
+-CPMFindPackage(
+-  NAME           flagpp
+-  VERSION        3.0
+-  GIT_REPOSITORY "https://github.com/Curve/flagpp"
+-)
+-
+-CPMFindPackage(
+-  NAME           rebind
+-  VERSION        5.1.1
+-  GIT_REPOSITORY "https://github.com/Curve/rebind"
+-)
+-
+-CPMFindPackage(
+-  NAME           poolparty
+-  VERSION        3.0.1
+-  GIT_REPOSITORY "https://github.com/Curve/poolparty"
+-)
+-
+-CPMFindPackage(
+-  NAME           eraser
+-  VERSION        2.2.1
+-  GIT_REPOSITORY "https://github.com/Curve/eraser"
+-)
+-
+-CPMFindPackage(
+-  NAME           boost_preprocessor
+-  GIT_TAG        boost-1.87.0
+-  GIT_REPOSITORY "https://github.com/boostorg/preprocessor"
+-)
+-
+-target_link_libraries(${PROJECT_NAME} ${saucer_linkage} boost_preprocessor cr::lockpp cr::flagpp)
+-target_link_libraries(${PROJECT_NAME} PUBLIC            boost_callable_traits cr::ereignis fmt::fmt cr::rebind cr::poolparty cr::eraser)
+find_path(LOCKPP_INCLUDE_DIRS "lockpp")
+add_library(cr::lockpp INTERFACE IMPORTED)
+target_include_directories(cr::lockpp INTERFACE ${LOCKPP_INCLUDE_DIRS})
+find_path(FLAGPP_INCLUDE_DIRS "flagpp")
+add_library(cr::flagpp INTERFACE IMPORTED)
+target_include_directories(cr::flagpp INTERFACE ${FLAGPP_INCLUDE_DIRS})
+find_path(EREIGNIS_INCLUDE_DIRS "ereignis")
+add_library(cr::ereignis INTERFACE IMPORTED)
+target_include_directories(cr::ereignis INTERFACE ${EREIGNIS_INCLUDE_DIRS})
+find_path(REBIND_INCLUDE_DIRS "rebind")
+add_library(cr::rebind INTERFACE IMPORTED)
+target_include_directories(cr::rebind INTERFACE ${REBIND_INCLUDE_DIRS})
+find_path(POOLPARTY_INCLUDE_DIRS "poolparty")
+add_library(cr::poolparty INTERFACE IMPORTED)
+target_include_directories(cr::poolparty INTERFACE ${POOLPARTY_INCLUDE_DIRS})
+find_path(ERASER_INCLUDE_DIRS "eraser")
+add_library(cr::eraser INTERFACE IMPORTED)
+target_include_directories(cr::eraser INTERFACE ${ERASER_INCLUDE_DIRS})
+
+find_package(fmt CONFIG REQUIRED)
+find_package(Boost REQUIRED COMPONENTS callable_traits preprocessor)
+
+target_link_libraries(${PROJECT_NAME} ${saucer_linkage} Boost::preprocessor cr::lockpp cr::flagpp)
+target_link_libraries(${PROJECT_NAME} PUBLIC            Boost::callable_traits cr::ereignis fmt::fmt cr::rebind cr::poolparty cr::eraser)
+ 
+ # --------------------------------------------------------------------------------------------------------
+ # Setup Backends
+@@ -405,7 +373,7 @@ if (saucer_backend STREQUAL "WebView2")
+   target_compile_definitions(${PROJECT_NAME} PRIVATE UNICODE=1 _UNICODE=1 NOMINMAX=1)
+ 
+   include("cmake/webview2.cmake")
+-  target_link_libraries(${PROJECT_NAME} ${saucer_linkage} Shlwapi gdiplus webview2::webview2)
+  target_link_libraries(${PROJECT_NAME} ${saucer_linkage} Dwmapi Shcore Shlwapi gdiplus webview2::webview2)
+ endif()
+ 
+ # --------------------------------------------------------------------------------------------------------
+@@ -418,12 +386,8 @@ if (saucer_serializer STREQUAL "Glaze")
+   )
+ 
+   target_sources(${PROJECT_NAME} PRIVATE ${glaze_sources})
+-
+-  CPMFindPackage(
+-    NAME           glaze
+-    VERSION        4.2.4
+-    GIT_REPOSITORY "https://github.com/stephenberry/glaze"
+-  )
+  
+  find_package(glaze CONFIG REQUIRED)
+ 
+   target_link_libraries(${PROJECT_NAME} PUBLIC glaze::glaze)
+ endif()
+diff --git a/cmake/webview2.cmake b/cmake/webview2.cmake
+index 9ee3dbc..7ec2d9f 100644
+--- a/cmake/webview2.cmake
+++ b/cmake/webview2.cmake
+@@ -1,7 +1,8 @@
+ include("cmake/nuget.cmake")
+ 
+ if (NOT saucer_prefer_remote)
+-    find_package(webview2 CONFIG REQUIRED)
+    find_package(unofficial-webview2 CONFIG REQUIRED)
+    add_library(webview2::webview2 ALIAS unofficial::webview2::webview2)
+     return()
+ endif()
+ 
--- a/ports/saucer/fix-build-error-with-fmt11.patch
+++ b/ports/saucer/fix-build-error-with-fmt11.patch
@ -1,12 +0,0 @@
-diff --git a/include/saucer/serializers/glaze/glaze.inl b/include/saucer/serializers/glaze/glaze.inl
-index c0e1395..d704ed9 100644
--- a/include/saucer/serializers/glaze/glaze.inl
-+++ b/include/saucer/serializers/glaze/glaze.inl
-@@ -7,6 +7,7 @@
- 
- #include <fmt/args.h>
- #include <fmt/format.h>
-+#include <fmt/ranges.h>
- #include <source_location>
- 
- #include <boost/callable_traits.hpp>
--- a/ports/saucer/fix_findpkg.patch
+++ b/ports/saucer/fix_findpkg.patch
@ -1,120 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5ac3f20..d4e3864 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -134,57 +134,17 @@ endif()
- include("cmake/cpm.cmake")
- include("cmake/nuget.cmake")
- 
-CPMFindPackage(
-  NAME           lockpp
-  VERSION        2.7
-  GIT_REPOSITORY "https://github.com/Soundux/lockpp"
-)
-
-CPMFindPackage(
-  NAME           boost_callable_traits
-  GIT_TAG        boost-1.84.0
-  GIT_REPOSITORY "https://github.com/boostorg/callable_traits"
-)
-
-CPMFindPackage(
-  NAME           tl-expected
-  VERSION        1.1.0
-  GIT_REPOSITORY "https://github.com/TartanLlama/expected"
-  OPTIONS        "EXPECTED_BUILD_TESTS OFF"
-)
-
-CPMFindPackage(
-  NAME           ereignis
-  VERSION        2.3
-  GIT_REPOSITORY "https://github.com/Soundux/ereignis"
-)
-
-CPMFindPackage(
-  NAME           fmt
-  GIT_TAG        10.1.1
-  GIT_REPOSITORY "https://github.com/fmtlib/fmt"
-)
-
-CPMFindPackage(
-  NAME           glaze
-  VERSION        1.9.9
-  GIT_REPOSITORY "https://github.com/stephenberry/glaze"
-)
-
-CPMFindPackage(
-  NAME           flagpp
-  VERSION        2.1
-  GIT_REPOSITORY "https://github.com/Curve/flagpp"
-)
-
-CPMFindPackage(
-  NAME           boost_preprocessor
-  GIT_TAG        boost-1.84.0
-  GIT_REPOSITORY "https://github.com/boostorg/preprocessor"
-)
-+find_path(LOCKPP_INCLUDE_DIRS "lockpp")
-+find_path(BOOST_CALLTRA_INCLUDE_DIRS "boost/callable_traits")
-+find_package(tl-expected CONFIG REQUIRED)
-+find_path(EREIGNIS_INCLUDE_DIRS "ereignis")
-+find_package(fmt CONFIG REQUIRED)
-+find_package(glaze CONFIG REQUIRED)
-+find_path(FLAGPP_INCLUDE_DIRS "flagpp")
-+find_path(BOOST_PREPROCESSOR_INCLUDE_DIRS "boost/preprocessor")
- 
-target_link_libraries(${PROJECT_NAME} PRIVATE boost_preprocessor cr::flagpp)
-target_link_libraries(${PROJECT_NAME} PUBLIC  lockpp boost_callable_traits tl::expected glaze::glaze ereignis fmt)
-+target_include_directories(${PROJECT_NAME} PRIVATE ${EREIGNIS_INCLUDE_DIRS} ${LOCKPP_INCLUDE_DIRS} ${BOOST_CALLTRA_INCLUDE_DIRS} ${FLAGPP_INCLUDE_DIRS} ${BOOST_PREPROCESSOR_INCLUDE_DIRS})
-+target_link_libraries(${PROJECT_NAME} PRIVATE glaze::glaze fmt::fmt tl::expected)
- 
- # --------------------------------------------------------------------------------------------------------
- # Setup Linkage
-@@ -227,7 +187,7 @@ if (saucer_backend STREQUAL "WebView2")
-   target_compile_definitions(${PROJECT_NAME} PRIVATE UNICODE=1 _UNICODE=1 NOMINMAX=1)
- 
-   include("cmake/webview2.cmake")
-  target_link_libraries(${PROJECT_NAME} ${saucer_linkage} Shlwapi webview2::webview2)
-+  target_link_libraries(${PROJECT_NAME} ${saucer_linkage} Shlwapi unofficial::webview2::webview2)
- endif()
- 
- # --------------------------------------------------------------------------------------------------------
-@@ -267,6 +227,4 @@ if (saucer_prefer_remote AND saucer_backend STREQUAL "WebView2")
- endif()
- 
- install(DIRECTORY "include/saucer" TYPE INCLUDE)
-install(DIRECTORY "$<TARGET_PROPERTY:fmt,INTERFACE_INCLUDE_DIRECTORIES>/fmt" TYPE INCLUDE)
-install(DIRECTORY "$<TARGET_PROPERTY:glaze_glaze,INTERFACE_INCLUDE_DIRECTORIES>/glaze" TYPE INCLUDE)
-install(DIRECTORY "$<TARGET_PROPERTY:boost_callable_traits,INTERFACE_INCLUDE_DIRECTORIES>/boost" TYPE INCLUDE)
-+install(DIRECTORY "${BOOST_CALLTRA_INCLUDE_DIRS}/boost/callable_traits" DESTINATION "include/boost/callable_traits")
-diff --git a/cmake/webview2.cmake b/cmake/webview2.cmake
-index 9ee3dbc..3827e94 100644
--- a/cmake/webview2.cmake
-+++ b/cmake/webview2.cmake
-@@ -1,11 +1,11 @@
- include("cmake/nuget.cmake")
- 
- if (NOT saucer_prefer_remote)
-    find_package(webview2 CONFIG REQUIRED)
-+    find_package(unofficial-webview2 CONFIG REQUIRED)
-     return()
- endif()
- 
-if (NOT TARGET webview2::webview2)
-+if (NOT TARGET unofficial::webview2::webview2)
-     nuget_add(WebView2 "Microsoft.Web.WebView2" ${saucer_webview2_version})
- 
-     add_library(webview2 STATIC IMPORTED)
-diff --git a/src/serializer.glaze.cpp b/src/serializer.glaze.cpp
-index 38e891c..a4f8768 100644
--- a/src/serializer.glaze.cpp
-+++ b/src/serializer.glaze.cpp
-@@ -38,7 +38,7 @@ namespace saucer::serializers
-     }
- 
-     template <typename T>
-    tl::expected<T, glz::parse_error> parse_as(const std::string &buffer)
-+    tl::expected<T, glz::error_ctx> parse_as(const std::string &buffer)
-     {
-         static constexpr auto opts = glz::opts{.error_on_missing_keys = true, .raw_string = false};
- 
--- a/ports/saucer/portfile.cmake
+++ b/ports/saucer/portfile.cmake
@ -4,23 +4,19 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO saucer/saucer
    REF "v${VERSION}"
-    SHA512 6b5090c7754cac99d410ae59e207a44cd58db7fc9ee59412181c13449c5aed7e1cb61b1ec0703809084b406e01bbb821ecafa5caee4c2704ef72f07d2979a7e0
+    SHA512 083b92079bf324fb9e50b3d6291ee3654b8e4e2926c292c9dc092b1c4ce336ce4d4bbea7e14d52291340c692887b8ab92d1f9f3d50aed6092b5465242572bfdc
    HEAD_REF dev
    PATCHES
-        fix_findpkg.patch
-        fix-build-error-with-fmt11.patch
+        0001-use-local-packages.patch
 )

 vcpkg_cmake_configure(
    SOURCE_PATH ${SOURCE_PATH} 
    OPTIONS
-        ${BACKEND_OPTION}
+        -Dsaucer_no_polyfill=ON
        -Dsaucer_prefer_remote=OFF
-        -Dsaucer_remote_webview2=OFF
-    MAYBE_UNUSED_VARIABLES
-        saucer_remote_webview2
+        -DCPM_USE_LOCAL_PACKAGES=ON
 )
-
 vcpkg_cmake_install()

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
--- a/ports/saucer/vcpkg.json
+++ b/ports/saucer/vcpkg.json
@ -1,29 +1,25 @@
 {
  "name": "saucer",
-  "version": "2.3.0",
-  "port-version": 1,
+  "version": "6.0.1",
  "description": "Next-gen desktop apps with web-frontend in C++",
  "homepage": "https://saucer.github.io/",
  "license": "MIT",
-  "supports": "!uwp",
+  "supports": "!android & !uwp",
  "dependencies": [
    "boost-callable-traits",
    "boost-preprocessor",
+    "eraser",
    "ereignis",
    "flagpp",
    "fmt",
    "glaze",
+    {
+      "name": "gtk",
+      "platform": "linux"
+    },
    "lockpp",
-    "nlohmann-json",
-    {
-      "name": "qtwebchannel",
-      "platform": "!windows"
-    },
-    {
-      "name": "qtwebengine",
-      "platform": "!windows"
-    },
-    "tl-expected",
+    "poolparty",
+    "rebind",
    {
      "name": "vcpkg-cmake",
      "host": true
--- a/ports/webview2/portfile.cmake
+++ b/ports/webview2/portfile.cmake
@ -5,7 +5,7 @@ endif()
 vcpkg_download_distfile(ARCHIVE
    URLS "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${VERSION}"
    FILENAME "microsoft.web.webview2.${VERSION}.zip"
-    SHA512 83384c5232cc95007aca0a5557e1f42a0784fcf57360e65535b3e25421e0de39d6889ebe17f446a94e00123923da917f47fe932817c9d2cc3c3e1fff314476f5
+    SHA512 dd447d7526e82a0e4522447d0e861f347ad72f2a73dfa82cca2537f633afe54b2764c2d437f717cf22aeb339641f79c04f9cbce0b68a100eef716bd58c1a8989
 )

 vcpkg_extract_source_archive(
--- a/ports/webview2/vcpkg.json
+++ b/ports/webview2/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "webview2",
-  "version": "1.0.2277.86",
+  "version": "1.0.3240.44",
  "description": "The WebView2 control allows you to embed web technologies (HTML, CSS, and JavaScript) using Microsoft Edge",
  "homepage": "https://docs.microsoft.com/en-us/microsoft-edge/webview2",
  "documentation": "https://docs.microsoft.com/en-us/microsoft-edge/webview2",
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@ -886,6 +886,9 @@ rtmidi:arm64-android=fail
 rtmidi:x64-android=fail
 safetyhook:x64-linux=fail
 salome-medcoupling:x64-linux=fail
+saucer:arm64-osx=fail # std::move_only_function is not supported
+saucer:x64-linux=fail # requires gcc14 or later
+saucer:x64-osx=fail # std::move_only_function is not supported
 sciter:arm-neon-android=fail
 sciter:arm64-android=fail
 sciter:arm64-osx=skip
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@ -1899,8 +1899,6 @@ salome-med-fichier:x64-uwp = cascade
 salome-medcoupling(arm | uwp | !(linux | windows)) = cascade
 sassc:arm64-uwp = cascade
 sassc:x64-uwp = cascade
-saucer:arm64-osx = cascade
-saucer:x64-linux = cascade
 sdformat10:x64-windows-static = cascade
 sdformat13:x64-windows-static = cascade
 sdformat6:x64-windows-static = cascade
@ -2196,6 +2194,8 @@ realsense2:arm64-windows = fail # fw-update-device.h(1): warning C4828: The file
 realsense2[tools](osx) = feature-fails # Could NOT find Threads (missing: Threads_FOUND)
 rtabmap(osx) = fail # Linker errors. See https://github.com/microsoft/vcpkg/issues/39856
 rubberband[cli](linux) = feature-fails # See https://github.com/microsoft/vcpkg/issues/32360
+saucer(linux) = fail # requires gcc14 or later
+saucer(osx) = fail # std::move_only_function is not supported
 sqlite-orm[test](uwp) = feature-fails # error LNK2019: unresolved external symbol main referenced in function "int __cdecl invoke_main(void)". See https://github.com/microsoft/vcpkg/issues/33769
 sqlpp11[core,mariadb,mysql] = options # can not select mariadb and mysql at the same time
 sqlpp11-connector-mysql[core,mariadb,mysql] = options # can not select mariadb and mysql at the same time
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2656,8 +2656,12 @@
      "baseline": "3.15.0",
      "port-version": 0
    },
+    "eraser": {
+      "baseline": "2.2.1",
+      "port-version": 0
+    },
    "ereignis": {
-      "baseline": "2.3",
+      "baseline": "4.3",
      "port-version": 0
    },
    "esaxx": {
@ -5786,7 +5790,7 @@
    },
    "lockpp": {
      "baseline": "3.0",
-      "port-version": 0
+      "port-version": 1
    },
    "lodepng": {
      "baseline": "2021-12-04",
@ -7392,6 +7396,10 @@
      "baseline": "3.0.0",
      "port-version": 5
    },
+    "poolparty": {
+      "baseline": "3.0.1",
+      "port-version": 0
+    },
    "poolstl": {
      "baseline": "0.3.5",
      "port-version": 0
@ -8168,6 +8176,10 @@
      "baseline": "2.56.2",
      "port-version": 2
    },
+    "rebind": {
+      "baseline": "5.2.2",
+      "port-version": 0
+    },
    "recast": {
      "baseline": "deprecated",
      "port-version": 0
@ -8449,8 +8461,8 @@
      "port-version": 1
    },
    "saucer": {
-      "baseline": "2.3.0",
-      "port-version": 1
+      "baseline": "6.0.1",
+      "port-version": 0
    },
    "sbp": {
      "baseline": "6.2.1",
@ -10061,7 +10073,7 @@
      "port-version": 0
    },
    "webview2": {
-      "baseline": "1.0.2277.86",
+      "baseline": "1.0.3240.44",
      "port-version": 0
    },
    "wepoll": {
--- a/versions/e-/eraser.json
+++ b/versions/e-/eraser.json
@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "c3c24a9ea593a9b5fdebeac8937016c759e0435b",
+      "version": "2.2.1",
+      "port-version": 0
+    }
+  ]
+}
--- a/versions/e-/ereignis.json
+++ b/versions/e-/ereignis.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "c6862f83bf3ac0d613de34f55545a7a8a219cf19",
+      "version": "4.3",
+      "port-version": 0
+    },
    {
      "git-tree": "53ba30ec67abd936ea33d4c4136ca83a3e9c145c",
      "version": "2.3",
--- a/versions/l-/lockpp.json
+++ b/versions/l-/lockpp.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "17e2f663311b1a32f97d897cf7da3024e1b6c659",
+      "version": "3.0",
+      "port-version": 1
+    },
    {
      "git-tree": "66aa63ec313f43f472bf4be16879e3aba7a6820b",
      "version": "3.0",
--- a/versions/p-/poolparty.json
+++ b/versions/p-/poolparty.json
@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "74dfd179d2d8417e8bf82a6c91065740992dc6cc",
+      "version": "3.0.1",
+      "port-version": 0
+    }
+  ]
+}
--- a/versions/r-/rebind.json
+++ b/versions/r-/rebind.json
@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "42b5b44679f26d440626ddee67a467b5690584f9",
+      "version": "5.2.2",
+      "port-version": 0
+    }
+  ]
+}
--- a/versions/s-/saucer.json
+++ b/versions/s-/saucer.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "5f3a795668907d0aa73d1148cc7d67a03bbf32c0",
+      "version": "6.0.1",
+      "port-version": 0
+    },
    {
      "git-tree": "ab050dd2d11b33fbb575dcd4a48fffe0daf099d8",
      "version": "2.3.0",
--- a/versions/w-/webview2.json
+++ b/versions/w-/webview2.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "fb78e84ec816749c5862dae33417f25fc5362eaf",
+      "version": "1.0.3240.44",
+      "port-version": 0
+    },
    {
      "git-tree": "34a7646d266b69d0ed89757d83d56757e6e93507",
      "version": "1.0.2277.86",