From f321d2f65e2affcbdb2ebf0a58de26e005fa275f Mon Sep 17 00:00:00 2001 From: toge Date: Fri, 25 Jul 2025 03:40:42 +0900 Subject: [PATCH] [redis-plus-plus] update to 1.3.15 (#46579) --- ports/redis-plus-plus/fix-absolute-path.patch | 10 +++++----- ports/redis-plus-plus/portfile.cmake | 2 +- ports/redis-plus-plus/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/redis-plus-plus.json | 5 +++++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/redis-plus-plus/fix-absolute-path.patch b/ports/redis-plus-plus/fix-absolute-path.patch index 77544b2d96..38f0181200 100644 --- a/ports/redis-plus-plus/fix-absolute-path.patch +++ b/ports/redis-plus-plus/fix-absolute-path.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c329f9b..785ca3c 100644 +index 4b99109..e45ca43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -180,7 +180,7 @@ set(CMAKE_REQUIRED_LIBRARIES ${HIREDIS_FEATURE_TEST_LIB}) - CHECK_SYMBOL_EXISTS(redisEnableKeepAliveWithInterval ${HIREDIS_FEATURE_TEST_HEADER} REDIS_PLUS_PLUS_HAS_redisEnableKeepAliveWithInterval) +@@ -158,7 +158,7 @@ if(${redisEnableKeepAliveWithInterval_POS} GREATER -1) + endif() set(REDIS_PLUS_PLUS_GENERATED_HEADER_DIR ${CMAKE_CURRENT_BINARY_DIR}/${REDIS_PLUS_PLUS_HEADER_DIR}) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in ${CMAKE_CURRENT_BINARY_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in" "${CMAKE_CURRENT_BINARY_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h") - # Restore CMAKE_REQUIRED_LIBRARIES - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_BACK}) + # Build static library + option(REDIS_PLUS_PLUS_BUILD_STATIC "Build static library" ON) diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake index 985f456fbd..656806ebd4 100644 --- a/ports/redis-plus-plus/portfile.cmake +++ b/ports/redis-plus-plus/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sewenew/redis-plus-plus REF "${VERSION}" - SHA512 62dbba8e641fbac71ea322e2f7766360c601959c371bfde2ab9cb0613f65eb42b442e76ef4130d64ece4058b4f4d7872503d4774a505ab0616955e95706143c8 + SHA512 3de216fc32894eb2d9f61a559bf69c8e154122209f2ba95aac202d769688d27cd1059424ad8a1173c7073ee34bfbd5ad981bb313d9298cd39ebe245e88d9e9fe HEAD_REF master PATCHES fix-conversion.patch diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json index 649512ee29..ddc120eb86 100644 --- a/ports/redis-plus-plus/vcpkg.json +++ b/ports/redis-plus-plus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "redis-plus-plus", - "version-semver": "1.3.14", + "version-semver": "1.3.15", "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 2ca07c6057..6670171492 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8289,7 +8289,7 @@ "port-version": 0 }, "redis-plus-plus": { - "baseline": "1.3.14", + "baseline": "1.3.15", "port-version": 0 }, "refl-cpp": { diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json index 33588e6fce..4c81292e1e 100644 --- a/versions/r-/redis-plus-plus.json +++ b/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6f33db854734d2ef41baca161efbe9c39dd8194", + "version-semver": "1.3.15", + "port-version": 0 + }, { "git-tree": "9102faa25c41f356a5041677c48a2bf7549e5a62", "version-semver": "1.3.14",