From 64de5dc572ea83d070109957601cbd0ef281bd05 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 3 Dec 2020 11:01:20 -0500
Subject: [PATCH] python3-grpcio: update to 1.34.0.

---
 .../python3-grpcio/patches/abseil-sucks.patch | 56 ++++---------------
 srcpkgs/python3-grpcio/template               |  4 +-
 2 files changed, 14 insertions(+), 46 deletions(-)

diff --git a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch b/srcpkgs/python3-grpcio/patches/abseil-sucks.patch
index 6231f4730e6..cb8ca07bdca 100644
--- a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch
+++ b/srcpkgs/python3-grpcio/patches/abseil-sucks.patch
@@ -1,11 +1,9 @@
 An all-in-one patch that fixes several issues:
 
 1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
-2) generic stacktrace implementation only works on glibc (disabled on musl)
-3) powerpc stacktrace implementation only works on glibc (disabled on musl)
-4) powerpc stacktrace implementation has ppc64 assumptions (fixed)
-5) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
-6) randen_hwaes does not build on all ppc (fixed)
+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)
 
 --- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
 +++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
@@ -40,7 +38,7 @@ An all-in-one patch that fixes several issues:
  #else
 --- third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
 +++ third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
-@@ -23,6 +23,10 @@
+@@ -27,6 +27,10 @@
  #include <csignal>
  #include <cstdio>
  
@@ -51,7 +49,7 @@ An all-in-one patch that fixes several issues:
  #include "absl/base/attributes.h"
  #include "absl/base/internal/raw_logging.h"
  #include "absl/base/macros.h"
-@@ -51,8 +55,10 @@
+@@ -55,8 +59,10 @@
      return reinterpret_cast<void*>(context->uc_mcontext.pc);
  #elif defined(__powerpc64__)
      return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
@@ -65,35 +63,15 @@ An all-in-one patch that fixes several issues:
  #elif defined(__s390__) && !defined(__s390x__)
 --- third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
 +++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-@@ -34,13 +34,13 @@
- # if defined(__i386__) || defined(__x86_64__)
+@@ -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__)
+   "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__)
- #define ABSL_STACKTRACE_INL_HEADER \
-     "absl/debugging/internal/stacktrace_aarch64-inl.inc"
--# elif defined(__arm__)
-+# elif defined(__arm__) && defined(__GLIBC__)
- // Note: When using glibc this may require -funwind-tables to function properly.
- #define ABSL_STACKTRACE_INL_HEADER \
-   "absl/debugging/internal/stacktrace_generic-inl.inc"
-@@ -49,10 +49,10 @@
-    "absl/debugging/internal/stacktrace_unimplemented-inl.inc"
- # endif
- #else  // defined(NO_FRAME_POINTER)
--# if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__)
-+# if (defined(__i386__) || defined(__x86_64__) || defined(__aarch64__)) && defined(__GLIBC__)
- #define ABSL_STACKTRACE_INL_HEADER \
-     "absl/debugging/internal/stacktrace_generic-inl.inc"
--# elif defined(__ppc__) || defined(__PPC__)
-+# elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
- #define ABSL_STACKTRACE_INL_HEADER \
-     "absl/debugging/internal/stacktrace_generic-inl.inc"
- # else
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
 --- third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
 +++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
 @@ -130,8 +130,13 @@
@@ -110,13 +88,3 @@ An all-in-one patch that fixes several issues:
        // Check that alleged sp before signal is nonnull and is reasonably
        // aligned.
        if (sp_before_signal != nullptr &&
---- third_party/abseil-cpp/absl/random/internal/randen_hwaes.cc
-+++ third_party/abseil-cpp/absl/random/internal/randen_hwaes.cc
-@@ -141,6 +141,7 @@ ABSL_NAMESPACE_END
- #include <altivec.h>
- // <altivec.h> #defines vector __vector; in C++, this is bad form.
- #undef vector
-+#undef bool
- 
- // Rely on the PowerPC AltiVec vector operations for accelerated AES
- // instructions. GCC support of the PPC vector types is described in:
diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 82a14b611de..d3455b39a76 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
-version=1.33.2
+version=1.34.0
 revision=1
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz"
-checksum=21265511880056d19ce4f809ce3fbe2a3fa98ec1fc7167dbdf30a80d3276202e
+checksum=f98f746cacbaa681de0bcd90d7aa77b440e3e1327a9988f6a2b580d54e27d4c3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"