[eraser] Update to 2.3.0 (#48662)

2026-01-18 01:11:23 +01:00 · 2025-12-19 22:29:23 +01:00
parent c4a5f9bfe5
commit 3b3ab07e90
9 changed files with 65 additions and 19 deletions
--- a/ports/eraser/portfile.cmake
+++ b/ports/eraser/portfile.cmake
@@ -2,12 +2,25 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Curve/eraser
    REF "v${VERSION}"
-    SHA512 f0cc02d1bc643239ed648006db0c13e704e803537060930080b2cdd692fa09082a5d73dc7487a6c4e5aa95d0a7bf6fd4623ee8567ebd152c20221a9c8fa0f7eb
+    SHA512 5c43cb2af7a42f4eb6c1b5f76ce36315f093cd8d2e3aa7873da7d1a1d188df3515e0e63b9ba8fd7418d9b62c3bc80fa1ec7548535fb69e3f36873eede682af4b
    HEAD_REF master
+    PATCHES
+        remove-cpm.patch # Note: Removed also the ALIAS library as packageProject creates it
 )

-vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH})
+# Replace CPM and download PackageProject directly to avoid issues with FETCHCONTENT_FULLY_DISCONNECTED
+vcpkg_from_github(
+    OUT_SOURCE_PATH PACKAGE_PROJECT_PATH
+    REPO TheLartians/PackageProject.cmake
+    REF "v1.13.0"
+    SHA512 3cf0523bddc213f206ed0ca57803550cb7db9e293392d3741138be47f49d9027ef517e1656235a349a62b492d35c3fc677714dc00afe59e2d36144a9689cfa8f
+    HEAD_REF master
+)
+file(RENAME "${PACKAGE_PROJECT_PATH}" "${SOURCE_PATH}/cmake/packageproject.cmake")
+
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/${PORT}-${VERSION}")

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/eraser/remove-cpm.patch
+++ b/ports/eraser/remove-cpm.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e7e973..dc09990 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -12,7 +12,6 @@ option(eraser_tests "Build tests" OFF)
+ # --------------------------------------------------------------------------------------------------------
+ 
+ add_library(${PROJECT_NAME} INTERFACE)
+-add_library(cr::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+ 
+ target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_20)
+ set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 20 CXX_EXTENSIONS OFF CXX_STANDARD_REQUIRED ON)
+@@ -39,13 +38,7 @@ endif()
+ # Install Targets
+ # --------------------------------------------------------------------------------------------------------
+ 
+-include("cmake/cpm.cmake")
+-
+-CPMFindPackage(
+-  NAME           PackageProject
+-  VERSION        1.13.0
+-  GIT_REPOSITORY "https://github.com/TheLartians/PackageProject.cmake"
+-)
+add_subdirectory(cmake/packageproject.cmake)
+ 
+ packageProject(
+   NAMESPACE cr
--- a/ports/eraser/vcpkg.json
+++ b/ports/eraser/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "eraser",
-  "version": "2.2.1",
+  "version": "2.3.0",
  "description": "A C++20 type-erasure library that supports user defined interfaces",
  "homepage": "https://github.com/Curve/eraser",
  "license": "MIT",
@@ -8,6 +8,10 @@
    {
      "name": "vcpkg-cmake",
      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
    }
  ]
 }
--- a/ports/saucer/0001-use-local-packages.patch
+++ b/ports/saucer/0001-use-local-packages.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 32fdea7..77892c6 100644
+index 32fdea7..2698429 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -286,62 +286,30 @@ endif()
+@@ -286,62 +286,28 @@ endif()
 include("cmake/nuget.cmake")
 include("cmake/module.cmake")
 
@@ -77,10 +77,8 @@ index 32fdea7..77892c6 100644
 +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(eraser REQUIRED)
 +find_package(fmt CONFIG REQUIRED)
 +find_package(Boost REQUIRED COMPONENTS callable_traits preprocessor)
 +
