Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-13 03:09:51 +03:00
Code Issues Wiki Activity

main/snappy: upgrade to 1.2.2

Browse source
This commit is contained in:
Andy Postnikov 2025-04-09 18:28:23 +02:00 • committed by Natanael Copa
parent 6d74bddabc
commit 80871bcad6
4 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
main/snappy/APKBUILD
View file

@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=snappy pkgname=snappy
pkgver=1.2.1 pkgver=1.2.2
pkgrel=0 pkgrel=0
_googletest_commit=18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6 _googletest_commit=b796f7d44681514f58a683a3a71ff17c94edb0c1
pkgdesc="Fast compression and decompression library" pkgdesc="Fast compression and decompression library"
url="https://github.com/google/snappy" url="https://github.com/google/snappy"
arch="all" arch="all"
@ -55,9 +55,9 @@ package() {
} }
sha512sums=" sha512sums="
e7290d79ddd45605aafd02cba9eaa32309c94af04f137552a97a915c391f185dccab9b7b21a01b28f3f446be420232c3c22d91c06e0be6e1e2e32d645174798c snappy-1.2.1.tar.gz 0c1e1019e1bec9281f9877996d896e59e1533456130143224acb9cbfc35c1b0dd9de0a76e4a36494844d9ec58c295eed8c50bdf6dbabe47cf679652eb24b1281 snappy-1.2.2.tar.gz
f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880 googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 97df9326ac2f64cd5e0f809182c9b09beef85f91c661e83363f7cb013eb38d9a31f02ded269b314b403f29708c6ee2c6b9fff277eb8fefb20d5c1945b3acdd30 googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz
8a891edf2f0b267b05c67d54945f11d723b058ddab5ac3f27b4f00678759d4a52b617d0c5724c7170a285eb068ffa4ffbbc5a9efa250964979b3969fc8730eb3 cmakelists.patch 9de467922ecfea32dd5200c5959c19192abf4d823eab2ea8dd718a11555dbcf33c0d2186f7750fcc0b00040e1ad0916c63fc95f3e7618105e9879ba24f9da5db cmakelists.patch
1e9ad24b9ab0adf82922cd7042cad7dd1709c147812b775870a8ef67f47ddc81ee3fe697a04a4cc54f78d17e74c45d2770976be10468a7df32e5205f50ca8e93 no-include-gtest.patch b9aeec944e8f7ef89035ff827772c28bb7404529f82fc70d8ed54b1db98deaa25fb1e5cbbda8f13c9d684c8a376c5654071aea11f89e69960e5b338cdbd2d8a2 no-include-gtest.patch
ec6a83d5e58deffd23f4b47e899b6645145548a823c2e1542812f05848a844839580a1b27aefa9beadba6b43f472abc38c42ea379db91da938837f4e69ae9cc0 rtti.patch 0f39012a1830037ff1b1d7a7a39212aa8040caae1bec088c2a158bcb06a44ec0870dc384e89c2d74fde694b20522702f987afa29de863a64160b0053dc57f4c0 rtti.patch
" "

18
main/snappy/cmakelists.patch
View file

