From 961b066000b0e43ae22e16cc67b4269dcf0c6d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20G=C3=BCnther?= <johannes.guenther@intel.com>
Date: Mon, 25 Sep 2023 10:55:47 +0200
Subject: [PATCH] Bump Snappy

---
 .gitattributes                                |  2 +-
 .../superbuild/dependencies/dep_snappy.cmake  | 11 ++++------
 .../dependencies/snappy-sign-compare.patch    | 21 +++++++++++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 scripts/superbuild/dependencies/snappy-sign-compare.patch

diff --git a/.gitattributes b/.gitattributes
index f5c7d5784..d6c04f90c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
 *.rc	text working-tree-encoding=UTF-16LE-BOM eol=CRLF
-glfw.patch eol=lf
+*.patch eol=lf
diff --git a/scripts/superbuild/dependencies/dep_snappy.cmake b/scripts/superbuild/dependencies/dep_snappy.cmake
index 072fdf245..bdcf01854 100644
--- a/scripts/superbuild/dependencies/dep_snappy.cmake
+++ b/scripts/superbuild/dependencies/dep_snappy.cmake
@@ -9,15 +9,12 @@ else()
   set(COMPONENT_PATH ${INSTALL_DIR_ABSOLUTE})
 endif()
 
-if (NOT WIN32)
-  set(PATCH sed -ie "s/size_t AdvanceToNextTag/inline \\0/" snappy.cc)
-endif()
-
 ExternalProject_Add(${COMPONENT_NAME}
-  URL "https://github.com/google/snappy/archive/refs/tags/1.1.9.zip"
-  URL_HASH "SHA256=e170ce0def2c71d0403f5cda61d6e2743373f9480124bcfcd0fa9b3299d428d9"
+  URL "https://github.com/google/snappy/archive/refs/tags/1.1.10.zip"
+  URL_HASH "SHA256=3c6f7b07f92120ebbba5f7742f2cc2386fd46c53f5730322b7b90d4afc126fca"
 
-  PATCH_COMMAND ${PATCH}
+  # `patch` is not available on all systems, so use `git apply` instead
+  PATCH_COMMAND git init -q . && git apply -v -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/snappy-sign-compare.patch
 
   # Skip updating on subsequent builds (faster)
   UPDATE_COMMAND ""
diff --git a/scripts/superbuild/dependencies/snappy-sign-compare.patch b/scripts/superbuild/dependencies/snappy-sign-compare.patch
new file mode 100644
index 000000000..eeb552a23
--- /dev/null
+++ b/scripts/superbuild/dependencies/snappy-sign-compare.patch
@@ -0,0 +1,21 @@
+commit 27f34a580be4a3becf5f8c0cba13433f53c21337
+Author: Richard O'Grady <rjogrady@google.com>
+Date:   Wed Jul 12 19:12:01 2023
+
+    Fix -Wsign-compare warning
+    
+    PiperOrigin-RevId: 547529709
+
+diff --git a/snappy.cc b/snappy.cc
+index 688065b..6473123 100644
+--- a/snappy.cc
++++ b/snappy.cc
+@@ -1289,7 +1289,7 @@ std::pair<const uint8_t*, ptrdiff_t> DecompressBranchless(
+         DeferMemCopy(&deferred_src, &deferred_length, from, len);
+       }
+     } while (ip < ip_limit_min_slop &&
+-             (op + deferred_length) < op_limit_min_slop);
++             static_cast<ptrdiff_t>(op + deferred_length) < op_limit_min_slop);
+   exit:
+     ip--;
+     assert(ip <= ip_limit);