@@ -89,7 +87,7 @@ index 32fdea7..77892c6 100644
 
 # --------------------------------------------------------------------------------------------------------
 # Setup Backends
-@@ -405,7 +373,7 @@ if (saucer_backend STREQUAL "WebView2")
+@@ -405,7 +371,7 @@ if (saucer_backend STREQUAL "WebView2")
   target_compile_definitions(${PROJECT_NAME} PRIVATE UNICODE=1 _UNICODE=1 NOMINMAX=1)
 
   include("cmake/webview2.cmake")
@@ -98,7 +96,7 @@ index 32fdea7..77892c6 100644
 endif()
 
 # --------------------------------------------------------------------------------------------------------
-@@ -418,12 +386,8 @@ if (saucer_serializer STREQUAL "Glaze")
+@@ -418,12 +384,8 @@ if (saucer_serializer STREQUAL "Glaze")
   )
 
   target_sources(${PROJECT_NAME} PRIVATE ${glaze_sources})
--- a/ports/saucer/vcpkg.json
+++ b/ports/saucer/vcpkg.json
@@ -1,7 +1,7 @@
 {
  "name": "saucer",
  "version": "6.0.1",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Next-gen desktop apps with web-frontend in C++",
  "homepage": "https://saucer.github.io/",
  "license": "MIT",
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@@ -1760,12 +1760,6 @@ qtmultimedia[core,ffmpeg](linux) = combination-fails # If QT_FEATURE_eglfs is de
 qtmultimedia[core,ffmpeg,gstreamer,qml,widgets](osx) = combination-fails # Error: Qt will by default autolink both plugin backends in static builds leading to symbol collisions and a build failure in dependent ports! As such in static builds only one backend is allowed by default.
 qtmultimedia[gstreamer]:x64-linux=no-separate-feature-test
 rtabmap[openmp](osx) = feature-fails # No openmp on default osx toolchain
-saucer:arm64-windows-static-md=fail # fatal error C1605: compiler limit: object file size cannot exceed 4 GB
-saucer:arm64-windows=fail # fatal error C1605: compiler limit: object file size cannot exceed 4 GB
-saucer:x64-windows-static-md=fail # fatal error C1605: compiler limit: object file size cannot exceed 4 GB
-saucer:x64-windows-static=fail # fatal error C1605: compiler limit: object file size cannot exceed 4 GB
-saucer:x64-windows=fail # fatal error C1605: compiler limit: object file size cannot exceed 4 GB
-saucer:x86-windows=fail # fatal error C1605: compiler limit: object file size cannot exceed 4 GB
 saucer(linux) = fail # requires gcc14 or later
 saucer(osx) = fail # std::move_only_function is not supported
 sleef[dft](osx) = feature-fails # openmp setup needed
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2761,7 +2761,7 @@
      "port-version": 0
    },
    "eraser": {
-      "baseline": "2.2.1",
+      "baseline": "2.3.0",
      "port-version": 0
    },
    "ereignis": {
@@ -8814,7 +8814,7 @@
    },
    "saucer": {
      "baseline": "6.0.1",
-      "port-version": 1
+      "port-version": 2
    },
    "sbgecom": {
      "baseline": "5.3.2276",
--- a/versions/e-/eraser.json
+++ b/versions/e-/eraser.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "c361cac94a77cdaecd052878c2e5a50b1b2063b9",
+      "version": "2.3.0",
+      "port-version": 0
+    },
    {
      "git-tree": "c3c24a9ea593a9b5fdebeac8937016c759e0435b",
      "version": "2.2.1",
--- a/versions/s-/saucer.json
+++ b/versions/s-/saucer.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "bde24b1179cf6523218a78b6f75abe16e2bc9172",
+      "version": "6.0.1",
+      "port-version": 2
+    },
    {
      "git-tree": "22136d5fb89aeb32b182667257d0d07caa71a30d",
      "version": "6.0.1",