@ -1,6 +1,6 @@
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -86,6 +86,8 @@ @@ -91,6 +91,8 @@
# it prominent in the GUI. # it prominent in the GUI.
option(BUILD_SHARED_LIBS "Build shared libraries(DLLs)." OFF) option(BUILD_SHARED_LIBS "Build shared libraries(DLLs)." OFF)
@ -9,7 +9,7 @@
option(SNAPPY_BUILD_TESTS "Build Snappy's own tests." ON) option(SNAPPY_BUILD_TESTS "Build Snappy's own tests." ON)
option(SNAPPY_BUILD_BENCHMARKS "Build Snappy's benchmarks" ON) option(SNAPPY_BUILD_BENCHMARKS "Build Snappy's benchmarks" ON)
@@ -98,6 +100,10 @@ @@ -103,6 +105,10 @@
option(SNAPPY_INSTALL "Install Snappy's header and library" ON) option(SNAPPY_INSTALL "Install Snappy's header and library" ON)
@ -20,7 +20,7 @@
include(TestBigEndian) include(TestBigEndian)
test_big_endian(SNAPPY_IS_BIG_ENDIAN) test_big_endian(SNAPPY_IS_BIG_ENDIAN)
@@ -213,19 +219,28 @@ @@ -251,17 +257,27 @@
"snappy-stubs-public.h.in" "snappy-stubs-public.h.in"
"${PROJECT_BINARY_DIR}/snappy-stubs-public.h") "${PROJECT_BINARY_DIR}/snappy-stubs-public.h")
@ -46,15 +46,13 @@
"snappy-stubs-internal.cc" "snappy-stubs-internal.cc"
"snappy.cc" "snappy.cc"
- "${PROJECT_BINARY_DIR}/config.h" - "${PROJECT_BINARY_DIR}/config.h"
- PUBLIC
+ "${PROJECT_BINARY_DIR}/config.h") + "${PROJECT_BINARY_DIR}/config.h")
- # Only CMake 3.3+ supports PUBLIC sources in targets exported by "install".
- $<$<VERSION_GREATER:CMAKE_VERSION,3.2>:PUBLIC>
+set(SNAPPY_SOURCE_PUBLIC +set(SNAPPY_SOURCE_PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-c.h> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-c.h>
$<INSTALL_INTERFACE:include/snappy-c.h> $<INSTALL_INTERFACE:include/snappy-c.h>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-sinksource.h> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-sinksource.h>
@@ -233,18 +248,32 @@ @@ -269,18 +285,30 @@
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy.h> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy.h>
$<INSTALL_INTERFACE:include/snappy.h> $<INSTALL_INTERFACE:include/snappy.h>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h>
@ -71,17 +69,15 @@
-) -)
+ $<INSTALL_INTERFACE:include>) + $<INSTALL_INTERFACE:include>)
+ +
+# Only CMake 3.3+ supports PUBLIC sources in targets exported by "install".
+target_sources(snappy PRIVATE ${SNAPPY_SOURCE_PRIVATE} +target_sources(snappy PRIVATE ${SNAPPY_SOURCE_PRIVATE}
+ $<$<VERSION_GREATER:CMAKE_VERSION,3.2>:PUBLIC> ${SNAPPY_SOURCE_PUBLIC}) + PUBLIC ${SNAPPY_SOURCE_PUBLIC})
+ +
+target_include_directories(snappy PUBLIC ${SNAPPY_INCLUDE_DIRS}) +target_include_directories(snappy PUBLIC ${SNAPPY_INCLUDE_DIRS})
+ +
+target_compile_definitions(snappy PRIVATE -DHAVE_CONFIG_H) +target_compile_definitions(snappy PRIVATE -DHAVE_CONFIG_H)
+ +
+# Only CMake 3.3+ supports PUBLIC sources in targets exported by "install".
+target_sources(snappy_static PRIVATE ${SNAPPY_SOURCE_PRIVATE} +target_sources(snappy_static PRIVATE ${SNAPPY_SOURCE_PRIVATE}
+ $<$<VERSION_GREATER:CMAKE_VERSION,3.2>:PUBLIC> ${SNAPPY_SOURCE_PUBLIC}) + PUBLIC ${SNAPPY_SOURCE_PUBLIC})
+ +
+target_include_directories(snappy_static PUBLIC ${SNAPPY_INCLUDE_DIRS}) +target_include_directories(snappy_static PUBLIC ${SNAPPY_INCLUDE_DIRS})
+ +

4
main/snappy/no-include-gtest.patch
View file

@ -3,12 +3,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3062e2..75f1265 100644 index c3062e2..75f1265 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -313,7 +313,7 @@ if(SNAPPY_BUILD_TESTS) @@ -331,5 +331,5 @@
set(build_gmock ON)
# This project is tested using GoogleTest. # This project is tested using GoogleTest.
- add_subdirectory("third_party/googletest") - add_subdirectory("third_party/googletest")
+ add_subdirectory("third_party/googletest" EXCLUDE_FROM_ALL) + add_subdirectory("third_party/googletest" EXCLUDE_FROM_ALL)
# GoogleTest triggers a missing field initializers warning. # GoogleTest triggers a missing field initializers warning.
if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)

9
main/snappy/rtti.patch
View file

@ -41,16 +41,17 @@ index 6eef485..755605d 100644
- # Disable RTTI. - # Disable RTTI.
- string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") else(MSVC)
# Use -Wall for clang and gcc. # Use -Wall for clang and gcc.
if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
@@ -77,9 +73,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") @@ -81,10 +77,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# Disable C++ exceptions.
string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
-
- # Disable RTTI. - # Disable RTTI.
- string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") endif(MSVC)
# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make