[saucer] update to 2.1.0 (#34732)

* add feature * update version * del webview2 * update version * del feature * update version * update to 2.0.0 * udpare version * update verison * update version * update to 2.1.0 * update version * add dependency * update version * delete version * update to 2.6 * update version
2024-11-24 04:37:20 +08:00 · 2023-11-09 01:36:24 +08:00 · 2023-11-09 01:36:24 +08:00 · 53219b7c4e
commit 53219b7c4e
parent a429a35bb5
13 changed files with 135 additions and 63 deletions
--- a/ports/ereignis/portfile.cmake
+++ b/ports/ereignis/portfile.cmake
@ -1,8 +1,8 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Soundux/ereignis
-    REF v1.1
-    SHA512 506a54e8d109028cd9e85597fbd6bf77694d55e78727d2889aa15846eb4ef00390153b719c6eb3d7f8d424eb7607b66f18adc24a2d907887e32c30ca0dca7034
+    REF "v${VERSION}"
+    SHA512 b8c8bbb40bf3501e4612cddfbdbf8117f0e89c7781dfa551f1a62e825566dfd9755889d2c953827679d94198ebfbd8f01e85478d7ac0529b0d564d45788ca707
    HEAD_REF master
 )

--- a/ports/ereignis/vcpkg.json
+++ b/ports/ereignis/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "ereignis",
-  "version": "1.1",
+  "version": "2.3",
  "description": "A thread-safe C++17 Event Library",
  "homepage": "https://github.com/Soundux/ereignis",
  "license": "MIT",
--- a/ports/lockpp/portfile.cmake
+++ b/ports/lockpp/portfile.cmake
@ -1,8 +1,8 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Soundux/lockpp
-    REF v1.0.2
-    SHA512 6d92d3bbcbad3e2afd844ab95526e1eb49a7722d0d9d972ff85df561bbb9dc0b7a8aa5c83847f6832a806e52dde427ec0bcd11570b095d9cce7e35b3717e1f51
+    REF "v${VERSION}"
+    SHA512 540caaec65fc89d1e683af9b7366997b4cd5338ebba9de3ea2003b74dc4b8249a5b1cc223892afddb0e165146c3b36ded26bd88f5fe2c77d125981de8a774baf
    HEAD_REF master
 )

--- a/ports/lockpp/vcpkg.json
+++ b/ports/lockpp/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "lockpp",
-  "version": "1.0.2",
+  "version": "2.6",
  "description": "A C++17 Library that provides mutex protected objects",
  "homepage": "https://github.com/Soundux/lockpp",
  "license": "MIT",
--- a/ports/saucer/fix-source-generation.patch
+++ b/ports/saucer/fix-source-generation.patch
@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3800146..61a9e60 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,7 +80,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE "include/saucer")
- # --------------------------------------------------------------------------------------------------------
- 
- string(TOLOWER ${saucer_backend} saucer_backed_lower)
-configure_file("constants.hpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/include/saucer/constants.hpp")
-+configure_file("constants.hpp.in" "${CMAKE_BINARY_DIR}/include/saucer/constants.hpp")
- 
- # --------------------------------------------------------------------------------------------------------
- # Configure Library depending on options
-@@ -91,6 +91,7 @@ include(FetchContent)
- if (saucer_backend STREQUAL "Qt")
-     target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.cpp" "src/window.qt5.cpp")
-     target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.impl.hpp" "src/window.qt5.impl.hpp")
-+    target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_BINARY_DIR}/include/saucer/constants.hpp")
- 
-     find_package(Qt5 COMPONENTS Widgets WebEngineWidgets WebChannel REQUIRED)
-     target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets Qt5::WebEngineWidgets Qt5::WebChannel)
--- a/ports/saucer/fix_findpkg.patch
+++ b/ports/saucer/fix_findpkg.patch
@ -0,0 +1,100 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5eccb6..5f9ab71 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -131,51 +131,16 @@ endif()
+ include("cmake/cpm.cmake")
+ include("cmake/nuget.cmake")
+ 
+-CPMFindPackage(
+-  NAME           lockpp
+-  VERSION        2.6
+-  GIT_REPOSITORY "https://github.com/Soundux/lockpp"
+-)
+-
+-CPMFindPackage(
+-  NAME           boost_callable_traits
+-  GIT_TAG        boost-1.83.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.5.4
+-  GIT_REPOSITORY "https://github.com/stephenberry/glaze"
+-)
+-
+-CPMFindPackage(
+-  NAME           flagpp
+-  VERSION        2.1
+-  GIT_REPOSITORY "https://github.com/Curve/flagpp"
+-)
+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")
+ 
+-target_link_libraries(${PROJECT_NAME} PRIVATE 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})
+target_link_libraries(${PROJECT_NAME} PRIVATE glaze::glaze fmt::fmt tl::expected)
+ 
+ # --------------------------------------------------------------------------------------------------------
+ # Setup Linkage
+@@ -218,7 +183,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()
+ 
+ # --------------------------------------------------------------------------------------------------------
+@@ -258,6 +223,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)
--- a/ports/saucer/portfile.cmake
+++ b/ports/saucer/portfile.cmake
@ -3,29 +3,24 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO saucer/saucer
-    REF 6ae482092cca4d4a408e6bdf24714153d9203797
-    SHA512 1865f6178b2885483f0b43c1641e602f957d4e64e77b802e64a64038b709dbf63fa2dd6037720e7180434e91341f2e1a0eb86424c1ee1556db5971cba3434bb0
+    REF "v${VERSION}"
+    SHA512 29abb465a888aa4284795e293624598c09e0ba690bb430adb7a2122d82985daa1cfcfd594120f5657fc70349f8480e63554d72bff1b23f9dca86bcdbb930d953
    HEAD_REF dev
    PATCHES
