From 24fca61b569c8fd7d9cec7baa814fd2340cd1ddc Mon Sep 17 00:00:00 2001
From: CJ Cobb <46455409+cjcobb23@users.noreply.github.com>
Date: Wed, 10 Aug 2022 17:09:56 -0400
Subject: [PATCH] update rippled to 1.9.2 (#228)

* patch rippled to build with c++20
---
 CMake/deps/Remove-bitset-operator.patch | 24 ++++++++++++++++++++++++
 CMake/deps/rippled.cmake                |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 CMake/deps/Remove-bitset-operator.patch

diff --git a/CMake/deps/Remove-bitset-operator.patch b/CMake/deps/Remove-bitset-operator.patch
new file mode 100644
index 00000000..80dce64a
--- /dev/null
+++ b/CMake/deps/Remove-bitset-operator.patch
@@ -0,0 +1,24 @@
+From 5cd9d09d960fa489a0c4379880cd7615b1c16e55 Mon Sep 17 00:00:00 2001
+From: CJ Cobb <ccobb@ripple.com>
+Date: Wed, 10 Aug 2022 12:30:01 -0400
+Subject: [PATCH] Remove bitset operator !=
+
+---
+ src/ripple/protocol/Feature.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/ripple/protocol/Feature.h b/src/ripple/protocol/Feature.h
+index b3ecb099b..6424be411 100644
+--- a/src/ripple/protocol/Feature.h
++++ b/src/ripple/protocol/Feature.h
+@@ -126,7 +126,6 @@ class FeatureBitset : private std::bitset<detail::numFeatures>
+ public:
+     using base::bitset;
+     using base::operator==;
+-    using base::operator!=;
+ 
+     using base::all;
+     using base::any;
+-- 
+2.32.0
+
diff --git a/CMake/deps/rippled.cmake b/CMake/deps/rippled.cmake
index baddb11a..ef91eb7f 100644
--- a/CMake/deps/rippled.cmake
+++ b/CMake/deps/rippled.cmake
@@ -1,11 +1,13 @@
 set(RIPPLED_REPO "https://github.com/ripple/rippled.git")
-set(RIPPLED_BRANCH "1.9.0")
+set(RIPPLED_BRANCH "1.9.2")
 set(NIH_CACHE_ROOT "${CMAKE_CURRENT_BINARY_DIR}" CACHE INTERNAL "")
+set(patch_command ! grep operator!= src/ripple/protocol/Feature.h || git apply < ${CMAKE_CURRENT_SOURCE_DIR}/CMake/deps/Remove-bitset-operator.patch)
 message(STATUS "Cloning ${RIPPLED_REPO} branch ${RIPPLED_BRANCH}")
 FetchContent_Declare(rippled
   GIT_REPOSITORY "${RIPPLED_REPO}"
   GIT_TAG "${RIPPLED_BRANCH}"
   GIT_SHALLOW ON
+  PATCH_COMMAND "${patch_command}"
 )
 
 FetchContent_GetProperties(rippled)