[PR PATCH] grpc: update to 1.49.1.

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] grpc: update to 1.49.1.
@ 2022-10-06 14:43 ahesford
  2022-10-06 17:42 ` [PR PATCH] [Updated] " ahesford
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: ahesford @ 2022-10-06 14:43 UTC (permalink / raw)
  To: ml

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

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages google
https://github.com/void-linux/void-packages/pull/39773

grpc: update to 1.49.1.
It's time to bite the bullet and package `abseil-cpp` to avoid duplicating patch work for `grpc` and `python3-grpcio`. Also, `protobuf` is set to depend on abseil in some future release. Only the shared libraries necessary the these dependants are included in `common/shlibs`; we can grow the list as needed.

#### Testing the changes
- I tested the changes in this PR: **briefly**

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

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

From cec8a5e54ad6fd9ad2b39c76a2f33e6131a36abf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 09:54:02 -0400
Subject: [PATCH 1/6] New package: abseil-cpp-20220623.1

---
 common/shlibs                                 | 19 +++++
 srcpkgs/abseil-cpp-devel                      |  1 +
 srcpkgs/abseil-cpp/patches/google-sucks.patch | 77 +++++++++++++++++++
 srcpkgs/abseil-cpp/template                   | 25 ++++++
 4 files changed, 122 insertions(+)
 create mode 120000 srcpkgs/abseil-cpp-devel
 create mode 100644 srcpkgs/abseil-cpp/patches/google-sucks.patch
 create mode 100644 srcpkgs/abseil-cpp/template

diff --git a/common/shlibs b/common/shlibs
index 26410ed4f6fb..df33eb5f7aed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4164,3 +4164,22 @@ libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1
 libtpm2-totp.so.0 libtpm2-totp-0.3.0_1
 libmujs.so.1.2.0 mujs-1.2.0_2
 libiir.so.1 libiir1-1.9.3_1
+libabsl_statusor.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_hash.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_raw_hash_set.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_bad_variant_access.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_status.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_pool_urbg.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen_hwaes_impl.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen_slow.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cord.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_bad_optional_access.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cordz_info.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_str_format_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_synchronization.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_time.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
diff --git a/srcpkgs/abseil-cpp-devel b/srcpkgs/abseil-cpp-devel
new file mode 120000
index 000000000000..21b48b7ea521
--- /dev/null
+++ b/srcpkgs/abseil-cpp-devel
@@ -0,0 +1 @@
+abseil-cpp
\ No newline at end of file
diff --git a/srcpkgs/abseil-cpp/patches/google-sucks.patch b/srcpkgs/abseil-cpp/patches/google-sucks.patch
new file mode 100644
index 000000000000..511bae847101
--- /dev/null
+++ b/srcpkgs/abseil-cpp/patches/google-sucks.patch
@@ -0,0 +1,77 @@
+commit 1fbfea71fb42b2e79f9e342c1843bd26a8703536
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Thu Aug 25 01:20:58 2022 +0200
+
+    An all-in-one patch that fixes several issues:
+    
+    1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
+    2) powerpc stacktrace implementation only works on glibc (disabled on musl)
+    3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
+    4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
+
+diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc
+index b1c396c..d62bfd6 100644
+--- a/absl/base/internal/unscaledcycleclock.cc
++++ b/absl/base/internal/unscaledcycleclock.cc
+@@ -20,7 +20,7 @@
+ #include <intrin.h>
+ #endif
+ 
+-#if defined(__powerpc__) || defined(__ppc__)
++#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
+ #ifdef __GLIBC__
+ #include <sys/platform/ppc.h>
+ #elif defined(__FreeBSD__)
+@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() {
+   return base_internal::NominalCPUFrequency();
+ }
+ 
+-#elif defined(__powerpc__) || defined(__ppc__)
++#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
+ 
+ int64_t UnscaledCycleClock::Now() {
+ #ifdef __GLIBC__
+diff --git a/absl/base/internal/unscaledcycleclock.h b/absl/base/internal/unscaledcycleclock.h
+index 2cbeae3..83d8c98 100644
+--- a/absl/base/internal/unscaledcycleclock.h
++++ b/absl/base/internal/unscaledcycleclock.h
+@@ -46,8 +46,8 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
+-    defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
++    ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
++    defined(__riscv) || defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0
+diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc
+index 5bdd341..a42a3c4 100644
+--- a/absl/debugging/internal/examine_stack.cc
++++ b/absl/debugging/internal/examine_stack.cc
+@@ -174,8 +174,10 @@ void* GetProgramCounter(void* const vuc) {
+     return reinterpret_cast<void*>(context->uc_mcontext.pc);
+ #elif defined(__powerpc64__)
+     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
+-#elif defined(__powerpc__)
++#elif defined(__powerpc__) && defined(__GLIBC__)
+     return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
++#elif defined(__powerpc__)
++    return reinterpret_cast<void*>(context->uc_mcontext.gregs[32]);
+ #elif defined(__riscv)
+     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
+ #elif defined(__s390__) && !defined(__s390x__)
+diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h
+index 3929b1b..23d5e50 100644
+--- a/absl/debugging/internal/stacktrace_config.h
++++ b/absl/debugging/internal/stacktrace_config.h
+@@ -60,7 +60,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
diff --git a/srcpkgs/abseil-cpp/template b/srcpkgs/abseil-cpp/template
new file mode 100644
index 000000000000..8640d2489406
--- /dev/null
+++ b/srcpkgs/abseil-cpp/template
@@ -0,0 +1,25 @@
+# Template file for 'abseil-cpp'
+pkgname=abseil-cpp
+version=20220623.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON -DABSL_PROPAGATE_CXX_STD=ON"
+hostmakedepends="pkg-config"
+short_desc="Abseil common libraries"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0"
+homepage="https://abseil.io"
+distfiles="https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz"
+checksum=91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8
+
+abseil-cpp-devel_package() {
+	short_desc+=" (development files)"
+	depends="${sourcepkg}>=${version}_${revision}"
+
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From aaa7f0d86b77b018c878b4a3163aacf2f4614379 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:08:35 -0400
Subject: [PATCH 2/6] grpc: update to 1.49.1.

---
 common/shlibs                              | 24 ++++-----
 srcpkgs/grpc/patches/absl-is-private.patch | 58 --------------------
 srcpkgs/grpc/patches/google-sucks.patch    | 63 ----------------------
 srcpkgs/grpc/patches/private-abseil.patch  | 34 ------------
 srcpkgs/grpc/template                      | 40 +++-----------
 5 files changed, 18 insertions(+), 201 deletions(-)
 delete mode 100644 srcpkgs/grpc/patches/absl-is-private.patch
 delete mode 100644 srcpkgs/grpc/patches/google-sucks.patch
 delete mode 100644 srcpkgs/grpc/patches/private-abseil.patch

diff --git a/common/shlibs b/common/shlibs
index df33eb5f7aed..c61f25fbb127 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3641,18 +3641,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.18 libgrpc-1.39.0_6
-libgpr.so.18 libgrpc-1.39.0_6
-libgrpc++.so.1.39 libgrpc-1.39.0_6
-libgrpc++_alts.so.1.39 libgrpc-1.39.0_6
-libgrpc++_error_details.so.1.39 libgrpc-1.39.0_6
-libgrpc++_reflection.so.1.39 libgrpc-1.39.0_6
-libgrpc++_unsecure.so.1.39 libgrpc-1.39.0_6
-libgrpc.so.18 libgrpc-1.39.0_6
-libgrpc_plugin_support.so.1.39 libgrpc-1.39.0_6
-libgrpc_unsecure.so.18 libgrpc-1.39.0_6
-libgrpcpp_channelz.so.1.39 libgrpc-1.39.0_6
-libupb.so.18 libgrpc-1.39.0_6
+libaddress_sorting.so.27 libgrpc-1.49.1_1
+libgpr.so.27 libgrpc-1.49.1_1
+libgrpc_unsecure.so.27 libgrpc-1.49.1_1
+libupb.so.27 libgrpc-1.49.1_1
+libgrpc++.so.1.49 libgrpc-1.49.1_1
+libgrpc++_alts.so.1.49 libgrpc-1.49.1_1
+libgrpc++_error_details.so.1.49 libgrpc-1.49.1_1
+libgrpc++_reflection.so.1.49 libgrpc-1.49.1_1
+libgrpc++_unsecure.so.1.49 libgrpc-1.49.1_1
+libgrpc.so.18 libgrpc-1.49 libgrpc-1.49.1_1
+libgrpc_plugin_support.so.1.49 libgrpc-1.49.1_1
+libgrpcpp_channelz.so.1.49 libgrpc-1.49.1_1
 libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/patches/absl-is-private.patch b/srcpkgs/grpc/patches/absl-is-private.patch
deleted file mode 100644
index a79277a26806..000000000000
--- a/srcpkgs/grpc/patches/absl-is-private.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- grpc-1.39.1.orig/CMakeLists.txt
-+++ grpc-1.39.1/CMakeLists.txt
-@@ -15856,7 +15865,7 @@ generate_pkgconfig(
-   "gpr"
-   "gRPC platform support library"
-   "${gRPC_CORE_VERSION}"
--  "absl_base absl_memory absl_optional absl_status absl_str_format absl_strings absl_synchronization absl_time"
-+  ""
-   "-lgpr"
-   ""
-   "gpr.pc")
-@@ -15866,7 +15875,7 @@ generate_pkgconfig(
-   "gRPC"
-   "high performance general RPC framework"
-   "${gRPC_CORE_VERSION}"
--  "gpr openssl absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "gpr openssl"
-   "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
-   ""
-   "grpc.pc")
-@@ -15876,7 +15885,7 @@ generate_pkgconfig(
-   "gRPC unsecure"
-   "high performance general RPC framework without SSL"
-   "${gRPC_CORE_VERSION}"
--  "gpr absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "gpr"
-   "-lgrpc_unsecure"
-   ""
-   "grpc_unsecure.pc")
-@@ -15886,7 +15895,7 @@ generate_pkgconfig(
-   "gRPC++"
-   "C++ wrapper for gRPC"
-   "${gRPC_CPP_VERSION}"
--  "grpc absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "grpc"
-   "-lgrpc++"
-   ""
-   "grpc++.pc")
-@@ -15896,7 +15905,7 @@ generate_pkgconfig(
-   "gRPC++ unsecure"
-   "C++ wrapper for gRPC without SSL"
-   "${gRPC_CPP_VERSION}"
--  "grpc_unsecure absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "grpc_unsecure"
-   "-lgrpc++_unsecure"
-   ""
-   "grpc++_unsecure.pc")
---- grpc-1.39.1.orig/cmake/pkg-config-template.pc.in
-+++ grpc-1.39.1/cmake/pkg-config-template.pc.in
-@@ -6,7 +6,7 @@ libdir=${exec_prefix}/lib
- Name: @PC_NAME@
- Description: @PC_DESCRIPTION@
- Version: @PC_VERSION@
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${includedir}/grpc_absl
- Requires: @PC_REQUIRES@
- Libs: -L${libdir} @PC_LIB@
- Libs.private: @PC_LIBS_PRIVATE@
diff --git a/srcpkgs/grpc/patches/google-sucks.patch b/srcpkgs/grpc/patches/google-sucks.patch
deleted file mode 100644
index 0eb8a7c3d36f..000000000000
--- a/srcpkgs/grpc/patches/google-sucks.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-An all-in-one patch that fixes several issues:
-
-1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
-2) powerpc stacktrace implementation only works on glibc (disabled on musl)
-3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
-4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
-
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-@@ -20,7 +20,7 @@
- #include <intrin.h>
- #endif
- 
--#if defined(__powerpc__) || defined(__ppc__)
-+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- #ifdef __GLIBC__
- #include <sys/platform/ppc.h>
- #elif defined(__FreeBSD__)
-@@ -59,7 +59,7 @@
-   return base_internal::NominalCPUFrequency();
- }
- 
--#elif defined(__powerpc__) || defined(__ppc__)
-+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- 
- int64_t UnscaledCycleClock::Now() {
- #ifdef __GLIBC__
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
- 
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--  defined(__powerpc__) || defined(__ppc__) || \
-+  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-   defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
---- a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
-+++ b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
-@@ -63,8 +63,10 @@ void* GetProgramCounter(void* vuc) {
-     return reinterpret_cast<void*>(context->uc_mcontext.pc);
- #elif defined(__powerpc64__)
-     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
--#elif defined(__powerpc__)
-+#elif defined(__powerpc__) && defined(__GLIBC__)
-     return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
-+#elif defined(__powerpc__)
-+    return reinterpret_cast<void*>(context->uc_mcontext.gregs[32]);
- #elif defined(__riscv)
-     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
- #elif defined(__s390__) && !defined(__s390x__)
---- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-+++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-@@ -64,7 +64,7 @@
- #elif defined(__i386__) || defined(__x86_64__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_x86-inl.inc"
--#elif defined(__ppc__) || defined(__PPC__)
-+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
- #elif defined(__aarch64__)
diff --git a/srcpkgs/grpc/patches/private-abseil.patch b/srcpkgs/grpc/patches/private-abseil.patch
deleted file mode 100644
index 4e215820fabb..000000000000
--- a/srcpkgs/grpc/patches/private-abseil.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-gRPC requires abseil, but abseil can be statically linked to avoid installing
-and tracking a ton of extra shared libs. Unfortunately, grpcpp headers now
-include absl headers, so these need to be installed. Put them in a private
-location because the full abseil installation is not provided.
-
-diff -ur third_party/abseil-cpp/CMakeLists.txt third_party/abseil-cpp/CMakeLists.txt
---- a/third_party/abseil-cpp/CMakeLists.txt
-+++ b/third_party/abseil-cpp/CMakeLists.txt
-@@ -46,6 +46,7 @@
- OPTION(BUILD_TESTING "Build tests" OFF)
- 
- project(absl LANGUAGES CXX VERSION 20210324)
-+set(BUILD_SHARED_LIBS OFF)
- include(CTest)
- 
- # Output directory is correct by default for most build setups. However, when
-@@ -57,7 +58,7 @@
- # when absl is included as subproject (i.e. using add_subdirectory(abseil-cpp))
- # in the source tree of a project that uses it, install rules are disabled.
- if(NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
--  option(ABSL_ENABLE_INSTALL "Enable install rule" OFF)
-+  option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
- else()
-   option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
- endif()
-@@ -176,7 +177,7 @@
-   endif()  # absl_VERSION
- 
-   install(DIRECTORY absl
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/grpc_absl
-     FILES_MATCHING
-       PATTERN "*.inc"
-       PATTERN "*.h"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index a1558ee2c796..984797580123 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,25 +1,22 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
-revision=8
-_abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
+version=1.49.1
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
  -DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
  -DgRPC_SSL_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package
- -D_gRPC_RE2_LIBRARIES=-lre2
+ -DgRPC_ABSL_PROVIDER=package -D_gRPC_RE2_LIBRARIES=-lre2
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel abseil-cpp-devel"
 makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
-distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
- https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
- 35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
+distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=5071b630e2a14707ad060636990f1b25b0984bd168c7ea1ab95e48a3bdc0081f
 
 if [ "$CROSS_BUILD" ]; then
 	# need host grpc_cpp_plugin
@@ -31,31 +28,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 
-post_extract() {
-	rm -rf third_party/abseil-cpp
-	mv ../abseil-cpp-${_abseilver} third_party/abseil-cpp
-}
-
-post_patch() {
-	# re2 doesn't install CMake config modules;
-	# key variables are set in configure_args
-	# also install all plugin on cross-compiling
-	vsed -i CMakeLists.txt -e '/include(cmake\/re2\.cmake)/d' \
-		-e 's/gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING/gRPC_INSTALL/'
-}
-
-post_install() {
-	# Remove unnecessary absl static libs, pkg-config and cmake modules
-	rm "${DESTDIR}"/usr/lib/libabsl*.a
-	rm -rf "${DESTDIR}/usr/lib/pkgconfig/"absl_*
-	rm -rf "${DESTDIR}/usr/lib/cmake/absl"
-	
-	# Clean up unneeded absl linker arguments from cmake files
-	sed -e 's/absl::[a-zA-Z_-]*;//g' \
-		-e 's/ "absl::[a-zA-Z_-]*"/ /g' \
-		-i ${DESTDIR}/usr/lib/cmake/grpc/gRPCTargets.cmake
-}
-
 libgrpc_package() {
 	short_desc+=" - libraries"
 	pkg_install() {

From 149f0a4ddba0a2daee7919c8df1b0d9dd175dc42 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:32:09 -0400
Subject: [PATCH 3/6] python3-grpcio: update to 1.49.1.

---
 .../python3-grpcio/patches/abseil-sucks.patch | 49 -------------------
 srcpkgs/python3-grpcio/template               | 10 ++--
 2 files changed, 6 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/python3-grpcio/patches/abseil-sucks.patch

diff --git a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch b/srcpkgs/python3-grpcio/patches/abseil-sucks.patch
deleted file mode 100644
index 4b328a58fd93..000000000000
--- a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-An all-in-one patch that fixes several issues:
-
-1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
-2) powerpc stacktrace implementation only works on glibc (disabled on musl)
-3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
-4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
-
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-@@ -20,7 +20,7 @@
- #include <intrin.h>
- #endif
- 
--#if defined(__powerpc__) || defined(__ppc__)
-+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- #ifdef __GLIBC__
- #include <sys/platform/ppc.h>
- #elif defined(__FreeBSD__)
-@@ -59,7 +59,7 @@
-   return base_internal::NominalCPUFrequency();
- }
- 
--#elif defined(__powerpc__) || defined(__ppc__)
-+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- 
- int64_t UnscaledCycleClock::Now() {
- #ifdef __GLIBC__
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
- 
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--  defined(__powerpc__) || defined(__ppc__) || \
-+  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-   defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
---- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-+++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-@@ -64,7 +64,7 @@
- #elif defined(__i386__) || defined(__x86_64__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_x86-inl.inc"
--#elif defined(__ppc__) || defined(__PPC__)
-+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
- #elif defined(__aarch64__)
diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index aab1ae69886f..b64a3e738a75 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
-version=1.39.0
-revision=2
+version=1.49.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six python3-Cython"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel
+ abseil-cpp-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz"
-checksum=57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407
+checksum=d4725fc9ec8e8822906ae26bb26f5546891aa7fbc3443de970cc556d43a5c99f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -22,6 +23,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
+export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1
 export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
 export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
 export GRPC_PYTHON_BUILD_SYSTEM_RE2=1

From 12875ed4f3b233eff94398c636410f71d4eaa0cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:39:11 -0400
Subject: [PATCH 4/6] python3-grpcio-tools: update to 1.49.1.

---
 srcpkgs/python3-grpcio-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index 19db527a7a2a..c85055f8812a 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grpcio-tools'
 pkgname=python3-grpcio-tools
-version=1.39.0
-revision=2
+version=1.49.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio-tools/grpcio-tools-${version}.tar.gz"
-checksum=39dfe7415bc0d3860fdb8dd90607594b046b88b57dbe64284efa4820f951c805
+checksum=84cc64e5b46bad43d5d7bd2fd772b656eba0366961187a847e908e2cb735db91
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 11a6462cf647ee958638ecebfc4d7131e0848cb3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:13:30 -0400
Subject: [PATCH 5/6] Bear: rebuild for grpc

---
 srcpkgs/Bear/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index c6c1fb6e9c38..2e0914bbe66a 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
 # Template file for 'Bear'
 pkgname=Bear
 version=3.0.20
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config protobuf protobuf-devel grpc"
 makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"

From e6d83df139d4b15f50bc8b3370e3898ae267eaf5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:13:30 -0400
Subject: [PATCH 6/6] sysdig: rebuild for grpc

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index c78089265ee5..968dfb7eae3e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.28.0
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] grpc: update to 1.49.1.
  2022-10-06 14:43 [PR PATCH] grpc: update to 1.49.1 ahesford
@ 2022-10-06 17:42 ` ahesford
  2022-10-06 19:05 ` ahesford
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2022-10-06 17:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ahesford/void-packages google
https://github.com/void-linux/void-packages/pull/39773

grpc: update to 1.49.1.
It's time to bite the bullet and package `abseil-cpp` to avoid duplicating patch work for `grpc` and `python3-grpcio`. Also, `protobuf` is set to depend on abseil in some future release. Only the shared libraries necessary the these dependants are included in `common/shlibs`; we can grow the list as needed.

#### Testing the changes
- I tested the changes in this PR: **briefly**

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

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

From 8c7deca3f5bbf14afcc1a87a9fd91daa1d414225 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 09:54:02 -0400
Subject: [PATCH 1/6] New package: abseil-cpp-20220623.1

---
 common/shlibs                                 | 19 +++++
 srcpkgs/abseil-cpp-devel                      |  1 +
 srcpkgs/abseil-cpp/patches/google-sucks.patch | 77 +++++++++++++++++++
 srcpkgs/abseil-cpp/template                   | 25 ++++++
 4 files changed, 122 insertions(+)
 create mode 120000 srcpkgs/abseil-cpp-devel
 create mode 100644 srcpkgs/abseil-cpp/patches/google-sucks.patch
 create mode 100644 srcpkgs/abseil-cpp/template

diff --git a/common/shlibs b/common/shlibs
index 26410ed4f6fb..df33eb5f7aed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4164,3 +4164,22 @@ libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1
 libtpm2-totp.so.0 libtpm2-totp-0.3.0_1
 libmujs.so.1.2.0 mujs-1.2.0_2
 libiir.so.1 libiir1-1.9.3_1
+libabsl_statusor.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_hash.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_raw_hash_set.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_bad_variant_access.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_status.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_pool_urbg.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen_hwaes_impl.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen_slow.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cord.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_bad_optional_access.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cordz_info.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_str_format_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_synchronization.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_time.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
diff --git a/srcpkgs/abseil-cpp-devel b/srcpkgs/abseil-cpp-devel
new file mode 120000
index 000000000000..21b48b7ea521
--- /dev/null
+++ b/srcpkgs/abseil-cpp-devel
@@ -0,0 +1 @@
+abseil-cpp
\ No newline at end of file
diff --git a/srcpkgs/abseil-cpp/patches/google-sucks.patch b/srcpkgs/abseil-cpp/patches/google-sucks.patch
new file mode 100644
index 000000000000..511bae847101
--- /dev/null
+++ b/srcpkgs/abseil-cpp/patches/google-sucks.patch
@@ -0,0 +1,77 @@
+commit 1fbfea71fb42b2e79f9e342c1843bd26a8703536
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Thu Aug 25 01:20:58 2022 +0200
+
+    An all-in-one patch that fixes several issues:
+    
+    1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
+    2) powerpc stacktrace implementation only works on glibc (disabled on musl)
+    3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
+    4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
+
+diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc
+index b1c396c..d62bfd6 100644
+--- a/absl/base/internal/unscaledcycleclock.cc
++++ b/absl/base/internal/unscaledcycleclock.cc
+@@ -20,7 +20,7 @@
+ #include <intrin.h>
+ #endif
+ 
+-#if defined(__powerpc__) || defined(__ppc__)
++#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
+ #ifdef __GLIBC__
+ #include <sys/platform/ppc.h>
+ #elif defined(__FreeBSD__)
+@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() {
+   return base_internal::NominalCPUFrequency();
+ }
+ 
+-#elif defined(__powerpc__) || defined(__ppc__)
++#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
+ 
+ int64_t UnscaledCycleClock::Now() {
+ #ifdef __GLIBC__
+diff --git a/absl/base/internal/unscaledcycleclock.h b/absl/base/internal/unscaledcycleclock.h
+index 2cbeae3..83d8c98 100644
+--- a/absl/base/internal/unscaledcycleclock.h
++++ b/absl/base/internal/unscaledcycleclock.h
+@@ -46,8 +46,8 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
+-    defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
++    ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
++    defined(__riscv) || defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0
+diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc
+index 5bdd341..a42a3c4 100644
+--- a/absl/debugging/internal/examine_stack.cc
++++ b/absl/debugging/internal/examine_stack.cc
+@@ -174,8 +174,10 @@ void* GetProgramCounter(void* const vuc) {
+     return reinterpret_cast<void*>(context->uc_mcontext.pc);
+ #elif defined(__powerpc64__)
+     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
+-#elif defined(__powerpc__)
++#elif defined(__powerpc__) && defined(__GLIBC__)
+     return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
++#elif defined(__powerpc__)
++    return reinterpret_cast<void*>(context->uc_mcontext.gregs[32]);
+ #elif defined(__riscv)
+     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
+ #elif defined(__s390__) && !defined(__s390x__)
+diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h
+index 3929b1b..23d5e50 100644
+--- a/absl/debugging/internal/stacktrace_config.h
++++ b/absl/debugging/internal/stacktrace_config.h
+@@ -60,7 +60,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
diff --git a/srcpkgs/abseil-cpp/template b/srcpkgs/abseil-cpp/template
new file mode 100644
index 000000000000..8640d2489406
--- /dev/null
+++ b/srcpkgs/abseil-cpp/template
@@ -0,0 +1,25 @@
+# Template file for 'abseil-cpp'
+pkgname=abseil-cpp
+version=20220623.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON -DABSL_PROPAGATE_CXX_STD=ON"
+hostmakedepends="pkg-config"
+short_desc="Abseil common libraries"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0"
+homepage="https://abseil.io"
+distfiles="https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz"
+checksum=91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8
+
+abseil-cpp-devel_package() {
+	short_desc+=" (development files)"
+	depends="${sourcepkg}>=${version}_${revision}"
+
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 00c2a987bd0f8ec37fbd3fc6b3a41475fdcae8fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:08:35 -0400
Subject: [PATCH 2/6] grpc: update to 1.49.1.

---
 common/shlibs                              | 24 ++++-----
 srcpkgs/grpc/patches/absl-is-private.patch | 58 --------------------
 srcpkgs/grpc/patches/google-sucks.patch    | 63 ----------------------
 srcpkgs/grpc/patches/private-abseil.patch  | 34 ------------
 srcpkgs/grpc/template                      | 40 +++-----------
 5 files changed, 18 insertions(+), 201 deletions(-)
 delete mode 100644 srcpkgs/grpc/patches/absl-is-private.patch
 delete mode 100644 srcpkgs/grpc/patches/google-sucks.patch
 delete mode 100644 srcpkgs/grpc/patches/private-abseil.patch

diff --git a/common/shlibs b/common/shlibs
index df33eb5f7aed..c61f25fbb127 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3641,18 +3641,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.18 libgrpc-1.39.0_6
-libgpr.so.18 libgrpc-1.39.0_6
-libgrpc++.so.1.39 libgrpc-1.39.0_6
-libgrpc++_alts.so.1.39 libgrpc-1.39.0_6
-libgrpc++_error_details.so.1.39 libgrpc-1.39.0_6
-libgrpc++_reflection.so.1.39 libgrpc-1.39.0_6
-libgrpc++_unsecure.so.1.39 libgrpc-1.39.0_6
-libgrpc.so.18 libgrpc-1.39.0_6
-libgrpc_plugin_support.so.1.39 libgrpc-1.39.0_6
-libgrpc_unsecure.so.18 libgrpc-1.39.0_6
-libgrpcpp_channelz.so.1.39 libgrpc-1.39.0_6
-libupb.so.18 libgrpc-1.39.0_6
+libaddress_sorting.so.27 libgrpc-1.49.1_1
+libgpr.so.27 libgrpc-1.49.1_1
+libgrpc_unsecure.so.27 libgrpc-1.49.1_1
+libupb.so.27 libgrpc-1.49.1_1
+libgrpc++.so.1.49 libgrpc-1.49.1_1
+libgrpc++_alts.so.1.49 libgrpc-1.49.1_1
+libgrpc++_error_details.so.1.49 libgrpc-1.49.1_1
+libgrpc++_reflection.so.1.49 libgrpc-1.49.1_1
+libgrpc++_unsecure.so.1.49 libgrpc-1.49.1_1
+libgrpc.so.18 libgrpc-1.49 libgrpc-1.49.1_1
+libgrpc_plugin_support.so.1.49 libgrpc-1.49.1_1
+libgrpcpp_channelz.so.1.49 libgrpc-1.49.1_1
 libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/patches/absl-is-private.patch b/srcpkgs/grpc/patches/absl-is-private.patch
deleted file mode 100644
index a79277a26806..000000000000
--- a/srcpkgs/grpc/patches/absl-is-private.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- grpc-1.39.1.orig/CMakeLists.txt
-+++ grpc-1.39.1/CMakeLists.txt
-@@ -15856,7 +15865,7 @@ generate_pkgconfig(
-   "gpr"
-   "gRPC platform support library"
-   "${gRPC_CORE_VERSION}"
--  "absl_base absl_memory absl_optional absl_status absl_str_format absl_strings absl_synchronization absl_time"
-+  ""
-   "-lgpr"
-   ""
-   "gpr.pc")
-@@ -15866,7 +15875,7 @@ generate_pkgconfig(
-   "gRPC"
-   "high performance general RPC framework"
-   "${gRPC_CORE_VERSION}"
--  "gpr openssl absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "gpr openssl"
-   "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
-   ""
-   "grpc.pc")
-@@ -15876,7 +15885,7 @@ generate_pkgconfig(
-   "gRPC unsecure"
-   "high performance general RPC framework without SSL"
-   "${gRPC_CORE_VERSION}"
--  "gpr absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "gpr"
-   "-lgrpc_unsecure"
-   ""
-   "grpc_unsecure.pc")
-@@ -15886,7 +15895,7 @@ generate_pkgconfig(
-   "gRPC++"
-   "C++ wrapper for gRPC"
-   "${gRPC_CPP_VERSION}"
--  "grpc absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "grpc"
-   "-lgrpc++"
-   ""
-   "grpc++.pc")
-@@ -15896,7 +15905,7 @@ generate_pkgconfig(
-   "gRPC++ unsecure"
-   "C++ wrapper for gRPC without SSL"
-   "${gRPC_CPP_VERSION}"
--  "grpc_unsecure absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "grpc_unsecure"
-   "-lgrpc++_unsecure"
-   ""
-   "grpc++_unsecure.pc")
---- grpc-1.39.1.orig/cmake/pkg-config-template.pc.in
-+++ grpc-1.39.1/cmake/pkg-config-template.pc.in
-@@ -6,7 +6,7 @@ libdir=${exec_prefix}/lib
- Name: @PC_NAME@
- Description: @PC_DESCRIPTION@
- Version: @PC_VERSION@
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${includedir}/grpc_absl
- Requires: @PC_REQUIRES@
- Libs: -L${libdir} @PC_LIB@
- Libs.private: @PC_LIBS_PRIVATE@
diff --git a/srcpkgs/grpc/patches/google-sucks.patch b/srcpkgs/grpc/patches/google-sucks.patch
deleted file mode 100644
index 0eb8a7c3d36f..000000000000
--- a/srcpkgs/grpc/patches/google-sucks.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-An all-in-one patch that fixes several issues:
-
-1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
-2) powerpc stacktrace implementation only works on glibc (disabled on musl)
-3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
-4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
-
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-@@ -20,7 +20,7 @@
- #include <intrin.h>
- #endif
- 
--#if defined(__powerpc__) || defined(__ppc__)
-+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- #ifdef __GLIBC__
- #include <sys/platform/ppc.h>
- #elif defined(__FreeBSD__)
-@@ -59,7 +59,7 @@
-   return base_internal::NominalCPUFrequency();
- }
- 
--#elif defined(__powerpc__) || defined(__ppc__)
-+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- 
- int64_t UnscaledCycleClock::Now() {
- #ifdef __GLIBC__
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
- 
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--  defined(__powerpc__) || defined(__ppc__) || \
-+  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-   defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
---- a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
-+++ b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
-@@ -63,8 +63,10 @@ void* GetProgramCounter(void* vuc) {
-     return reinterpret_cast<void*>(context->uc_mcontext.pc);
- #elif defined(__powerpc64__)
-     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
--#elif defined(__powerpc__)
-+#elif defined(__powerpc__) && defined(__GLIBC__)
-     return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
-+#elif defined(__powerpc__)
-+    return reinterpret_cast<void*>(context->uc_mcontext.gregs[32]);
- #elif defined(__riscv)
-     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
- #elif defined(__s390__) && !defined(__s390x__)
---- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-+++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-@@ -64,7 +64,7 @@
- #elif defined(__i386__) || defined(__x86_64__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_x86-inl.inc"
--#elif defined(__ppc__) || defined(__PPC__)
-+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
- #elif defined(__aarch64__)
diff --git a/srcpkgs/grpc/patches/private-abseil.patch b/srcpkgs/grpc/patches/private-abseil.patch
deleted file mode 100644
index 4e215820fabb..000000000000
--- a/srcpkgs/grpc/patches/private-abseil.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-gRPC requires abseil, but abseil can be statically linked to avoid installing
-and tracking a ton of extra shared libs. Unfortunately, grpcpp headers now
-include absl headers, so these need to be installed. Put them in a private
-location because the full abseil installation is not provided.
-
-diff -ur third_party/abseil-cpp/CMakeLists.txt third_party/abseil-cpp/CMakeLists.txt
---- a/third_party/abseil-cpp/CMakeLists.txt
-+++ b/third_party/abseil-cpp/CMakeLists.txt
-@@ -46,6 +46,7 @@
- OPTION(BUILD_TESTING "Build tests" OFF)
- 
- project(absl LANGUAGES CXX VERSION 20210324)
-+set(BUILD_SHARED_LIBS OFF)
- include(CTest)
- 
- # Output directory is correct by default for most build setups. However, when
-@@ -57,7 +58,7 @@
- # when absl is included as subproject (i.e. using add_subdirectory(abseil-cpp))
- # in the source tree of a project that uses it, install rules are disabled.
- if(NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
--  option(ABSL_ENABLE_INSTALL "Enable install rule" OFF)
-+  option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
- else()
-   option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
- endif()
-@@ -176,7 +177,7 @@
-   endif()  # absl_VERSION
- 
-   install(DIRECTORY absl
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/grpc_absl
-     FILES_MATCHING
-       PATTERN "*.inc"
-       PATTERN "*.h"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index a1558ee2c796..984797580123 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,25 +1,22 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
-revision=8
-_abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
+version=1.49.1
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
  -DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
  -DgRPC_SSL_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package
- -D_gRPC_RE2_LIBRARIES=-lre2
+ -DgRPC_ABSL_PROVIDER=package -D_gRPC_RE2_LIBRARIES=-lre2
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel abseil-cpp-devel"
 makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
-distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
- https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
- 35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
+distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=5071b630e2a14707ad060636990f1b25b0984bd168c7ea1ab95e48a3bdc0081f
 
 if [ "$CROSS_BUILD" ]; then
 	# need host grpc_cpp_plugin
@@ -31,31 +28,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 
-post_extract() {
-	rm -rf third_party/abseil-cpp
-	mv ../abseil-cpp-${_abseilver} third_party/abseil-cpp
-}
-
-post_patch() {
-	# re2 doesn't install CMake config modules;
-	# key variables are set in configure_args
-	# also install all plugin on cross-compiling
-	vsed -i CMakeLists.txt -e '/include(cmake\/re2\.cmake)/d' \
-		-e 's/gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING/gRPC_INSTALL/'
-}
-
-post_install() {
-	# Remove unnecessary absl static libs, pkg-config and cmake modules
-	rm "${DESTDIR}"/usr/lib/libabsl*.a
-	rm -rf "${DESTDIR}/usr/lib/pkgconfig/"absl_*
-	rm -rf "${DESTDIR}/usr/lib/cmake/absl"
-	
-	# Clean up unneeded absl linker arguments from cmake files
-	sed -e 's/absl::[a-zA-Z_-]*;//g' \
-		-e 's/ "absl::[a-zA-Z_-]*"/ /g' \
-		-i ${DESTDIR}/usr/lib/cmake/grpc/gRPCTargets.cmake
-}
-
 libgrpc_package() {
 	short_desc+=" - libraries"
 	pkg_install() {

From 36795b4ebecd934f42750988406b8a14b3809f69 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:32:09 -0400
Subject: [PATCH 3/6] python3-grpcio: update to 1.49.1.

---
 .../python3-grpcio/patches/abseil-sucks.patch | 49 -------------------
 srcpkgs/python3-grpcio/template               | 10 ++--
 2 files changed, 6 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/python3-grpcio/patches/abseil-sucks.patch

diff --git a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch b/srcpkgs/python3-grpcio/patches/abseil-sucks.patch
deleted file mode 100644
index 4b328a58fd93..000000000000
--- a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-An all-in-one patch that fixes several issues:
-
-1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
-2) powerpc stacktrace implementation only works on glibc (disabled on musl)
-3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
-4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
-
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-@@ -20,7 +20,7 @@
- #include <intrin.h>
- #endif
- 
--#if defined(__powerpc__) || defined(__ppc__)
-+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- #ifdef __GLIBC__
- #include <sys/platform/ppc.h>
- #elif defined(__FreeBSD__)
-@@ -59,7 +59,7 @@
-   return base_internal::NominalCPUFrequency();
- }
- 
--#elif defined(__powerpc__) || defined(__ppc__)
-+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- 
- int64_t UnscaledCycleClock::Now() {
- #ifdef __GLIBC__
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
- 
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--  defined(__powerpc__) || defined(__ppc__) || \
-+  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-   defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
---- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-+++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-@@ -64,7 +64,7 @@
- #elif defined(__i386__) || defined(__x86_64__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_x86-inl.inc"
--#elif defined(__ppc__) || defined(__PPC__)
-+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
- #elif defined(__aarch64__)
diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index aab1ae69886f..b64a3e738a75 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
-version=1.39.0
-revision=2
+version=1.49.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six python3-Cython"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel
+ abseil-cpp-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz"
-checksum=57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407
+checksum=d4725fc9ec8e8822906ae26bb26f5546891aa7fbc3443de970cc556d43a5c99f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -22,6 +23,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
+export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1
 export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
 export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
 export GRPC_PYTHON_BUILD_SYSTEM_RE2=1

From 4217c5ae9fdf9de56f7e27a0f0cfef2757922459 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:39:11 -0400
Subject: [PATCH 4/6] python3-grpcio-tools: update to 1.49.1.

---
 srcpkgs/python3-grpcio-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index 19db527a7a2a..c85055f8812a 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grpcio-tools'
 pkgname=python3-grpcio-tools
-version=1.39.0
-revision=2
+version=1.49.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio-tools/grpcio-tools-${version}.tar.gz"
-checksum=39dfe7415bc0d3860fdb8dd90607594b046b88b57dbe64284efa4820f951c805
+checksum=84cc64e5b46bad43d5d7bd2fd772b656eba0366961187a847e908e2cb735db91
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 13c0bdaa22daaeffaadaa170ccb39d313663c49e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:13:30 -0400
Subject: [PATCH 5/6] Bear: rebuild for grpc

---
 srcpkgs/Bear/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index c6c1fb6e9c38..2e0914bbe66a 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
 # Template file for 'Bear'
 pkgname=Bear
 version=3.0.20
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config protobuf protobuf-devel grpc"
 makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"

From a3e0ee9fb9a84f92043dbc91b333b9e19a293364 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:13:30 -0400
Subject: [PATCH 6/6] sysdig: rebuild for grpc

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index c78089265ee5..968dfb7eae3e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.28.0
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] grpc: update to 1.49.1.
  2022-10-06 14:43 [PR PATCH] grpc: update to 1.49.1 ahesford
  2022-10-06 17:42 ` [PR PATCH] [Updated] " ahesford
