commit: 6104eabf28c212609f9e6ef559682f39ec481594 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Fri Mar 28 17:53:22 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri May 23 06:00:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6104eabf
app-arch/snappy: drop 1.1.10-r1 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/41351 Signed-off-by: Sam James <sam <AT> gentoo.org> app-arch/snappy/Manifest | 1 - .../snappy/files/snappy-1.1.9-clang-werror.patch | 16 ------- .../snappy/files/snappy-1.1.9_external_gtest.patch | 34 --------------- .../snappy/files/snappy-1.1.9_remove-no-rtti.patch | 35 ---------------- app-arch/snappy/snappy-1.1.10-r1.ebuild | 49 ---------------------- 5 files changed, 135 deletions(-) diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest index 804ebaee4c44..7fffa65748ca 100644 --- a/app-arch/snappy/Manifest +++ b/app-arch/snappy/Manifest @@ -1,2 +1 @@ -DIST snappy-1.1.10.tar.gz 1105312 BLAKE2B 5195335fb1883974d290e7dca2b6d928bde2b183f3f61bca9da28855b39fd9a4ee1c24014322d238d2ec94f3a3a55fd43110c88283e85865272226e11cbb4834 SHA512 3578597f1d4ec09104ce0296b825b013590351230dfe56c635081fd282ce7a13a34caf2c283ac77bd24065e2d27af6db068d1f84b98cec2fd39a0e37a0d77070 DIST snappy-1.2.1.tar.gz 1108761 BLAKE2B a3a93331344052e8da18b220575764ba6a75f471867e946fcca48a18b68ff5335e672b0b54100ac18e435e87ee66bcfea3ead7349fe016ec7d9bb7b57e2c7386 SHA512 e7290d79ddd45605aafd02cba9eaa32309c94af04f137552a97a915c391f185dccab9b7b21a01b28f3f446be420232c3c22d91c06e0be6e1e2e32d645174798c diff --git a/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch b/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch deleted file mode 100644 index e89a8305e731..000000000000 --- a/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,13 +66,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra") - endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra") - -- # Use -Werror for clang only. -- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") -- endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror") -- endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- - # Disable C++ exceptions. - string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") diff --git a/app-arch/snappy/files/snappy-1.1.9_external_gtest.patch b/app-arch/snappy/files/snappy-1.1.9_external_gtest.patch deleted file mode 100644 index 8aa4c1eabd22..000000000000 --- a/app-arch/snappy/files/snappy-1.1.9_external_gtest.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9c1283f6022647a6ea39c1388321d6029fcdf80c Mon Sep 17 00:00:00 2001 -From: "Azamat H. Hackimov" <[email protected]> -Date: Wed, 5 May 2021 21:19:22 +0300 -Subject: [PATCH] Use external GTest framework - ---- - CMakeLists.txt | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 672561e..fc830fe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -291,15 +291,8 @@ if(SNAPPY_BUILD_TESTS) - set(build_gmock ON) - - # This project is tested using GoogleTest. -- add_subdirectory("third_party/googletest") -- -- # GoogleTest triggers a missing field initializers warning. -- if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) -- set_property(TARGET gtest -- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) -- set_property(TARGET gmock -- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) -- endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) -+ find_package(GTest REQUIRED) -+ include(GoogleTest) - - add_executable(snappy_unittest "") - target_sources(snappy_unittest --- -2.26.3 - diff --git a/app-arch/snappy/files/snappy-1.1.9_remove-no-rtti.patch b/app-arch/snappy/files/snappy-1.1.9_remove-no-rtti.patch deleted file mode 100644 index 16528b59457c..000000000000 --- a/app-arch/snappy/files/snappy-1.1.9_remove-no-rtti.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 516fdcca6606502e2d562d20c01b225c8d066739 Mon Sep 17 00:00:00 2001 -From: holmes1412 <[email protected]> -Date: Fri, 28 May 2021 21:46:53 +0800 -Subject: [PATCH] remove Disable-RTTI flags for the convenient of derivation - ---- - CMakeLists.txt | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 672561e..31afaa0 100644 ---- 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") -@@ -76,10 +72,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") -- -- # Disable RTTI. -- string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") - endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - - # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make diff --git a/app-arch/snappy/snappy-1.1.10-r1.ebuild b/app-arch/snappy/snappy-1.1.10-r1.ebuild deleted file mode 100644 index 4e00d99ac18c..000000000000 --- a/app-arch/snappy/snappy-1.1.10-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="A high-speed compression/decompression library by Google" -HOMEPAGE="https://github.com/google/snappy"; -SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -# ${PV%%.*}.FUDGE where FUDGE is incremented if ABI is broken without a new SONAME -# Please use abidiff on bumps. -SLOT="0/${PV%%.*}.1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-cpp/gtest )" - -DOCS=( format_description.txt framing_format.txt NEWS README.md ) - -PATCHES=( - "${FILESDIR}/${PN}-1.1.9_external_gtest.patch" - "${FILESDIR}/${PN}-1.1.9-clang-werror.patch" - "${FILESDIR}/${PN}-1.1.9_remove-no-rtti.patch" -) - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_CXX_STANDARD=14 # Latest gtest needs -std=c++14 or newer - -DSNAPPY_BUILD_TESTS=$(usex test) - -DSNAPPY_REQUIRE_AVX=$(usex cpu_flags_x86_avx) - -DSNAPPY_REQUIRE_AVX2=$(usex cpu_flags_x86_avx2) - -DSNAPPY_BUILD_BENCHMARKS=OFF - # Options below are related to benchmarking, that we disable. - -DHAVE_LIBZ=NO - -DHAVE_LIBLZO2=NO - -DHAVE_LIBLZ4=NO - ) - cmake_src_configure -} - -multilib_src_test() { - # run tests directly to get verbose output - cd "${S}" || die - "${BUILD_DIR}"/snappy_unittest || die -}
