Re: [PR PATCH] [Updated] snappy: update to 1.1.9.

[skmpz <skmpz@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]

There is an updated pull request by skmpz against master on the void-packages repository

https://github.com/skmpz/void-packages snappy-1.1.9
https://github.com/void-linux/void-packages/pull/31083

snappy: update to 1.1.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31083.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snappy-1.1.9-31083.patch --]
[-- Type: text/x-diff, Size: 6342 bytes --]

From ae136c5590b04a8c0bcd488f3f7e769cf0cf8a0b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 24 May 2021 14:13:09 +0400
Subject: [PATCH 1/2] New package: benchmark-1.5.3

---
 common/shlibs              |  2 ++
 srcpkgs/benchmark-devel    |  1 +
 srcpkgs/benchmark/template | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/benchmark-devel
 create mode 100644 srcpkgs/benchmark/template

diff --git a/common/shlibs b/common/shlibs
index 265ae21f0bc8..6eddee13b871 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1374,6 +1374,8 @@ libkgapi2.so.2 libkgapi-2.0.1_1
 libqoauth.so.2 qoauth-qt5-2.0.0_1
 libIrrlicht.so.1.8 irrlicht-1.8_1
 libsnappy.so.1 snappy-1.1.0_1
+libbenchmark.so.0 benchmark-1.5.3_1
+libbenchmark_main.so.0 benchmark-1.5.3_1
 libKF5Torrent.so.6 libktorrent-2.1_1
 libvncserver.so.1 libvncserver-0.9.13_2
 libvncclient.so.1 libvncserver-0.9.13_2
diff --git a/srcpkgs/benchmark-devel b/srcpkgs/benchmark-devel
new file mode 120000
index 000000000000..b26bca2dd54d
--- /dev/null
+++ b/srcpkgs/benchmark-devel
@@ -0,0 +1 @@
+benchmark
\ No newline at end of file
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
new file mode 100644
index 000000000000..67e78a25662c
--- /dev/null
+++ b/srcpkgs/benchmark/template
@@ -0,0 +1,24 @@
+# Template file for 'benchmark'
+pkgname=benchmark
+version=1.5.3
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
+ -DBENCHMARK_DOWNLOAD_DEPENDENCIES=OFF"
+short_desc="Microbenchmark support library"
+maintainer="skmpz <dem.procopiou@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/google/benchmark/"
+distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
+checksum=e4fbb85eec69e6668ad397ec71a3a3ab165903abe98a8327db920b94508f720e
+
+benchmark-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 7c3651659301db2e58cac3112cbfc2512cf13094 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 24 May 2021 14:16:20 +0400
Subject: [PATCH 2/2] snappy: update to 1.1.9.

Patch taken from https://github.com/google/snappy/pull/128
---
 .../patches/cmakelists_no_3rdparty.patch      | 28 +++++++++++++++++++
 srcpkgs/snappy/patches/inline.patch           | 11 ++++++++
 srcpkgs/snappy/template                       | 10 +++----
 3 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch
 create mode 100644 srcpkgs/snappy/patches/inline.patch

diff --git a/srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch b/srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch
new file mode 100644
index 000000000000..ba3d91c35efd
--- /dev/null
+++ b/srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch
@@ -0,0 +1,28 @@
+--- CMakeLists.txt	2021-05-05 02:53:34.000000000 +0400
++++ CMakeLists.txt	2021-05-24 13:49:21.551706280 +0400
+@@ -287,17 +286,0 @@ if(SNAPPY_BUILD_TESTS)
+-  # Prevent overriding the parent project's compiler/linker settings on Windows.
+-  set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-  set(install_gtest OFF)
+-  set(install_gmock OFF)
+-  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)
+-
+@@ -309 +292 @@ if(SNAPPY_BUILD_TESTS)
+-  target_link_libraries(snappy_unittest snappy_test_support gmock_main gtest)
++  target_link_libraries(snappy_unittest snappy_test_support gtest_main gtest)
+@@ -330 +313 @@ if(SNAPPY_BUILD_BENCHMARKS)
+-  target_link_libraries(snappy_benchmark snappy_test_support benchmark_main)
++  target_link_libraries(snappy_benchmark snappy_test_support benchmark_main benchmark)
+@@ -335 +317,0 @@ if(SNAPPY_BUILD_BENCHMARKS)
+-  add_subdirectory("third_party/benchmark")
diff --git a/srcpkgs/snappy/patches/inline.patch b/srcpkgs/snappy/patches/inline.patch
new file mode 100644
index 000000000000..17f05206ef29
--- /dev/null
+++ b/srcpkgs/snappy/patches/inline.patch
@@ -0,0 +1,11 @@
+Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to fix:
+1097 |         size_t tag_type = AdvanceToNextTag(&ip, &tag);
+     |                           ~~~~~~~~~~~~~~~~^~~~~~~~~~~
+../snappy.cc:1017:8: error: inlining failed in call to 'always_inline'
+'size_t snappy::AdvanceToNextTag(const uint8_t**, size_t*)': function body can be overwritten at link time
+
+--- snappy.cc	2021-05-05 02:53:34.000000000 +0400
++++ snappy.cc	2021-05-24 01:24:59.124654893 +0400
+@@ -1017 +1017 @@ SNAPPY_ATTRIBUTE_ALWAYS_INLINE
+-size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
++inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
diff --git a/srcpkgs/snappy/template b/srcpkgs/snappy/template
index 7062cb7b0d4c..7e9e5214fb7d 100644
--- a/srcpkgs/snappy/template
+++ b/srcpkgs/snappy/template
@@ -1,23 +1,23 @@
 # Template file for 'snappy'
 pkgname=snappy
-version=1.1.8
+version=1.1.9
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=1"
-makedepends="zlib-devel lzo-devel"
+makedepends="zlib-devel lzo-devel gtest-devel benchmark-devel"
 short_desc="Fast compressor/decompressor library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://google.github.io/snappy"
 distfiles="https://github.com/google/snappy/archive/${version}.tar.gz"
-checksum=16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f
+checksum=75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7
 
 post_install() {
 	vlicense COPYING
 }
 
 snappy-devel_package() {
-	depends="${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include