git: fa01e117e24f - main - archivers/snappy: update to 1.2.0.

The branch main has been updated by vanilla:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fa01e117e24fed6cf7b52d90a8d82b4bee06fe21

commit fa01e117e24fed6cf7b52d90a8d82b4bee06fe21
Author:     Vanilla I. Shu <vanilla@FreeBSD.org>
AuthorDate: 2024-04-07 10:14:06 +0000
Commit:     Vanilla I. Shu <vanilla@FreeBSD.org>
CommitDate: 2024-04-07 10:14:25 +0000

    archivers/snappy: update to 1.2.0.
---
 archivers/snappy/Makefile                      |  2 +-
 archivers/snappy/distinfo                      |  6 +++---
 archivers/snappy/files/patch-CMakeLists.txt    | 19 ++++++++++++++-----
 archivers/snappy/files/patch-snappy-internal.h |  4 ++--
 archivers/snappy/files/patch-snappy.cc         | 11 -----------
 5 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile
index 7b682e6b0a00..010babcbf1f4 100644
--- a/archivers/snappy/Makefile
+++ b/archivers/snappy/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	snappy
-PORTVERSION=	1.1.10
+PORTVERSION=	1.2.0
 PORTREVISION=	0
 CATEGORIES=	archivers
 
diff --git a/archivers/snappy/distinfo b/archivers/snappy/distinfo
index ff2ca326920c..d362e3372754 100644
--- a/archivers/snappy/distinfo
+++ b/archivers/snappy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678607829
-SHA256 (google-snappy-1.1.10_GH0.tar.gz) = 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90
-SIZE (google-snappy-1.1.10_GH0.tar.gz) = 1105312
+TIMESTAMP = 1712399939
+SHA256 (google-snappy-1.2.0_GH0.tar.gz) = 9b8f10fbb5e3bc112f2e5e64f813cb73faea42ec9c533a5023b5ae08aedef42e
+SIZE (google-snappy-1.2.0_GH0.tar.gz) = 1107265
diff --git a/archivers/snappy/files/patch-CMakeLists.txt b/archivers/snappy/files/patch-CMakeLists.txt
index 68d48af31447..1359fddec816 100644
--- a/archivers/snappy/files/patch-CMakeLists.txt
+++ b/archivers/snappy/files/patch-CMakeLists.txt
@@ -1,6 +1,15 @@
---- CMakeLists.txt.orig	2023-03-08 23:44:00 UTC
+--- CMakeLists.txt.orig	2024-04-04 19:04:38 UTC
 +++ CMakeLists.txt
-@@ -78,8 +78,10 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+@@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 3.1)
+ # 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)
+@@ -83,8 +83,10 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
  
    # Disable RTTI.
@@ -13,7 +22,7 @@
  endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
  
  # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
-@@ -235,8 +237,7 @@ configure_file(
+@@ -248,8 +250,7 @@ configure_file(
    "snappy-stubs-public.h.in"
    "${PROJECT_BINARY_DIR}/snappy-stubs-public.h")
  
@@ -23,7 +32,7 @@
    PRIVATE
      "snappy-internal.h"
      "snappy-stubs-internal.h"
-@@ -257,20 +258,35 @@ target_sources(snappy
+@@ -270,20 +271,35 @@ target_sources(snappy
      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h>
      $<INSTALL_INTERFACE:include/snappy-stubs-public.h>
  )
@@ -63,7 +72,7 @@
  if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS)
    add_library(snappy_test_support "")
    target_sources(snappy_test_support
-@@ -381,7 +397,7 @@ endif(SNAPPY_FUZZING_BUILD)
+@@ -399,7 +415,7 @@ if(SNAPPY_INSTALL)
  include(GNUInstallDirs)
  
  if(SNAPPY_INSTALL)
diff --git a/archivers/snappy/files/patch-snappy-internal.h b/archivers/snappy/files/patch-snappy-internal.h
index c00d2397a50c..e58727a30725 100644
--- a/archivers/snappy/files/patch-snappy-internal.h
+++ b/archivers/snappy/files/patch-snappy-internal.h
@@ -1,6 +1,6 @@
---- snappy-internal.h.orig	2023-04-13 12:38:13 UTC
+--- snappy-internal.h.orig	2024-04-04 19:04:38 UTC
 +++ snappy-internal.h
-@@ -102,6 +102,15 @@ inline void V128_StoreU(V128* dst, V128 val) {
+@@ -104,6 +104,15 @@ inline void V128_StoreU(V128* dst, V128 val) {
    vst1q_u8(reinterpret_cast<uint8_t*>(dst), val);
  }
  
diff --git a/archivers/snappy/files/patch-snappy.cc b/archivers/snappy/files/patch-snappy.cc
deleted file mode 100644
index f97971659540..000000000000
--- a/archivers/snappy/files/patch-snappy.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- snappy.cc.orig	2023-03-12 08:04:09 UTC
-+++ snappy.cc
-@@ -1290,7 +1290,7 @@ std::pair<const uint8_t*, ptrdiff_t> DecompressBranchl
-         DeferMemCopy(&deferred_src, &deferred_length, from, len);
-       }
-     } while (ip < ip_limit_min_slop &&
--             (op + deferred_length) < op_limit_min_slop);
-+             (op + deferred_length) < (size_t)op_limit_min_slop);
-   exit:
-     ip--;
-     assert(ip <= ip_limit);