@ 2022-10-06 19:05 ` ahesford
  2022-10-06 19:41 ` ahesford
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2022-10-06 19:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ahesford/void-packages google
https://github.com/void-linux/void-packages/pull/39773

grpc: update to 1.49.1.
It's time to bite the bullet and package `abseil-cpp` to avoid duplicating patch work for `grpc` and `python3-grpcio`. Also, `protobuf` is set to depend on abseil in some future release. Only the shared libraries necessary the these dependants are included in `common/shlibs`; we can grow the list as needed.

#### Testing the changes
- I tested the changes in this PR: **briefly**

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

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

From 1c111e0c76098a67f4f603db5e7409c8aefb9c1c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 09:54:02 -0400
Subject: [PATCH 1/6] New package: abseil-cpp-20220623.1

---
 common/shlibs                                 | 20 +++++
 srcpkgs/abseil-cpp-devel                      |  1 +
 srcpkgs/abseil-cpp/patches/google-sucks.patch | 77 +++++++++++++++++++
 srcpkgs/abseil-cpp/template                   | 25 ++++++
 4 files changed, 123 insertions(+)
 create mode 120000 srcpkgs/abseil-cpp-devel
 create mode 100644 srcpkgs/abseil-cpp/patches/google-sucks.patch
 create mode 100644 srcpkgs/abseil-cpp/template

