From 5e7a6d7e0a93044539ca36118947af6909da985f Mon Sep 17 00:00:00 2001
From: Paul Guyot <pguyot@kallisys.net>
Date: Tue, 21 May 2024 21:14:41 +0200
Subject: [PATCH] snappy: update to 1.2.1

Release eventually fixes ABI compatibility issue created by 1.2.0.
Remove patch accordingly.

See: https://github.com/google/snappy/issues/183
Closes: https://trac.macports.org/ticket/70046

Signed-off-by: Paul Guyot <pguyot@kallisys.net>
---
 archivers/snappy/Portfile                       | 17 ++++++-----------
 .../snappy/files/patch-version-number.diff      | 13 -------------
 2 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 archivers/snappy/files/patch-version-number.diff

diff --git a/archivers/snappy/Portfile b/archivers/snappy/Portfile
index 4dcb3f0cbdab6..36cdb45e0e986 100644
--- a/archivers/snappy/Portfile
+++ b/archivers/snappy/Portfile
@@ -6,8 +6,8 @@ PortGroup           compiler_blacklist_versions 1.0
 PortGroup           cmake 1.1
 PortGroup           github 1.0
 
-github.setup        google snappy 1.2.0
-revision            1
+github.setup        google snappy 1.2.1
+revision            0
 categories          archivers
 maintainers         nomaintainer
 license             BSD
@@ -27,22 +27,17 @@ long_description    Snappy is a compression/decompression library. It does \
 
 homepage            https://google.github.io/snappy/
 
-checksums           rmd160  35f820c4e35c8fe8ab19d88e7cdbf5860128afa3 \
-                    sha256  1fd4fd029cec3aeb70ba7031766084e5ccd919c778178e6a99130a87edfc044a \
-                    size    1107397
+checksums           rmd160  fa06ccd40a7fab5d14aa4c6e2bd4822fa8dc699f \
+                    sha256  8835ad585dab2393d3ca7869813efacf58df1129e530ad5239a02e303825fb19 \
+                    size    1107991
 
 # Disable Xcode clang < 1200, due to the following:
 #   error: invalid output constraint '=@ccz' in asm
 compiler.blacklist-append {clang < 1200}
 
-# RTTI:
 # https://github.com/facebook/folly/issues/1583
 # https://github.com/Homebrew/homebrew-core/pull/76686#issuecomment-847527483
-# Version:
-# Upstream forgot to update version. This was done in a later PR.
-# https://github.com/google/snappy/pull/178
-patchfiles-append   patch-no-disable-rtti.diff \
-                    patch-version-number.diff
+patchfiles-append   patch-no-disable-rtti.diff
 
 # CMake Error in CMakeLists.txt:
 #  Target "snappy" requires the language dialect "CXX11" , but CMake does not
diff --git a/archivers/snappy/files/patch-version-number.diff b/archivers/snappy/files/patch-version-number.diff
deleted file mode 100644
index a561d03cf4fdd..0000000000000
--- a/archivers/snappy/files/patch-version-number.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 85afe58..94bbc86 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -27,7 +27,7 @@
- # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- cmake_minimum_required(VERSION 3.1)
--project(Snappy VERSION 1.1.10 LANGUAGES C CXX)
-+project(Snappy VERSION 1.2.0 LANGUAGES C CXX)
- 
- # C++ standard can be overridden when this is used as a sub-project.
- if(NOT CMAKE_CXX_STANDARD)