-        unofficial-webview2.patch
-        fix-source-generation.patch
+        fix_findpkg.patch
 )

-if(VCPKG_TARGET_IS_WINDOWS)
-    set(BACKEND_OPTION "-Dsaucer_backend=WebView2")
-else()
-    set(BACKEND_OPTION "-Dsaucer_backend=Qt6")
-endif()
-
 vcpkg_cmake_configure(
    SOURCE_PATH ${SOURCE_PATH} 
    OPTIONS
        ${BACKEND_OPTION}
        -Dsaucer_prefer_remote=OFF
        -Dsaucer_remote_webview2=OFF
+    MAYBE_UNUSED_VARIABLES
+        saucer_remote_webview2
 )

 vcpkg_cmake_install()

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/saucer/unofficial-webview2.patch
+++ b/ports/saucer/unofficial-webview2.patch
@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9fa4269..f950363 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -111,8 +111,8 @@ elseif (saucer_backend STREQUAL "WebView2")
-     endif()
- 
-     if (NOT saucer_remote_webview2)
-        find_package(webview2 CONFIG REQUIRED)
-        target_link_libraries(${PROJECT_NAME} PRIVATE webview2::webview2)
-+        find_package(unofficial-webview2 CONFIG REQUIRED)
-+        target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::webview2::webview2)
-     else()
-         include("NuGet.cmake")
-         nuget_add(WebView2 "Microsoft.Web.WebView2" ${saucer_webview2_version})
--- a/ports/saucer/vcpkg.json
+++ b/ports/saucer/vcpkg.json
@ -1,14 +1,16 @@
 {
  "name": "saucer",
-  "version": "1.0.1",
-  "port-version": 3,
+  "version": "2.1.0",
  "description": "Next-gen desktop apps with web-frontend in C++",
  "homepage": "https://saucer.github.io/",
  "license": "MIT",
  "supports": "!uwp",
  "dependencies": [
+    "boost-callable-traits",
    "ereignis",
+    "flagpp",
    "fmt",
+    "glaze",
    "lockpp",
    "nlohmann-json",
    {
@ -27,10 +29,6 @@
    {
      "name": "webview2",
      "platform": "windows"
-    },
-    {
-      "name": "wil",
-      "platform": "windows"
    }
  ]
 }
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2445,7 +2445,7 @@
      "port-version": 8
    },
    "ereignis": {
-      "baseline": "1.1",
+      "baseline": "2.3",
      "port-version": 0
    },
    "esaxx": {
@ -5193,7 +5193,7 @@
      "port-version": 0
    },
    "lockpp": {
-      "baseline": "1.0.2",
+      "baseline": "2.6",
      "port-version": 0
    },
    "lodepng": {
@ -7593,8 +7593,8 @@
      "port-version": 0
    },
    "saucer": {
-      "baseline": "1.0.1",
-      "port-version": 3
+      "baseline": "2.1.0",
+      "port-version": 0
    },
    "sbp": {
      "baseline": "3.4.10",
--- a/versions/e-/ereignis.json
+++ b/versions/e-/ereignis.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "53ba30ec67abd936ea33d4c4136ca83a3e9c145c",
+      "version": "2.3",
+      "port-version": 0
+    },
    {
      "git-tree": "9fae65f1e52927feaf919019a722da7f20982e4c",
      "version": "1.1",
--- a/versions/l-/lockpp.json
+++ b/versions/l-/lockpp.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "fe1a86b6361bc55051cd31928d876ba7f0f6a8ab",
+      "version": "2.6",
+      "port-version": 0
+    },
    {
      "git-tree": "a186ea76115669b87e581cdc125423e950322d70",
      "version": "1.0.2",
--- a/versions/s-/saucer.json
+++ b/versions/s-/saucer.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "0ad0dc8844c60450afe70ba393b6d31a517b553d",
+      "version": "2.1.0",
+      "port-version": 0
+    },
    {
      "git-tree": "15c87104efda5c84346ed7a7302713283e82eaaa",
      "version": "1.0.1",