diff --git a/common/shlibs b/common/shlibs
index 26410ed4f6fb..af64d3327089 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4164,3 +4164,23 @@ libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1
 libtpm2-totp.so.0 libtpm2-totp-0.3.0_1
 libmujs.so.1.2.0 mujs-1.2.0_2
 libiir.so.1 libiir1-1.9.3_1
+libabsl_statusor.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_hash.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_raw_hash_set.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_bad_variant_access.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_status.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_pool_urbg.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen_hwaes_impl.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen_slow.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cord.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_city.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_bad_optional_access.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cordz_info.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_str_format_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_synchronization.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_time.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
diff --git a/srcpkgs/abseil-cpp-devel b/srcpkgs/abseil-cpp-devel
new file mode 120000
index 000000000000..21b48b7ea521
--- /dev/null
+++ b/srcpkgs/abseil-cpp-devel
@@ -0,0 +1 @@
+abseil-cpp
\ No newline at end of file
diff --git a/srcpkgs/abseil-cpp/patches/google-sucks.patch b/srcpkgs/abseil-cpp/patches/google-sucks.patch
new file mode 100644
index 000000000000..511bae847101
--- /dev/null
+++ b/srcpkgs/abseil-cpp/patches/google-sucks.patch
@@ -0,0 +1,77 @@
+commit 1fbfea71fb42b2e79f9e342c1843bd26a8703536
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Thu Aug 25 01:20:58 2022 +0200
+
+    An all-in-one patch that fixes several issues:
+    
+    1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
+    2) powerpc stacktrace implementation only works on glibc (disabled on musl)
+    3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
+    4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
+
+diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc
+index b1c396c..d62bfd6 100644
+--- a/absl/base/internal/unscaledcycleclock.cc
++++ b/absl/base/internal/unscaledcycleclock.cc
+@@ -20,7 +20,7 @@
+ #include <intrin.h>
+ #endif
+ 
+-#if defined(__powerpc__) || defined(__ppc__)
++#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
+ #ifdef __GLIBC__
+ #include <sys/platform/ppc.h>
+ #elif defined(__FreeBSD__)
+@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() {
+   return base_internal::NominalCPUFrequency();
+ }
+ 
+-#elif defined(__powerpc__) || defined(__ppc__)
++#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
+ 
+ int64_t UnscaledCycleClock::Now() {
+ #ifdef __GLIBC__
+diff --git a/absl/base/internal/unscaledcycleclock.h b/absl/base/internal/unscaledcycleclock.h
+index 2cbeae3..83d8c98 100644
+--- a/absl/base/internal/unscaledcycleclock.h
++++ b/absl/base/internal/unscaledcycleclock.h
+@@ -46,8 +46,8 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
+-    defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
++    ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
++    defined(__riscv) || defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0
+diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc
+index 5bdd341..a42a3c4 100644
+--- a/absl/debugging/internal/examine_stack.cc
++++ b/absl/debugging/internal/examine_stack.cc
+@@ -174,8 +174,10 @@ void* GetProgramCounter(void* const vuc) {
+     return reinterpret_cast<void*>(context->uc_mcontext.pc);
+ #elif defined(__powerpc64__)
+     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
+-#elif defined(__powerpc__)
++#elif defined(__powerpc__) && defined(__GLIBC__)
+     return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
++#elif defined(__powerpc__)
++    return reinterpret_cast<void*>(context->uc_mcontext.gregs[32]);
+ #elif defined(__riscv)
+     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
+ #elif defined(__s390__) && !defined(__s390x__)
+diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h
+index 3929b1b..23d5e50 100644
+--- a/absl/debugging/internal/stacktrace_config.h
++++ b/absl/debugging/internal/stacktrace_config.h
+@@ -60,7 +60,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
diff --git a/srcpkgs/abseil-cpp/template b/srcpkgs/abseil-cpp/template
new file mode 100644
index 000000000000..8640d2489406
--- /dev/null
+++ b/srcpkgs/abseil-cpp/template
@@ -0,0 +1,25 @@
+# Template file for 'abseil-cpp'
+pkgname=abseil-cpp
+version=20220623.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON -DABSL_PROPAGATE_CXX_STD=ON"
+hostmakedepends="pkg-config"
+short_desc="Abseil common libraries"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0"
+homepage="https://abseil.io"
+distfiles="https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz"
+checksum=91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8
+
+abseil-cpp-devel_package() {
+	short_desc+=" (development files)"
+	depends="${sourcepkg}>=${version}_${revision}"
+
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 9fe21bd8a614583f4fbf899d1f4a639257a0b74d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:08:35 -0400
Subject: [PATCH 2/6] grpc: update to 1.49.1.

---
 common/shlibs                              | 24 ++++-----
 srcpkgs/grpc/patches/absl-is-private.patch | 58 --------------------
 srcpkgs/grpc/patches/google-sucks.patch    | 63 ----------------------
 srcpkgs/grpc/patches/private-abseil.patch  | 34 ------------
 srcpkgs/grpc/template                      | 40 +++-----------
 5 files changed, 18 insertions(+), 201 deletions(-)
 delete mode 100644 srcpkgs/grpc/patches/absl-is-private.patch
 delete mode 100644 srcpkgs/grpc/patches/google-sucks.patch
 delete mode 100644 srcpkgs/grpc/patches/private-abseil.patch

diff --git a/common/shlibs b/common/shlibs
index af64d3327089..2b8c9b57cd69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3641,18 +3641,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.18 libgrpc-1.39.0_6
-libgpr.so.18 libgrpc-1.39.0_6
-libgrpc++.so.1.39 libgrpc-1.39.0_6
-libgrpc++_alts.so.1.39 libgrpc-1.39.0_6
-libgrpc++_error_details.so.1.39 libgrpc-1.39.0_6
-libgrpc++_reflection.so.1.39 libgrpc-1.39.0_6
-libgrpc++_unsecure.so.1.39 libgrpc-1.39.0_6
-libgrpc.so.18 libgrpc-1.39.0_6
-libgrpc_plugin_support.so.1.39 libgrpc-1.39.0_6
-libgrpc_unsecure.so.18 libgrpc-1.39.0_6
-libgrpcpp_channelz.so.1.39 libgrpc-1.39.0_6
-libupb.so.18 libgrpc-1.39.0_6
+libaddress_sorting.so.27 libgrpc-1.49.1_1
+libgpr.so.27 libgrpc-1.49.1_1
+libgrpc_unsecure.so.27 libgrpc-1.49.1_1
+libupb.so.27 libgrpc-1.49.1_1
+libgrpc++.so.1.49 libgrpc-1.49.1_1
+libgrpc++_alts.so.1.49 libgrpc-1.49.1_1
+libgrpc++_error_details.so.1.49 libgrpc-1.49.1_1
+libgrpc++_reflection.so.1.49 libgrpc-1.49.1_1
+libgrpc++_unsecure.so.1.49 libgrpc-1.49.1_1
+libgrpc.so.18 libgrpc-1.49 libgrpc-1.49.1_1
+libgrpc_plugin_support.so.1.49 libgrpc-1.49.1_1
+libgrpcpp_channelz.so.1.49 libgrpc-1.49.1_1
 libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/patches/absl-is-private.patch b/srcpkgs/grpc/patches/absl-is-private.patch
deleted file mode 100644
index a79277a26806..000000000000
--- a/srcpkgs/grpc/patches/absl-is-private.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- grpc-1.39.1.orig/CMakeLists.txt
-+++ grpc-1.39.1/CMakeLists.txt
-@@ -15856,7 +15865,7 @@ generate_pkgconfig(
-   "gpr"
-   "gRPC platform support library"
-   "${gRPC_CORE_VERSION}"
--  "absl_base absl_memory absl_optional absl_status absl_str_format absl_strings absl_synchronization absl_time"
-+  ""
-   "-lgpr"
-   ""
-   "gpr.pc")
-@@ -15866,7 +15875,7 @@ generate_pkgconfig(
-   "gRPC"
-   "high performance general RPC framework"
-   "${gRPC_CORE_VERSION}"
--  "gpr openssl absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "gpr openssl"
-   "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
-   ""
-   "grpc.pc")
-@@ -15876,7 +15885,7 @@ generate_pkgconfig(
-   "gRPC unsecure"
-   "high performance general RPC framework without SSL"
-   "${gRPC_CORE_VERSION}"
--  "gpr absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "gpr"
-   "-lgrpc_unsecure"
-   ""
-   "grpc_unsecure.pc")
-@@ -15886,7 +15895,7 @@ generate_pkgconfig(
-   "gRPC++"
-   "C++ wrapper for gRPC"
-   "${gRPC_CPP_VERSION}"
--  "grpc absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "grpc"
-   "-lgrpc++"
-   ""
-   "grpc++.pc")
-@@ -15896,7 +15905,7 @@ generate_pkgconfig(
-   "gRPC++ unsecure"
-   "C++ wrapper for gRPC without SSL"
-   "${gRPC_CPP_VERSION}"
--  "grpc_unsecure absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "grpc_unsecure"
-   "-lgrpc++_unsecure"
-   ""
-   "grpc++_unsecure.pc")
---- grpc-1.39.1.orig/cmake/pkg-config-template.pc.in
-+++ grpc-1.39.1/cmake/pkg-config-template.pc.in
-@@ -6,7 +6,7 @@ libdir=${exec_prefix}/lib
- Name: @PC_NAME@
- Description: @PC_DESCRIPTION@
- Version: @PC_VERSION@
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${includedir}/grpc_absl
- Requires: @PC_REQUIRES@
- Libs: -L${libdir} @PC_LIB@
- Libs.private: @PC_LIBS_PRIVATE@
diff --git a/srcpkgs/grpc/patches/google-sucks.patch b/srcpkgs/grpc/patches/google-sucks.patch
deleted file mode 100644
index 0eb8a7c3d36f..000000000000
--- a/srcpkgs/grpc/patches/google-sucks.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-An all-in-one patch that fixes several issues:
-
-1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
-2) powerpc stacktrace implementation only works on glibc (disabled on musl)
-3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
-4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
-
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-@@ -20,7 +20,7 @@
- #include <intrin.h>
- #endif
- 
--#if defined(__powerpc__) || defined(__ppc__)
-+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- #ifdef __GLIBC__
- #include <sys/platform/ppc.h>
- #elif defined(__FreeBSD__)
-@@ -59,7 +59,7 @@
-   return base_internal::NominalCPUFrequency();
- }
- 
--#elif defined(__powerpc__) || defined(__ppc__)
-+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- 
- int64_t UnscaledCycleClock::Now() {
- #ifdef __GLIBC__
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
- 
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--  defined(__powerpc__) || defined(__ppc__) || \
-+  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-   defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
---- a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
-+++ b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
-@@ -63,8 +63,10 @@ void* GetProgramCounter(void* vuc) {
-     return reinterpret_cast<void*>(context->uc_mcontext.pc);
- #elif defined(__powerpc64__)
-     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
--#elif defined(__powerpc__)
-+#elif defined(__powerpc__) && defined(__GLIBC__)
-     return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
-+#elif defined(__powerpc__)
-+    return reinterpret_cast<void*>(context->uc_mcontext.gregs[32]);
- #elif defined(__riscv)
-     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
- #elif defined(__s390__) && !defined(__s390x__)
---- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-+++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-@@ -64,7 +64,7 @@
- #elif defined(__i386__) || defined(__x86_64__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_x86-inl.inc"
--#elif defined(__ppc__) || defined(__PPC__)
-+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
- #elif defined(__aarch64__)
diff --git a/srcpkgs/grpc/patches/private-abseil.patch b/srcpkgs/grpc/patches/private-abseil.patch
deleted file mode 100644
index 4e215820fabb..000000000000
--- a/srcpkgs/grpc/patches/private-abseil.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-gRPC requires abseil, but abseil can be statically linked to avoid installing
-and tracking a ton of extra shared libs. Unfortunately, grpcpp headers now
-include absl headers, so these need to be installed. Put them in a private
-location because the full abseil installation is not provided.
-
-diff -ur third_party/abseil-cpp/CMakeLists.txt third_party/abseil-cpp/CMakeLists.txt
---- a/third_party/abseil-cpp/CMakeLists.txt
-+++ b/third_party/abseil-cpp/CMakeLists.txt
-@@ -46,6 +46,7 @@
- OPTION(BUILD_TESTING "Build tests" OFF)
- 
- project(absl LANGUAGES CXX VERSION 20210324)
-+set(BUILD_SHARED_LIBS OFF)
- include(CTest)
- 
- # Output directory is correct by default for most build setups. However, when
-@@ -57,7 +58,7 @@
- # when absl is included as subproject (i.e. using add_subdirectory(abseil-cpp))
- # in the source tree of a project that uses it, install rules are disabled.
- if(NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
--  option(ABSL_ENABLE_INSTALL "Enable install rule" OFF)
-+  option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
- else()
-   option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
- endif()
-@@ -176,7 +177,7 @@
-   endif()  # absl_VERSION
- 
-   install(DIRECTORY absl
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/grpc_absl
-     FILES_MATCHING
-       PATTERN "*.inc"
-       PATTERN "*.h"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index a1558ee2c796..984797580123 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,25 +1,22 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
-revision=8
-_abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
+version=1.49.1
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
  -DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
  -DgRPC_SSL_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package
- -D_gRPC_RE2_LIBRARIES=-lre2
+ -DgRPC_ABSL_PROVIDER=package -D_gRPC_RE2_LIBRARIES=-lre2
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel abseil-cpp-devel"
 makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
-distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
- https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
- 35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
+distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=5071b630e2a14707ad060636990f1b25b0984bd168c7ea1ab95e48a3bdc0081f
 
 if [ "$CROSS_BUILD" ]; then
 	# need host grpc_cpp_plugin
@@ -31,31 +28,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 
-post_extract() {
-	rm -rf third_party/abseil-cpp
-	mv ../abseil-cpp-${_abseilver} third_party/abseil-cpp
-}
-
-post_patch() {
-	# re2 doesn't install CMake config modules;
-	# key variables are set in configure_args
-	# also install all plugin on cross-compiling
-	vsed -i CMakeLists.txt -e '/include(cmake\/re2\.cmake)/d' \
-		-e 's/gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING/gRPC_INSTALL/'
-}
-
-post_install() {
-	# Remove unnecessary absl static libs, pkg-config and cmake modules
-	rm "${DESTDIR}"/usr/lib/libabsl*.a
-	rm -rf "${DESTDIR}/usr/lib/pkgconfig/"absl_*
-	rm -rf "${DESTDIR}/usr/lib/cmake/absl"
-	
-	# Clean up unneeded absl linker arguments from cmake files
-	sed -e 's/absl::[a-zA-Z_-]*;//g' \
-		-e 's/ "absl::[a-zA-Z_-]*"/ /g' \
-		-i ${DESTDIR}/usr/lib/cmake/grpc/gRPCTargets.cmake
-}
-
 libgrpc_package() {
 	short_desc+=" - libraries"
 	pkg_install() {

From 9bc24e6b9db320049e24bba595a46870a5e3ba9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:32:09 -0400
Subject: [PATCH 3/6] python3-grpcio: update to 1.49.1.

---
 .../python3-grpcio/patches/abseil-sucks.patch | 49 -------------------
 srcpkgs/python3-grpcio/template               | 20 +++-----
 2 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/python3-grpcio/patches/abseil-sucks.patch

diff --git a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch b/srcpkgs/python3-grpcio/patches/abseil-sucks.patch
deleted file mode 100644
index 4b328a58fd93..000000000000
--- a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-An all-in-one patch that fixes several issues:
-
-1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
-2) powerpc stacktrace implementation only works on glibc (disabled on musl)
-3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
-4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
-
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-@@ -20,7 +20,7 @@
- #include <intrin.h>
- #endif
- 
--#if defined(__powerpc__) || defined(__ppc__)
-+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- #ifdef __GLIBC__
- #include <sys/platform/ppc.h>
- #elif defined(__FreeBSD__)
-@@ -59,7 +59,7 @@
-   return base_internal::NominalCPUFrequency();
- }
- 
--#elif defined(__powerpc__) || defined(__ppc__)
-+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- 
- int64_t UnscaledCycleClock::Now() {
- #ifdef __GLIBC__
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
- 
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--  defined(__powerpc__) || defined(__ppc__) || \
-+  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-   defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
---- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-+++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-@@ -64,7 +64,7 @@
- #elif defined(__i386__) || defined(__x86_64__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_x86-inl.inc"
--#elif defined(__ppc__) || defined(__PPC__)
-+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
- #elif defined(__aarch64__)
diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index aab1ae69886f..10779ba330ca 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
-version=1.39.0
-revision=2
+version=1.49.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six python3-Cython"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel
+ abseil-cpp-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz"
-checksum=57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407
+checksum=d4725fc9ec8e8822906ae26bb26f5546891aa7fbc3443de970cc556d43a5c99f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -22,17 +23,12 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
+export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1
 export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
 export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
 export GRPC_PYTHON_BUILD_SYSTEM_RE2=1
 export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
 
-post_patch() {
-	if [ "${CROSS_BUILD}" ]; then
-		vsed -i setup.py -e "s@['\"]cc['\"]@'${CC}'@g" \
-			-e "/os.path.join/s@/usr@${XBPS_CROSS_BASE}/usr@g"
-		vsed -e "s@['\"]cc['\"]@'${CC}'@g" \
-			-i src/python/grpcio/commands.py
-	fi
-	rm -f src/python/grpcio/grpc/_cython/cygrpc.cpp
+post_extract() {
+	rm src/python/grpcio/grpc/_cython/cygrpc.cpp
 }

From 637c3eb9d94fd4a0bb74619203a6049b5637d645 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:39:11 -0400
Subject: [PATCH 4/6] python3-grpcio-tools: update to 1.49.1.

---
 srcpkgs/python3-grpcio-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index 19db527a7a2a..c85055f8812a 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grpcio-tools'
 pkgname=python3-grpcio-tools
-version=1.39.0
-revision=2
+version=1.49.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio-tools/grpcio-tools-${version}.tar.gz"
-checksum=39dfe7415bc0d3860fdb8dd90607594b046b88b57dbe64284efa4820f951c805
+checksum=84cc64e5b46bad43d5d7bd2fd772b656eba0366961187a847e908e2cb735db91
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From e9936a4395d541d3233961c6bc977bffb9be2565 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:13:30 -0400
Subject: [PATCH 5/6] Bear: rebuild for grpc

---
 srcpkgs/Bear/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index c6c1fb6e9c38..2e0914bbe66a 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
 # Template file for 'Bear'
 pkgname=Bear
 version=3.0.20
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config protobuf protobuf-devel grpc"
 makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"

From f0c5828ae9aa8cc54545139a698166c9f94d0569 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:13:30 -0400
Subject: [PATCH 6/6] sysdig: rebuild for grpc

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index c78089265ee5..968dfb7eae3e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.28.0
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] grpc: update to 1.49.1.
  2022-10-06 14:43 [PR PATCH] grpc: update to 1.49.1 ahesford
  2022-10-06 17:42 ` [PR PATCH] [Updated] " ahesford
  2022-10-06 19:05 ` ahesford
@ 2022-10-06 19:41 ` ahesford
  2022-10-07 16:26 ` ahesford
  2022-10-07 16:26 ` [PR PATCH] [Closed]: " ahesford
  4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2022-10-06 19:41 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ahesford/void-packages google
https://github.com/void-linux/void-packages/pull/39773

grpc: update to 1.49.1.
It's time to bite the bullet and package `abseil-cpp` to avoid duplicating patch work for `grpc` and `python3-grpcio`. Also, `protobuf` is set to depend on abseil in some future release. Only the shared libraries necessary the these dependants are included in `common/shlibs`; we can grow the list as needed.

#### Testing the changes
- I tested the changes in this PR: **briefly**

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

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

From 1c111e0c76098a67f4f603db5e7409c8aefb9c1c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 09:54:02 -0400
Subject: [PATCH 1/6] New package: abseil-cpp-20220623.1

---
 common/shlibs                                 | 20 +++++
 srcpkgs/abseil-cpp-devel                      |  1 +
 srcpkgs/abseil-cpp/patches/google-sucks.patch | 77 +++++++++++++++++++
 srcpkgs/abseil-cpp/template                   | 25 ++++++
 4 files changed, 123 insertions(+)
 create mode 120000 srcpkgs/abseil-cpp-devel
 create mode 100644 srcpkgs/abseil-cpp/patches/google-sucks.patch
 create mode 100644 srcpkgs/abseil-cpp/template

diff --git a/common/shlibs b/common/shlibs
index 26410ed4f6fb..af64d3327089 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4164,3 +4164,23 @@ libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1
 libtpm2-totp.so.0 libtpm2-totp-0.3.0_1
 libmujs.so.1.2.0 mujs-1.2.0_2
 libiir.so.1 libiir1-1.9.3_1
+libabsl_statusor.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_hash.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_raw_hash_set.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_bad_variant_access.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_status.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_pool_urbg.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen_hwaes_impl.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen_slow.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cord.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_city.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_bad_optional_access.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cordz_info.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_str_format_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_synchronization.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_time.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
diff --git a/srcpkgs/abseil-cpp-devel b/srcpkgs/abseil-cpp-devel
new file mode 120000
index 000000000000..21b48b7ea521
--- /dev/null
+++ b/srcpkgs/abseil-cpp-devel
@@ -0,0 +1 @@
+abseil-cpp
\ No newline at end of file
diff --git a/srcpkgs/abseil-cpp/patches/google-sucks.patch b/srcpkgs/abseil-cpp/patches/google-sucks.patch
new file mode 100644
index 000000000000..511bae847101
--- /dev/null
+++ b/srcpkgs/abseil-cpp/patches/google-sucks.patch
@@ -0,0 +1,77 @@
+commit 1fbfea71fb42b2e79f9e342c1843bd26a8703536
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Thu Aug 25 01:20:58 2022 +0200
+
+    An all-in-one patch that fixes several issues:
+    
+    1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
+    2) powerpc stacktrace implementation only works on glibc (disabled on musl)
+    3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
+    4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
+
+diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc
+index b1c396c..d62bfd6 100644
+--- a/absl/base/internal/unscaledcycleclock.cc
++++ b/absl/base/internal/unscaledcycleclock.cc
+@@ -20,7 +20,7 @@
+ #include <intrin.h>
+ #endif
+ 
+-#if defined(__powerpc__) || defined(__ppc__)
++#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
+ #ifdef __GLIBC__
+ #include <sys/platform/ppc.h>
+ #elif defined(__FreeBSD__)
+@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() {
+   return base_internal::NominalCPUFrequency();
+ }
+ 
+-#elif defined(__powerpc__) || defined(__ppc__)
++#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
+ 
+ int64_t UnscaledCycleClock::Now() {
+ #ifdef __GLIBC__
+diff --git a/absl/base/internal/unscaledcycleclock.h b/absl/base/internal/unscaledcycleclock.h
+index 2cbeae3..83d8c98 100644
+--- a/absl/base/internal/unscaledcycleclock.h
++++ b/absl/base/internal/unscaledcycleclock.h
+@@ -46,8 +46,8 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
+-    defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
++    ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
++    defined(__riscv) || defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0
+diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc
+index 5bdd341..a42a3c4 100644
+--- a/absl/debugging/internal/examine_stack.cc
++++ b/absl/debugging/internal/examine_stack.cc
+@@ -174,8 +174,10 @@ void* GetProgramCounter(void* const vuc) {
+     return reinterpret_cast<void*>(context->uc_mcontext.pc);
+ #elif defined(__powerpc64__)
+     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
+-#elif defined(__powerpc__)
++#elif defined(__powerpc__) && defined(__GLIBC__)
+     return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
++#elif defined(__powerpc__)
++    return reinterpret_cast<void*>(context->uc_mcontext.gregs[32]);
+ #elif defined(__riscv)
+     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
+ #elif defined(__s390__) && !defined(__s390x__)
+diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h
+index 3929b1b..23d5e50 100644
+--- a/absl/debugging/internal/stacktrace_config.h
++++ b/absl/debugging/internal/stacktrace_config.h
+@@ -60,7 +60,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
diff --git a/srcpkgs/abseil-cpp/template b/srcpkgs/abseil-cpp/template
new file mode 100644
index 000000000000..8640d2489406
--- /dev/null
+++ b/srcpkgs/abseil-cpp/template
@@ -0,0 +1,25 @@
+# Template file for 'abseil-cpp'
+pkgname=abseil-cpp
+version=20220623.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON -DABSL_PROPAGATE_CXX_STD=ON"
+hostmakedepends="pkg-config"
+short_desc="Abseil common libraries"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0"
+homepage="https://abseil.io"
+distfiles="https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz"
+checksum=91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8
+
+abseil-cpp-devel_package() {
+	short_desc+=" (development files)"
+	depends="${sourcepkg}>=${version}_${revision}"
+
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 9fe21bd8a614583f4fbf899d1f4a639257a0b74d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:08:35 -0400
Subject: [PATCH 2/6] grpc: update to 1.49.1.

---
 common/shlibs                              | 24 ++++-----
 srcpkgs/grpc/patches/absl-is-private.patch | 58 --------------------
 srcpkgs/grpc/patches/google-sucks.patch    | 63 ----------------------
 srcpkgs/grpc/patches/private-abseil.patch  | 34 ------------
 srcpkgs/grpc/template                      | 40 +++-----------
 5 files changed, 18 insertions(+), 201 deletions(-)
 delete mode 100644 srcpkgs/grpc/patches/absl-is-private.patch
 delete mode 100644 srcpkgs/grpc/patches/google-sucks.patch
 delete mode 100644 srcpkgs/grpc/patches/private-abseil.patch

diff --git a/common/shlibs b/common/shlibs
index af64d3327089..2b8c9b57cd69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3641,18 +3641,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.18 libgrpc-1.39.0_6
-libgpr.so.18 libgrpc-1.39.0_6
-libgrpc++.so.1.39 libgrpc-1.39.0_6
-libgrpc++_alts.so.1.39 libgrpc-1.39.0_6
-libgrpc++_error_details.so.1.39 libgrpc-1.39.0_6
-libgrpc++_reflection.so.1.39 libgrpc-1.39.0_6
-libgrpc++_unsecure.so.1.39 libgrpc-1.39.0_6
-libgrpc.so.18 libgrpc-1.39.0_6
-libgrpc_plugin_support.so.1.39 libgrpc-1.39.0_6
-libgrpc_unsecure.so.18 libgrpc-1.39.0_6
-libgrpcpp_channelz.so.1.39 libgrpc-1.39.0_6
-libupb.so.18 libgrpc-1.39.0_6
+libaddress_sorting.so.27 libgrpc-1.49.1_1
+libgpr.so.27 libgrpc-1.49.1_1
+libgrpc_unsecure.so.27 libgrpc-1.49.1_1
+libupb.so.27 libgrpc-1.49.1_1
+libgrpc++.so.1.49 libgrpc-1.49.1_1
+libgrpc++_alts.so.1.49 libgrpc-1.49.1_1
+libgrpc++_error_details.so.1.49 libgrpc-1.49.1_1
+libgrpc++_reflection.so.1.49 libgrpc-1.49.1_1
+libgrpc++_unsecure.so.1.49 libgrpc-1.49.1_1
+libgrpc.so.18 libgrpc-1.49 libgrpc-1.49.1_1
+libgrpc_plugin_support.so.1.49 libgrpc-1.49.1_1
+libgrpcpp_channelz.so.1.49 libgrpc-1.49.1_1
 libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/patches/absl-is-private.patch b/srcpkgs/grpc/patches/absl-is-private.patch
deleted file mode 100644
index a79277a26806..000000000000
--- a/srcpkgs/grpc/patches/absl-is-private.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- grpc-1.39.1.orig/CMakeLists.txt
-+++ grpc-1.39.1/CMakeLists.txt
-@@ -15856,7 +15865,7 @@ generate_pkgconfig(
-   "gpr"
-   "gRPC platform support library"
-   "${gRPC_CORE_VERSION}"
--  "absl_base absl_memory absl_optional absl_status absl_str_format absl_strings absl_synchronization absl_time"
-+  ""
-   "-lgpr"
-   ""
-   "gpr.pc")
-@@ -15866,7 +15875,7 @@ generate_pkgconfig(
-   "gRPC"
-   "high performance general RPC framework"
-   "${gRPC_CORE_VERSION}"
--  "gpr openssl absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "gpr openssl"
-   "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
-   ""
-   "grpc.pc")
-@@ -15876,7 +15885,7 @@ generate_pkgconfig(
-   "gRPC unsecure"
-   "high performance general RPC framework without SSL"
-   "${gRPC_CORE_VERSION}"
--  "gpr absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "gpr"
-   "-lgrpc_unsecure"
-   ""
-   "grpc_unsecure.pc")
-@@ -15886,7 +15895,7 @@ generate_pkgconfig(
-   "gRPC++"
-   "C++ wrapper for gRPC"
-   "${gRPC_CPP_VERSION}"
--  "grpc absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "grpc"
-   "-lgrpc++"
-   ""
-   "grpc++.pc")
-@@ -15896,7 +15905,7 @@ generate_pkgconfig(
-   "gRPC++ unsecure"
-   "C++ wrapper for gRPC without SSL"
-   "${gRPC_CPP_VERSION}"
--  "grpc_unsecure absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
-+  "grpc_unsecure"
-   "-lgrpc++_unsecure"
-   ""
-   "grpc++_unsecure.pc")
---- grpc-1.39.1.orig/cmake/pkg-config-template.pc.in
-+++ grpc-1.39.1/cmake/pkg-config-template.pc.in
-@@ -6,7 +6,7 @@ libdir=${exec_prefix}/lib
- Name: @PC_NAME@
- Description: @PC_DESCRIPTION@
- Version: @PC_VERSION@
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${includedir}/grpc_absl
- Requires: @PC_REQUIRES@
- Libs: -L${libdir} @PC_LIB@
- Libs.private: @PC_LIBS_PRIVATE@
diff --git a/srcpkgs/grpc/patches/google-sucks.patch b/srcpkgs/grpc/patches/google-sucks.patch
deleted file mode 100644
index 0eb8a7c3d36f..000000000000
--- a/srcpkgs/grpc/patches/google-sucks.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-An all-in-one patch that fixes several issues:
-
-1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
-2) powerpc stacktrace implementation only works on glibc (disabled on musl)
-3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
-4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
-
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-@@ -20,7 +20,7 @@
- #include <intrin.h>
- #endif
- 
--#if defined(__powerpc__) || defined(__ppc__)
-+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- #ifdef __GLIBC__
- #include <sys/platform/ppc.h>
- #elif defined(__FreeBSD__)
-@@ -59,7 +59,7 @@
-   return base_internal::NominalCPUFrequency();
- }
- 
--#elif defined(__powerpc__) || defined(__ppc__)
-+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- 
- int64_t UnscaledCycleClock::Now() {
- #ifdef __GLIBC__
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
- 
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--  defined(__powerpc__) || defined(__ppc__) || \
-+  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-   defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
---- a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
-+++ b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
-@@ -63,8 +63,10 @@ void* GetProgramCounter(void* vuc) {
-     return reinterpret_cast<void*>(context->uc_mcontext.pc);
- #elif defined(__powerpc64__)
-     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
--#elif defined(__powerpc__)
-+#elif defined(__powerpc__) && defined(__GLIBC__)
-     return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
-+#elif defined(__powerpc__)
-+    return reinterpret_cast<void*>(context->uc_mcontext.gregs[32]);
- #elif defined(__riscv)
-     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
- #elif defined(__s390__) && !defined(__s390x__)
---- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-+++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-@@ -64,7 +64,7 @@
- #elif defined(__i386__) || defined(__x86_64__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_x86-inl.inc"
--#elif defined(__ppc__) || defined(__PPC__)
-+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
- #elif defined(__aarch64__)
diff --git a/srcpkgs/grpc/patches/private-abseil.patch b/srcpkgs/grpc/patches/private-abseil.patch
deleted file mode 100644
index 4e215820fabb..000000000000
--- a/srcpkgs/grpc/patches/private-abseil.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-gRPC requires abseil, but abseil can be statically linked to avoid installing
-and tracking a ton of extra shared libs. Unfortunately, grpcpp headers now
-include absl headers, so these need to be installed. Put them in a private
-location because the full abseil installation is not provided.
-
-diff -ur third_party/abseil-cpp/CMakeLists.txt third_party/abseil-cpp/CMakeLists.txt
---- a/third_party/abseil-cpp/CMakeLists.txt
-+++ b/third_party/abseil-cpp/CMakeLists.txt
-@@ -46,6 +46,7 @@
- OPTION(BUILD_TESTING "Build tests" OFF)
- 
- project(absl LANGUAGES CXX VERSION 20210324)
-+set(BUILD_SHARED_LIBS OFF)
- include(CTest)
- 
- # Output directory is correct by default for most build setups. However, when
-@@ -57,7 +58,7 @@
- # when absl is included as subproject (i.e. using add_subdirectory(abseil-cpp))
- # in the source tree of a project that uses it, install rules are disabled.
- if(NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
--  option(ABSL_ENABLE_INSTALL "Enable install rule" OFF)
-+  option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
- else()
-   option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
- endif()
-@@ -176,7 +177,7 @@
-   endif()  # absl_VERSION
- 
-   install(DIRECTORY absl
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/grpc_absl
-     FILES_MATCHING
-       PATTERN "*.inc"
-       PATTERN "*.h"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index a1558ee2c796..984797580123 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,25 +1,22 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
-revision=8
-_abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
+version=1.49.1
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
  -DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
  -DgRPC_SSL_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package
- -D_gRPC_RE2_LIBRARIES=-lre2
+ -DgRPC_ABSL_PROVIDER=package -D_gRPC_RE2_LIBRARIES=-lre2
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel abseil-cpp-devel"
 makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
-distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
- https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
- 35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
+distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=5071b630e2a14707ad060636990f1b25b0984bd168c7ea1ab95e48a3bdc0081f
 
 if [ "$CROSS_BUILD" ]; then
 	# need host grpc_cpp_plugin
@@ -31,31 +28,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 
-post_extract() {
-	rm -rf third_party/abseil-cpp
-	mv ../abseil-cpp-${_abseilver} third_party/abseil-cpp
-}
-
-post_patch() {
-	# re2 doesn't install CMake config modules;
-	# key variables are set in configure_args
-	# also install all plugin on cross-compiling
-	vsed -i CMakeLists.txt -e '/include(cmake\/re2\.cmake)/d' \
-		-e 's/gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING/gRPC_INSTALL/'
-}
-
-post_install() {
-	# Remove unnecessary absl static libs, pkg-config and cmake modules
-	rm "${DESTDIR}"/usr/lib/libabsl*.a
-	rm -rf "${DESTDIR}/usr/lib/pkgconfig/"absl_*
-	rm -rf "${DESTDIR}/usr/lib/cmake/absl"
-	
-	# Clean up unneeded absl linker arguments from cmake files
-	sed -e 's/absl::[a-zA-Z_-]*;//g' \
-		-e 's/ "absl::[a-zA-Z_-]*"/ /g' \
-		-i ${DESTDIR}/usr/lib/cmake/grpc/gRPCTargets.cmake
-}
-
 libgrpc_package() {
 	short_desc+=" - libraries"
 	pkg_install() {

From 9bc24e6b9db320049e24bba595a46870a5e3ba9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:32:09 -0400
Subject: [PATCH 3/6] python3-grpcio: update to 1.49.1.

---
 .../python3-grpcio/patches/abseil-sucks.patch | 49 -------------------
 srcpkgs/python3-grpcio/template               | 20 +++-----
 2 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/python3-grpcio/patches/abseil-sucks.patch

diff --git a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch b/srcpkgs/python3-grpcio/patches/abseil-sucks.patch
deleted file mode 100644
index 4b328a58fd93..000000000000
--- a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-An all-in-one patch that fixes several issues:
-
-1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
-2) powerpc stacktrace implementation only works on glibc (disabled on musl)
-3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
-4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
-
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-@@ -20,7 +20,7 @@
- #include <intrin.h>
- #endif
- 
--#if defined(__powerpc__) || defined(__ppc__)
-+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- #ifdef __GLIBC__
- #include <sys/platform/ppc.h>
- #elif defined(__FreeBSD__)
-@@ -59,7 +59,7 @@
-   return base_internal::NominalCPUFrequency();
- }
- 
--#elif defined(__powerpc__) || defined(__ppc__)
-+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
- 
- int64_t UnscaledCycleClock::Now() {
- #ifdef __GLIBC__
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
- 
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--  defined(__powerpc__) || defined(__ppc__) || \
-+  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-   defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
---- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-+++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-@@ -64,7 +64,7 @@
- #elif defined(__i386__) || defined(__x86_64__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_x86-inl.inc"
--#elif defined(__ppc__) || defined(__PPC__)
-+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
- #elif defined(__aarch64__)
diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index aab1ae69886f..10779ba330ca 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
-version=1.39.0
-revision=2
+version=1.49.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six python3-Cython"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel
+ abseil-cpp-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz"
-checksum=57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407
+checksum=d4725fc9ec8e8822906ae26bb26f5546891aa7fbc3443de970cc556d43a5c99f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -22,17 +23,12 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
+export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1
 export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
 export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
 export GRPC_PYTHON_BUILD_SYSTEM_RE2=1
 export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
 
-post_patch() {
-	if [ "${CROSS_BUILD}" ]; then
-		vsed -i setup.py -e "s@['\"]cc['\"]@'${CC}'@g" \
-			-e "/os.path.join/s@/usr@${XBPS_CROSS_BASE}/usr@g"
-		vsed -e "s@['\"]cc['\"]@'${CC}'@g" \
-			-i src/python/grpcio/commands.py
-	fi
-	rm -f src/python/grpcio/grpc/_cython/cygrpc.cpp
+post_extract() {
+	rm src/python/grpcio/grpc/_cython/cygrpc.cpp
 }

From 8ba282254e50ce6ae13ae48d12befc7bcb2c43f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:39:11 -0400
Subject: [PATCH 4/6] python3-grpcio-tools: update to 1.49.1.

---
 srcpkgs/python3-grpcio-tools/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index 19db527a7a2a..155fac164fb9 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grpcio-tools'
 pkgname=python3-grpcio-tools
-version=1.39.0
-revision=2
+version=1.49.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,18 +13,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio-tools/grpcio-tools-${version}.tar.gz"
-checksum=39dfe7415bc0d3860fdb8dd90607594b046b88b57dbe64284efa4820f951c805
+checksum=84cc64e5b46bad43d5d7bd2fd772b656eba0366961187a847e908e2cb735db91
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-post_patch() {
-	if [ "${CROSS_BUILD}" ]; then
-		vsed -i setup.py -e "s@['\"]cc['\"]@'${CC}'@g"
-	fi
-}
-
 pre_check() {
 	# Subprocesses fail to find the compiled extension when only
 	# PYTHONPATH is set, so copy the extension into to source tree

From ad3ca03cb09fe4e1fcb456e05e2eae59fed89f5f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:13:30 -0400
Subject: [PATCH 5/6] Bear: rebuild for grpc

---
 srcpkgs/Bear/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index c6c1fb6e9c38..2e0914bbe66a 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
 # Template file for 'Bear'
 pkgname=Bear
 version=3.0.20
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config protobuf protobuf-devel grpc"
 makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"

From b25a162e5765e86a3518c99bce95a39040506095 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 6 Oct 2022 10:13:30 -0400
Subject: [PATCH 6/6] sysdig: rebuild for grpc

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index c78089265ee5..968dfb7eae3e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.28.0
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: grpc: update to 1.49.1.
  2022-10-06 14:43 [PR PATCH] grpc: update to 1.49.1 ahesford
                   ` (2 preceding siblings ...)
  2022-10-06 19:41 ` ahesford
@ 2022-10-07 16:26 ` ahesford
  2022-10-07 16:26 ` [PR PATCH] [Closed]: " ahesford
  4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2022-10-07 16:26 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/39773#issuecomment-1271801136

Comment:
Closed in 9dde5034afc

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Closed]: grpc: update to 1.49.1.
  2022-10-06 14:43 [PR PATCH] grpc: update to 1.49.1 ahesford
                   ` (3 preceding siblings ...)
  2022-10-07 16:26 ` ahesford
@ 2022-10-07 16:26 ` ahesford
  4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2022-10-07 16:26 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

grpc: update to 1.49.1.
https://github.com/void-linux/void-packages/pull/39773

Description:
It's time to bite the bullet and package `abseil-cpp` to avoid duplicating patch work for `grpc` and `python3-grpcio`. Also, `protobuf` is set to depend on abseil in some future release. Only the shared libraries necessary the these dependants are included in `common/shlibs`; we can grow the list as needed.

#### Testing the changes
- I tested the changes in this PR: **briefly**

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-10-07 16:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-06 14:43 [PR PATCH] grpc: update to 1.49.1 ahesford
2022-10-06 17:42 ` [PR PATCH] [Updated] " ahesford
2022-10-06 19:05 ` ahesford
2022-10-06 19:41 ` ahesford
2022-10-07 16:26 ` ahesford
2022-10-07 16:26 ` [PR PATCH] [Closed]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).