From ce312e2d2a1ceceb578fa8c92df67175bde74925 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 3 Feb 2026 05:22:24 +0900 Subject: [PATCH] [webcraft] update to 1.0.5 (#49724) --- ports/webcraft/fix-concurrentqueue.patch | 29 ++++++++++++++++++++++++ ports/webcraft/portfile.cmake | 9 +++++++- ports/webcraft/vcpkg.json | 6 ++++- versions/baseline.json | 2 +- versions/w-/webcraft.json | 5 ++++ 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 ports/webcraft/fix-concurrentqueue.patch diff --git a/ports/webcraft/fix-concurrentqueue.patch b/ports/webcraft/fix-concurrentqueue.patch new file mode 100644 index 0000000000..5e9f7cedbd --- /dev/null +++ b/ports/webcraft/fix-concurrentqueue.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 619e8f2..f3f325a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,6 +30,11 @@ target_include_directories(WebCraft PUBLIC + + target_link_libraries(WebCraft PUBLIC ${WEBCRAFT_PLATFORM_LIBS}) + ++if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") ++ find_package(concurrentqueue REQUIRED) ++ target_link_libraries(WebCraft PRIVATE concurrentqueue::concurrentqueue) ++endif() ++ + # --- 3. Install Rules --- + + # A. Install the Library and Headers +diff --git a/src/webcraft/runtime.provider.cpp b/src/webcraft/runtime.provider.cpp +index 0e1300e..8edfe75 100644 +--- a/src/webcraft/runtime.provider.cpp ++++ b/src/webcraft/runtime.provider.cpp +@@ -47,7 +47,7 @@ void webcraft::async::detail::initialize_runtime() noexcept + // to avoid collision with concurrentqueue's BLOCK_SIZE constant + #pragma push_macro("BLOCK_SIZE") + #undef BLOCK_SIZE +-#include ++#include + #pragma pop_macro("BLOCK_SIZE") + + #include diff --git a/ports/webcraft/portfile.cmake b/ports/webcraft/portfile.cmake index 9822a4d44c..26205df8ee 100644 --- a/ports/webcraft/portfile.cmake +++ b/ports/webcraft/portfile.cmake @@ -4,8 +4,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adityarao2005/WebCraft REF v${VERSION} - SHA512 1c0c5de6a6a42b9a6366a633c6dd00008fc1c631da6cda146ae952c499b8a11028af0f8dad2a1c6c3a51119a6bec44ad5087b6128c015910957c661ea52bee7c + SHA512 d598d6303fefa1b18e7effb57da99e353a898817bde917588d103aabe0662eea07a3647dc9338c3cd6ba2d048423b7640cbb396f5fd42dd4f7997136b4bcb236 HEAD_REF main + PATCHES + fix-concurrentqueue.patch ) if (VCPKG_TARGET_IS_LINUX) @@ -26,6 +28,11 @@ vcpkg_cmake_config_fixup( CONFIG_PATH share/WebCraft ) +file(REMOVE + "${CURRENT_PACKAGES_DIR}/include/webcraft/async/README.md" + "${CURRENT_PACKAGES_DIR}/include/webcraft/async/asyncruntime.drawio.svg" + "${CURRENT_PACKAGES_DIR}/include/webcraft/async/io/README.md" +) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/webcraft/vcpkg.json b/ports/webcraft/vcpkg.json index 766b33452f..fcbe54a2e6 100644 --- a/ports/webcraft/vcpkg.json +++ b/ports/webcraft/vcpkg.json @@ -1,11 +1,15 @@ { "name": "webcraft", - "version": "1.0.3", + "version": "1.0.5", "description": "An async first C++ networking library leveraging powerful features of C++23 built for scale, speed, and ease.", "homepage": "https://github.com/adityarao2005/WebCraft/", "license": "MIT", "supports": "!(uwp | android | emscripten)", "dependencies": [ + { + "name": "concurrentqueue", + "platform": "linux" + }, { "name": "liburing", "platform": "linux" diff --git a/versions/baseline.json b/versions/baseline.json index 73e519896f..cc61a85643 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10617,7 +10617,7 @@ "port-version": 0 }, "webcraft": { - "baseline": "1.0.3", + "baseline": "1.0.5", "port-version": 0 }, "websocketpp": { diff --git a/versions/w-/webcraft.json b/versions/w-/webcraft.json index e5cefc7642..7e5c51bf6c 100644 --- a/versions/w-/webcraft.json +++ b/versions/w-/webcraft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b429333a40cc15bd838183ef0fd725ba994a0eb5", + "version": "1.0.5", + "port-version": 0 + }, { "git-tree": "0bd4b2b58ab47c6ad57df01cd33023c2115bb0a4", "version": "1.0.3",