From eb5f21325a7a14e0f9a9f8ba5764df4566ce1a98 Mon Sep 17 00:00:00 2001
From: jiayuehua <gracedancer@163.com>
Date: Wed, 6 Apr 2022 21:33:40 +0800
Subject: [PATCH] [rsocket]:fix ERROR macro

---
 ports/rsocket/nogdi-macro.patch | 12 ++++++++++++
 ports/rsocket/portfile.cmake    |  1 +
 ports/rsocket/vcpkg.json        |  2 +-
 versions/baseline.json          |  2 +-
 versions/r-/rsocket.json        |  5 +++++
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 ports/rsocket/nogdi-macro.patch

diff --git a/ports/rsocket/nogdi-macro.patch b/ports/rsocket/nogdi-macro.patch
new file mode 100644
index 00000000000000..32d021b0c3cc63
--- /dev/null
+++ b/ports/rsocket/nogdi-macro.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 38ef2b7..e5848af 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,6 +17,7 @@ set(CMAKE_MODULE_PATH
+   ${CMAKE_MODULE_PATH}
+ )
+ 
++add_definitions(-DNOGDI)
+ # Joins arguments and stores the result in ${var}.
+ function(join var)
+   unset(result)
diff --git a/ports/rsocket/portfile.cmake b/ports/rsocket/portfile.cmake
index f6ec73c4aa721d..90b61e8f6bad5a 100644
--- a/ports/rsocket/portfile.cmake
+++ b/ports/rsocket/portfile.cmake
@@ -14,6 +14,7 @@ vcpkg_from_github(
     fix-find-dependencies.patch
     use-cpp-17.patch
     fix-folly.patch
+    nogdi-macro.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/rsocket/vcpkg.json b/ports/rsocket/vcpkg.json
index 018579f0bffca1..190c786aec3d32 100644
--- a/ports/rsocket/vcpkg.json
+++ b/ports/rsocket/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "rsocket",
   "version-string": "2021.08.30.00",
-  "port-version": 1,
+  "port-version": 2,
   "description": "C++ implementation of RSocket http://rsocket.io",
   "homepage": "https://github.com/rsocket/rsocket-cpp",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index e8e0be3e579587..8f43b86b4202f6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6222,7 +6222,7 @@
     },
     "rsocket": {
       "baseline": "2021.08.30.00",
-      "port-version": 1
+      "port-version": 2
     },
     "rtabmap": {
       "baseline": "0.20.13",
diff --git a/versions/r-/rsocket.json b/versions/r-/rsocket.json
index 9b4d581a30cd54..3b9198b7b4736a 100644
--- a/versions/r-/rsocket.json
+++ b/versions/r-/rsocket.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3eff07042b17994a76d39e2565a066f902b3e08d",
+      "version-string": "2021.08.30.00",
+      "port-version": 2
+    },
     {
       "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c",
       "version-string": "2021.08.30.00",