Date: Thursday, June 23, 2022 @ 18:09:55
Author: mtorromeo
Revision: 1239279
upgpkg: grpc 1.47.0-1
Modified:
grpc/trunk/PKGBUILD
Deleted:
grpc/trunk/python-grpcio-nullptr-fix.patch
grpc/trunk/python-grpcio-use-system-abseil.patch
---------------------------------------+
PKGBUILD | 13 +++------
python-grpcio-nullptr-fix.patch | 45 -------------------------------
python-grpcio-use-system-abseil.patch | 46 --------------------------------
3 files changed, 5 insertions(+), 99 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-23 18:09:50 UTC (rev 1239278)
+++ PKGBUILD 2022-06-23 18:09:55 UTC (rev 1239279)
@@ -4,9 +4,9 @@
pkgbase='grpc'
pkgname=('grpc' 'python-grpcio' 'php-grpc' 'php7-grpc' 'grpc-cli')
-pkgver=1.46.3
+pkgver=1.47.0
_gtestver=0e402173c97aea7a00749e825b194bfede4f2e45
-pkgrel=2
+pkgrel=1
pkgdesc="High performance, open source, general RPC framework that puts mobile
and HTTP/2 first."
arch=('x86_64')
url='https://grpc.io'
@@ -16,15 +16,12 @@
options=('debug')
checkdepends=('python-six')
source=("https://github.com/grpc/grpc/archive/v$pkgver/$pkgbase-$pkgver.tar.gz";
-
"https://github.com/google/googletest/archive/$_gtestver/googletest-$_gtestver.tar.gz";
- "python-grpcio-use-system-abseil.patch")
-sha256sums=('d6cbf22cb5007af71b61c6be316a79397469c58c82a942552a62e708bce60964'
- 'c8de6c60e12ad014a28225c5247ee735861d85cf906df617f6a29954ca05f547'
- '3cfb289266f9d2697b917e4400f18a6592f95a99e658e401c1332870b219358b')
+
"https://github.com/google/googletest/archive/$_gtestver/googletest-$_gtestver.tar.gz";)
+sha256sums=('271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54'
+ 'c8de6c60e12ad014a28225c5247ee735861d85cf906df617f6a29954ca05f547')
prepare() {
cd "$srcdir/$pkgbase-$pkgver"
- patch -Np1 -i ../python-grpcio-use-system-abseil.patch
ln -sf "$srcdir/googletest-$_gtestver/"{googlemock,googletest} \
third_party/googletest
Deleted: python-grpcio-nullptr-fix.patch
===================================================================
--- python-grpcio-nullptr-fix.patch 2022-06-23 18:09:50 UTC (rev 1239278)
+++ python-grpcio-nullptr-fix.patch 2022-06-23 18:09:55 UTC (rev 1239279)
@@ -1,45 +0,0 @@
-From 05af494b282542304c9fa60d19e8aa1b9f474621 Mon Sep 17 00:00:00 2001
-From: Esun Kim <vebl...@google.com>
-Date: Thu, 7 Apr 2022 21:16:30 -0700
-Subject: [PATCH] Fix bugprone-stringview-nullptr (#29346)
-
----
- src/core/lib/http/httpcli_security_connector.cc | 2 +-
- .../security_connector/local/local_security_connector.cc | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/core/lib/http/httpcli_security_connector.cc
b/src/core/lib/http/httpcli_security_connector.cc
-index 9f2c5249bb61..99273173e715 100644
---- a/src/core/lib/http/httpcli_security_connector.cc
-+++ b/src/core/lib/http/httpcli_security_connector.cc
-@@ -48,7 +48,7 @@ class grpc_httpcli_ssl_channel_security_connector final
- public:
- explicit grpc_httpcli_ssl_channel_security_connector(char* secure_peer_name)
- : grpc_channel_security_connector(
-- /*url_scheme=*/nullptr,
-+ /*url_scheme=*/{},
- /*channel_creds=*/nullptr,
- /*request_metadata_creds=*/nullptr),
- secure_peer_name_(secure_peer_name) {}
-diff --git
a/src/core/lib/security/security_connector/local/local_security_connector.cc
b/src/core/lib/security/security_connector/local/local_security_connector.cc
-index 952189868fe2..f97299d03c0f 100644
----
a/src/core/lib/security/security_connector/local/local_security_connector.cc
-+++
b/src/core/lib/security/security_connector/local/local_security_connector.cc
-@@ -152,7 +152,7 @@ class grpc_local_channel_security_connector final
- grpc_core::RefCountedPtr<grpc_channel_credentials> channel_creds,
- grpc_core::RefCountedPtr<grpc_call_credentials> request_metadata_creds,
- const char* target_name)
-- : grpc_channel_security_connector(nullptr, std::move(channel_creds),
-+ : grpc_channel_security_connector({}, std::move(channel_creds),
- std::move(request_metadata_creds)),
- target_name_(gpr_strdup(target_name)) {}
-
-@@ -210,7 +210,7 @@ class grpc_local_server_security_connector final
- public:
- explicit grpc_local_server_security_connector(
- grpc_core::RefCountedPtr<grpc_server_credentials> server_creds)
-- : grpc_server_security_connector(nullptr, std::move(server_creds)) {}
-+ : grpc_server_security_connector({}, std::move(server_creds)) {}
- ~grpc_local_server_security_connector() override = default;
-
- void add_handshakers(
Deleted: python-grpcio-use-system-abseil.patch
===================================================================
--- python-grpcio-use-system-abseil.patch 2022-06-23 18:09:50 UTC (rev
1239278)
+++ python-grpcio-use-system-abseil.patch 2022-06-23 18:09:55 UTC (rev
1239279)
@@ -1,46 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 4d34c43..5826663 100644
---- a/setup.py
-+++ b/setup.py
-@@ -29,6 +29,7 @@ from distutils import extension as _extension
- from distutils import util
- import os
- import os.path
-+import pathlib
- import platform
- import re
- import shlex
-@@ -155,6 +156,11 @@ BUILD_WITH_SYSTEM_CARES =
_env_bool_value('GRPC_PYTHON_BUILD_SYSTEM_CARES',
- # runtime, the shared library must be installed
- BUILD_WITH_SYSTEM_RE2 = _env_bool_value('GRPC_PYTHON_BUILD_SYSTEM_RE2',
'False')
-
-+# Export this variable to use the system installation of abseil. You need to
-+# have the header files installed (in /usr/include/absl) and during
-+# runtime, the shared library must be installed
-+BUILD_WITH_SYSTEM_ABSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ABSL',
False)
-+
- # Export this variable to force building the python extension with a
statically linked libstdc++.
- # At least on linux, this is normally not needed as we can build
manylinux-compatible wheels on linux just fine
- # without statically linking libstdc++ (which leads to a slight increase in
the wheel size).
-@@ -297,6 +303,10 @@ if BUILD_WITH_SYSTEM_RE2:
- CORE_C_FILES = filter(lambda x: 'third_party/re2' not in x, CORE_C_FILES)
- RE2_INCLUDE = (os.path.join('/usr', 'include', 're2'),)
-
-+if BUILD_WITH_SYSTEM_ABSL:
-+ CORE_C_FILES = filter(lambda x: 'third_party/abseil-cpp' not in x,
CORE_C_FILES)
-+ ABSL_INCLUDE = (os.path.join('/usr', 'include'),)
-+
- EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON_STEM,) + CORE_INCLUDE + ABSL_INCLUDE
+
- ADDRESS_SORTING_INCLUDE + CARES_INCLUDE +
- RE2_INCLUDE + SSL_INCLUDE + UPB_INCLUDE +
-@@ -326,6 +336,10 @@ if BUILD_WITH_SYSTEM_CARES:
- EXTENSION_LIBRARIES += ('cares',)
- if BUILD_WITH_SYSTEM_RE2:
- EXTENSION_LIBRARIES += ('re2',)
-+if BUILD_WITH_SYSTEM_ABSL:
-+ EXTENSION_LIBRARIES += tuple(
-+ lib.stem[3:] for lib in pathlib.Path('/usr').glob('lib*/libabsl_*.so')
-+ )
-
- DEFINE_MACROS = (('_WIN32_WINNT', 0x600),)
- asm_files = []
