snappy: 1.1.10 -> 1.2.0

snappy/.signature

@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/S87Uv/k25m1Zo3MTur0KmaqeakKDIGAt13bxqF2XOOstRpBPhU/iYgSXu/1VdTgNICMx97/OZS2A6DbLRigdgU=
-SHA256 (Pkgfile) = 0702f22448b4ef9872e65fe825c89954b6d1a5d04559c39d3f17c20b611b6049
+RWSE3ohX2g5d/QszJPYtIZjvV+0ZIp7hseQ3zDBs8jR/G59oUZE4+rZ1sr/UGIFbSaSKaefugCxwGzWB3upx3ocLHIIkuwKTswk=
+SHA256 (Pkgfile) = 76e9b8c2a727a1417a770ae7a1845add22890ab8550f6402beee24ee96f71535
 SHA256 (.footprint) = 4e6caf096a0a3890f9fed498418de3635acfb1fdb7239bd17bff22934bd70eee
-SHA256 (snappy-1.1.10.tar.gz) = 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90
-SHA256 (snappy-thirdparty.patch) = c9599e8a4880e7205c74aaadad153c5426853d11ffb7c8a6862d3e291353de7d
-SHA256 (snappy-do-not-disable-rtti.patch) = 0934868ea57a9d9cb3f55b5a2bf0c66f53ec130bd1e1bb3f83f200e6cf3af557
+SHA256 (snappy-1.2.0.tar.gz) = 9b8f10fbb5e3bc112f2e5e64f813cb73faea42ec9c533a5023b5ae08aedef42e
+SHA256 (snappy-thirdparty.patch) = c6414e04258e9cc0ea37adf35eba19987f26606afe7527fac094a290f9311c9e
+SHA256 (snappy-do-not-disable-rtti.patch) = 66d4a99c2194b15c3bab4ee9c7eda6b5fcf391bf5d1687b1b5255bb77cae12f4

snappy/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer: Tim Biermann, tbier at posteo dot de
 
 name=snappy
-version=1.1.10
+version=1.2.0
 release=1
 source=(https://github.com/google/snappy/archive/$version/$name-$version.tar.gz
   snappy-thirdparty.patch

snappy/snappy-do-not-disable-rtti.patch

@@ -1,7 +1,22 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2021-05-04 15:53:34.000000000 -0700
-+++ b/CMakeLists.txt	2021-07-08 15:07:15.382419910 -0700
-@@ -76,10 +76,6 @@
+From 012ff3ef652027abd1a422268cf9f164b386f340 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Thu, 11 Apr 2024 10:07:45 +0300
+Subject: [PATCH 3/3] Don't disable RTTI
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,10 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-")
+   add_definitions(-D_HAS_EXCEPTIONS=0)
+-
+-  # Disable RTTI.
+-  string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
+ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   # Use -Wall for clang and gcc.
+   if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
+@@ -88,10 +84,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
    # Disable C++ exceptions.
    string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
@@ -12,3 +27,5 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
  endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
  
  # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
+-- 
+2.43.2

snappy/snappy-thirdparty.patch

@@ -1,7 +1,17 @@
-diff -r efdeda5cdfa2 CMakeLists.txt
---- a/CMakeLists.txt	Sat May 15 14:50:17 2021 +0200
-+++ b/CMakeLists.txt	Sat May 15 14:54:41 2021 +0200
-@@ -284,29 +284,12 @@
+From 4e6c67832f53b126d1e54b9398b88f23e75846f3 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Thu, 11 Apr 2024 10:05:30 +0300
+Subject: [PATCH 1/3] Use external GTest suite
+
+---
+ CMakeLists.txt | 22 ++--------------------
+ 1 file changed, 2 insertions(+), 20 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 85afe58..e23d2ca 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -319,27 +319,9 @@ endif(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS)
  if(SNAPPY_BUILD_TESTS)
    enable_testing()
  
@@ -11,7 +21,7 @@ diff -r efdeda5cdfa2 CMakeLists.txt
 -  set(install_gmock OFF)
 -  set(build_gmock ON)
 -
--  # This project is tested using GoogleTest.
+   # This project is tested using GoogleTest.
 -  add_subdirectory("third_party/googletest")
 -
 -  # GoogleTest triggers a missing field initializers warning.
@@ -22,27 +32,14 @@ diff -r efdeda5cdfa2 CMakeLists.txt
 -        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
 -  endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
 -
+-  if(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION)
+-    set_property(TARGET gtest
+-        APPEND PROPERTY COMPILE_OPTIONS -Wno-implicit-int-float-conversion)
+-  endif(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION)
++  find_package(GTest REQUIRED)
++  include(GoogleTest)
+ 
    add_executable(snappy_unittest "")
    target_sources(snappy_unittest
-     PRIVATE
-       "snappy_unittest.cc"
-   )
--  target_link_libraries(snappy_unittest snappy_test_support gmock_main gtest)
-+  target_link_libraries(snappy_unittest snappy_test_support gtest_main gtest)
- 
-   add_test(
-     NAME snappy_unittest
-@@ -327,12 +310,11 @@
-     PRIVATE
-       "snappy_benchmark.cc"
-   )
--  target_link_libraries(snappy_benchmark snappy_test_support benchmark_main)
-+  target_link_libraries(snappy_benchmark snappy_test_support benchmark_main benchmark)
- 
-   # This project uses Google benchmark for benchmarking.
-   set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
-   set(BENCHMARK_ENABLE_EXCEPTIONS OFF CACHE BOOL "" FORCE)
--  add_subdirectory("third_party/benchmark")
- endif(SNAPPY_BUILD_BENCHMARKS)
- 
- if(SNAPPY_FUZZING_BUILD)
+-- 
+2.43.2