diff --git a/info.yml b/info.yml index 471ab99..5e645d4 100644 --- a/info.yml +++ b/info.yml @@ -1,7 +1,7 @@ name: snappy description: A fast compressor/decompressor library -version: 1.2.2 -revision: 2 +version: 1.3.1 +revision: 1 url: https://github.com/google/snappy license: BSD-3-Clause maintainers: @@ -20,4 +20,4 @@ downloads: - url: https://github.com/google/snappy/archive/refs/tags/${BPM_PKG_VERSION}.tar.gz extract_to: ${BPM_SOURCE} extract_strip_components: 1 - checksum: 90f74bc1fbf78a6c56b3c4a082a05103b3a56bb17bca1a27e052ea11723292dc + checksum: 893f708a0bf4b5529d555ffcee390e940e932fcf90261f682604475a76cd0247 diff --git a/recipe.sh b/recipe.sh index b3f51ba..5fbe63c 100644 --- a/recipe.sh +++ b/recipe.sh @@ -8,7 +8,6 @@ prepare() { cd "$BPM_SOURCE" cp "$BPM_WORKDIR"/snappy.pc.in . patch -Np1 -i "$BPM_WORKDIR"/add-pkgconfig.patch - patch -Np1 -i "$BPM_WORKDIR"/reenable-rtti.patch patch -Np1 -i "$BPM_WORKDIR"/use-system-gtest.patch } diff --git a/source-files/reenable-rtti.patch b/source-files/reenable-rtti.patch deleted file mode 100644 index 3ff4468..0000000 --- a/source-files/reenable-rtti.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --unified --recursive --text --new-file snappy-1.2.2.orig/CMakeLists.txt snappy-1.2.2/CMakeLists.txt ---- snappy-1.2.2.orig/CMakeLists.txt 2025-04-19 23:20:48.985433149 +0200 -+++ snappy-1.2.2/CMakeLists.txt 2025-04-19 23:20:27.703912696 +0200 -@@ -51,10 +51,6 @@ - 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(MSVC) - # Use -Wall for clang and gcc. - if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") -@@ -81,10 +77,6 @@ - # Disable C++ exceptions. - string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") -- -- # Disable RTTI. -- string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") - endif(MSVC) - - # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make