From 5801d43df148a6d09c9baaa0d9c66f63428c5a3a Mon Sep 17 00:00:00 2001 From: kzhdev Date: Wed, 8 Jul 2026 17:34:02 -0500 Subject: [PATCH] [slick-net] Update to v3.1.0 (#52779) --- ports/slick-net/portfile.cmake | 2 +- ports/slick-net/slick-dependencies.patch | 88 ++++-------------------- ports/slick-net/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/slick-net.json | 5 ++ 5 files changed, 22 insertions(+), 77 deletions(-) diff --git a/ports/slick-net/portfile.cmake b/ports/slick-net/portfile.cmake index 49aff2651e..18c94e5300 100644 --- a/ports/slick-net/portfile.cmake +++ b/ports/slick-net/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SlickQuant/slick-net REF "v${VERSION}" - SHA512 e60051992d54ccb451d10bdf3e1074935eca75e570973c4cd7d0c4e814e9f9f4ecf40fe0bef750eb9df483c5d056a8fa7192c9b661f97488cfa749b06cbe5af5 + SHA512 6c7ba6ea36c8bf2ed8d634c4083184433747db45d98bf3ac935caab30ccccdba0b2791b88e6485b4c08937a5bac1f7b4fa93e456b0bc67124aac4395706dd99a HEAD_REF main PATCHES slick-dependencies.patch diff --git a/ports/slick-net/slick-dependencies.patch b/ports/slick-net/slick-dependencies.patch index 810851fdfb..d54fa9cbed 100644 --- a/ports/slick-net/slick-dependencies.patch +++ b/ports/slick-net/slick-dependencies.patch @@ -1,31 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8fc933..d331402 100644 +index 827d7d8..0604127 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -41,8 +41,8 @@ if (slick-shm_FOUND) - message(STATUS "slick-shm: ${slick-shm_VERSION}") - endif() - --find_package(slick-queue 1.5.0 CONFIG QUIET) --if (NOT slick-queue_FOUND) -+find_package(slick-queue CONFIG REQUIRED) -+if (FALSE) - message(STATUS "Fetching slick-queue...") - include(FetchContent) - # Disable tests for slick-queue -@@ -57,8 +57,8 @@ else() - message(STATUS "Found slick-queue: ${slick-queue_VERSION}") - endif() - --find_package(slick-stream-buffer 1.0.5 CONFIG QUIET) --if (NOT slick-stream-buffer_FOUND) -+find_package(slick-stream-buffer CONFIG REQUIRED) -+if (FALSE) - message(STATUS "Fetching slick-stream-buffer...") - include(FetchContent) - set(BUILD_SLICK_STREAM_BUFFER_TESTS OFF CACHE BOOL "" FORCE) -@@ -72,8 +72,8 @@ else() - message(STATUS "Found slick-stream-buffer: ${slick-stream-buffer_VERSION}") +@@ -45,8 +45,8 @@ if (slick-shm_FOUND) + message(STATUS "Found slick-shm ${slick-shm_VERSION}: ${slick-shm_DIR}") endif() -find_package(slick-stream-buffer-multiplexer 1.0.1 CONFIG QUIET) @@ -35,8 +13,8 @@ index b8fc933..d331402 100644 message(STATUS "Fetching slick-stream-buffer-multiplexer...") include(FetchContent) set(BUILD_SLICK_STREAM_BUFFER_MULTIPLEXER_TESTS OFF CACHE BOOL "" FORCE) -@@ -87,8 +87,8 @@ else() - message(STATUS "Found slick-stream-buffer-multiplexer: ${slick-stream-buffer-multiplexer_VERSION}") +@@ -72,8 +72,8 @@ if (slick-stream-buffer_FOUND) + message(STATUS "Found slick-stream-buffer ${slick-stream-buffer_VERSION}: ${slick-stream-buffer_DIR}") endif() -find_package(slick-dynamic-buffer 1.0.1 CONFIG QUIET) @@ -47,55 +25,17 @@ index b8fc933..d331402 100644 include(FetchContent) set(BUILD_SLICK_DYNAMIC_BUFFER_TESTS OFF CACHE BOOL "" FORCE) diff --git a/cmake/slick-net-config.cmake.in b/cmake/slick-net-config.cmake.in -index 8735d0b..fa9ec15 100644 +index 1bde373..f8cd2c1 100644 --- a/cmake/slick-net-config.cmake.in +++ b/cmake/slick-net-config.cmake.in -@@ -3,11 +3,11 @@ - include(CMakeFindDependencyMacro) - +@@ -5,8 +5,8 @@ include(CMakeFindDependencyMacro) # Find required dependencies --find_dependency(Boost CONFIG REQUIRED COMPONENTS beast context) --find_dependency(OpenSSL CONFIG REQUIRED) -+find_dependency(Boost CONFIG COMPONENTS beast context) -+find_dependency(OpenSSL CONFIG) - --find_dependency(slick-queue 1.5.0 CONFIG QUIET) --if(NOT slick-queue_FOUND) -+find_dependency(slick-queue CONFIG) -+if(FALSE) - message(STATUS "Fetching slick-queue...") - include(FetchContent) - # Disable slick-queue tests -@@ -20,8 +20,8 @@ if(NOT slick-queue_FOUND) - FetchContent_MakeAvailable(slick-queue) - endif() - --find_dependency(slick-stream-buffer 1.0.5 CONFIG QUIET) --if (NOT slick-stream-buffer_FOUND) -+find_dependency(slick-stream-buffer CONFIG) -+if (FALSE) - message(STATUS "Fetching slick-stream-buffer...") - include(FetchContent) - set(BUILD_SLICK_STREAM_BUFFER_TESTS OFF CACHE BOOL "" FORCE) -@@ -33,8 +33,8 @@ if (NOT slick-stream-buffer_FOUND) - FetchContent_MakeAvailable(slick-stream-buffer) - endif() - --find_dependency(slick-stream-buffer-multiplexer 1.0.1 CONFIG QUIET) --if (NOT slick-stream-buffer-multiplexer_FOUND) + find_dependency(Boost CONFIG COMPONENTS beast context) + find_dependency(OpenSSL CONFIG) +-find_dependency(slick-stream-buffer-multiplexer 1.0.1 CONFIG) +-find_dependency(slick-dynamic-buffer 1.0.1 CONFIG) +find_dependency(slick-stream-buffer-multiplexer CONFIG) -+if (FALSE) - message(STATUS "Fetching slick-stream-buffer-multiplexer...") - include(FetchContent) - set(BUILD_SLICK_STREAM_BUFFER_MULTIPLEXER_TESTS OFF CACHE BOOL "" FORCE) -@@ -46,8 +46,8 @@ if (NOT slick-stream-buffer-multiplexer_FOUND) - FetchContent_MakeAvailable(slick-stream-buffer-multiplexer) - endif() - --find_dependency(slick-dynamic-buffer 1.0.1 CONFIG QUIET) --if (NOT slick-dynamic-buffer_FOUND) +find_dependency(slick-dynamic-buffer CONFIG) -+if (FALSE) - message(STATUS "Fetching slick-dynamic-buffer...") - include(FetchContent) - set(BUILD_SLICK_DYNAMIC_BUFFER_TESTS OFF CACHE BOOL "" FORCE) + + # Include the targets file + include("${CMAKE_CURRENT_LIST_DIR}/slick-net-targets.cmake") diff --git a/ports/slick-net/vcpkg.json b/ports/slick-net/vcpkg.json index eb0fd7ada8..dd3356ef6f 100644 --- a/ports/slick-net/vcpkg.json +++ b/ports/slick-net/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "slick-net", - "version": "3.0.0", + "version": "3.1.0", "description": "A modern C++20 networking library providing HTTP/HTTPS client, WebSocket/WebSocket Secure client, and HTTP streaming support built on Boost.Beast and Boost.Asio", "homepage": "https://github.com/SlickQuant/slick-net", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 319a39e97f..70ce4ca72f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9405,7 +9405,7 @@ "port-version": 0 }, "slick-net": { - "baseline": "3.0.0", + "baseline": "3.1.0", "port-version": 0 }, "slick-object-pool": { diff --git a/versions/s-/slick-net.json b/versions/s-/slick-net.json index 435b527daf..bf8689570f 100644 --- a/versions/s-/slick-net.json +++ b/versions/s-/slick-net.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "236e88b59a26428df468f28553d452a641a41761", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "54b2f9ef57e1d90470e2d85ed378914b3793d3b0", "version": "3.0.0",