From ed54c9a15f1a870a289dccbf13a816856cfd3a59 Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Fri, 9 Dec 2022 07:51:34 +0800
Subject: [PATCH] [redis-plus-plus] update version to 1.3.6 (#28201)

* [redis-plus-plus] update version to 1.3.6

* update version
---
 ports/redis-plus-plus/fix-dependency-libuv.patch    |  4 ++--
 ports/redis-plus-plus/fix-ws2-linking-windows.patch | 12 ------------
 ports/redis-plus-plus/portfile.cmake                |  5 ++---
 ports/redis-plus-plus/vcpkg.json                    |  3 +--
 versions/baseline.json                              |  4 ++--
 versions/r-/redis-plus-plus.json                    |  5 +++++
 6 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 ports/redis-plus-plus/fix-ws2-linking-windows.patch

diff --git a/ports/redis-plus-plus/fix-dependency-libuv.patch b/ports/redis-plus-plus/fix-dependency-libuv.patch
index 0990debe91..0fddcc898d 100644
--- a/ports/redis-plus-plus/fix-dependency-libuv.patch
+++ b/ports/redis-plus-plus/fix-dependency-libuv.patch
@@ -8,8 +8,8 @@ index e85a158..e67681c 100644
          # libuv dependency
 -        find_path(REDIS_PLUS_PLUS_ASYNC_LIB_HEADER NAMES uv.h)
 -        find_library(REDIS_PLUS_PLUS_ASYNC_LIB uv)
-+        find_package(unofficial-libuv CONFIG REQUIRED)
-+        set(REDIS_PLUS_PLUS_ASYNC_LIB unofficial::libuv::libuv)
++        find_package(libuv CONFIG REQUIRED)
++        set(REDIS_PLUS_PLUS_ASYNC_LIB $<IF:$<TARGET_EXISTS:uv_a>,uv_a,uv>)
      else()
          message(FATAL_ERROR "invalid REDIS_PLUS_PLUS_BUILD_ASYNC")
      endif()
diff --git a/ports/redis-plus-plus/fix-ws2-linking-windows.patch b/ports/redis-plus-plus/fix-ws2-linking-windows.patch
deleted file mode 100644
index 06f75083ba..0000000000
--- a/ports/redis-plus-plus/fix-ws2-linking-windows.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 452cc0f..90932ce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -148,6 +148,7 @@ if(REDIS_PLUS_PLUS_BUILD_SHARED)
-         target_compile_definitions(${SHARED_LIB} PRIVATE NOMINMAX)
-         set_target_properties(${SHARED_LIB} PROPERTIES CXX_STANDARD ${REDIS_PLUS_PLUS_CXX_STANDARD})
-         set_target_properties(${SHARED_LIB} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
-+        target_link_libraries(${SHARED_LIB} PUBLIC Ws2_32.lib)
-     else()
-         target_compile_options(${SHARED_LIB} PRIVATE "-Wall" "-W" "-Werror")
-     endif()
diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake
index 0853be1a97..2bd4cabe9a 100644
--- a/ports/redis-plus-plus/portfile.cmake
+++ b/ports/redis-plus-plus/portfile.cmake
@@ -1,11 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sewenew/redis-plus-plus
-    REF e29c63db54653a660d7a0f556f670b7a6fce0a78 # 1.3.2
-    SHA512 47b18f41cfaf5e11d6eba1201a3da3a1ed355583cde0772de68e5f0f25953e1467c83249848b25b16c9db9e3f6c5df5e1dd832f4b3dd41289c69111867e48d8c
+    REF 39f5a515d048cc5ef897aaf319ddffb54ae9427c # 1.3.6
+    SHA512 f02fd77e9c8964cb0503e1a99edeaa793f4cf9365ef20b25ebf10001c1ed1fa9a6e90314092d9fb545a60168eb5bade161d57b17bb74068bdd52d356e484a505
     HEAD_REF master
     PATCHES
-        fix-ws2-linking-windows.patch
         fix-conversion.patch
         fix-dependency-libuv.patch
 )
diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json
index 649fc686ab..1cef0c6df3 100644
--- a/ports/redis-plus-plus/vcpkg.json
+++ b/ports/redis-plus-plus/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "redis-plus-plus",
-  "version-semver": "1.3.2",
-  "port-version": 1,
+  "version-semver": "1.3.6",
   "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 e9ba6c23ce..95340a36d8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6569,8 +6569,8 @@
       "port-version": 5
     },
     "redis-plus-plus": {
-      "baseline": "1.3.2",
-      "port-version": 1
+      "baseline": "1.3.6",
+      "port-version": 0
     },
     "refl-cpp": {
       "baseline": "0.12.3",
diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json
index cfe71b9ca0..db57eaf11f 100644
--- a/versions/r-/redis-plus-plus.json
+++ b/versions/r-/redis-plus-plus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ff28095e328281a0f0bba9ad251fb0881f08f5a2",
+      "version-semver": "1.3.6",
+      "port-version": 0
+    },
     {
       "git-tree": "bfb560234e651a06204f44976997b21466ba6a9d",
       "version-semver": "1.3.2",