[arch-commits] Commit in grpc/trunk (3 files)
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
===
--- PKGBUILD2022-06-23 18:09:50 UTC (rev 1239278)
+++ PKGBUILD2022-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
-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 channel_creds,
- grpc_core::RefCountedPtr 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 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
[arch-commits] Commit in grpc/trunk (3 files)
Date: Saturday, May 8, 2021 @ 12:19:20
Author: foutrelis
Revision: 928790
Fix build with protobuf 3.16.0
Added:
grpc/trunk/parse_json-fix-status-error.patch
Modified:
grpc/trunk/PKGBUILD
Deleted:
grpc/trunk/cmake-cli.patch
---+
PKGBUILD |9 -
cmake-cli.patch | 57
parse_json-fix-status-error.patch | 22 +
3 files changed, 29 insertions(+), 59 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-05-08 12:13:21 UTC (rev 928789)
+++ PKGBUILD2021-05-08 12:19:20 UTC (rev 928790)
@@ -16,14 +16,19 @@
'cmake' 'benchmark' 'python-setuptools')
source=("https://github.com/grpc/grpc/archive/v$pkgver/$pkgbase-$pkgver.tar.gz;
"https://github.com/google/googletest/archive/$_gtestver/googletest-$_gtestver.tar.gz;
-
"https://github.com/abseil/abseil-cpp/archive/$_abseilcppver/abseil-cpp-$_abseilcppver.tar.gz;)
+
"https://github.com/abseil/abseil-cpp/archive/$_abseilcppver/abseil-cpp-$_abseilcppver.tar.gz;
+parse_json-fix-status-error.patch)
sha256sums=('8eb9d86649c4d4a7df790226df28f081b97a62bf12c5c5fe9b5d31a29cd6541a'
'443d383db648ebb8e391382c0ab63263b7091d03197f304390baac10f178a468'
-'bf3f13b13a0095d926b25640e060f7e13881bd8a792705dd9e161f3c2b9aa976')
+'bf3f13b13a0095d926b25640e060f7e13881bd8a792705dd9e161f3c2b9aa976'
+'6cb2101c74e0817a8037f7d5e0f0e251e5c6e87de41e286e0c930f50fe6485af')
prepare() {
cd "$srcdir/$pkgbase-$pkgver"
+ # https://github.com/grpc/grpc/pull/25731
+ patch -Np1 -i ../parse_json-fix-status-error.patch
+
ln -sf "$srcdir/googletest-$_gtestver/"{googlemock,googletest} \
third_party/googletest
Deleted: cmake-cli.patch
===
--- cmake-cli.patch 2021-05-08 12:13:21 UTC (rev 928789)
+++ cmake-cli.patch 2021-05-08 12:19:20 UTC (rev 928790)
@@ -1,57 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef11396..dd10886 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,6 +44,7 @@ set(gRPC_INSTALL_CMAKEDIR "lib/cmake/${PACKAGE_NAME}" CACHE
STRING "Installation
- set(gRPC_INSTALL_SHAREDIR "share/grpc" CACHE STRING "Installation directory
for root certificates")
-
- # Options
-+option(gRPC_BUILD_CLI "Build cli" ON)
- option(gRPC_BUILD_TESTS "Build tests" OFF)
- option(gRPC_BUILD_CODEGEN "Build codegen" ON)
- option(gRPC_BUILD_CSHARP_EXT "Build C# extensions" ON)
-@@ -84,7 +85,7 @@ set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS
"module" "package")
- set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching
protobuf package")
- set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG"
"MODULE")
-
--if(gRPC_BUILD_TESTS)
-+if(gRPC_BUILD_TESTS OR gRPC_BUILD_CLI)
- set(gRPC_GFLAGS_PROVIDER "module" CACHE STRING "Provider of gflags library")
- set_property(CACHE gRPC_GFLAGS_PROVIDER PROPERTY STRINGS "module" "package")
-
-@@ -4278,7 +4279,7 @@ target_link_libraries(b64_test
-
-
- endif()
--if(gRPC_BUILD_TESTS)
-+if(gRPC_BUILD_TESTS OR gRPC_BUILD_CLI)
-
- add_executable(bad_server_response_test
- test/core/end2end/bad_server_response_test.cc
-@@ -4401,7 +4402,7 @@ target_link_libraries(bin_decoder_test
-
-
- endif()
--if(gRPC_BUILD_TESTS)
-+if(gRPC_BUILD_TESTS OR gRPC_BUILD_CLI)
-
- add_executable(bin_encoder_test
- test/core/transport/chttp2/bin_encoder_test.cc
-@@ -5167,7 +5168,7 @@ target_link_libraries(fake_resolver_test
-
-
- endif()
--if(gRPC_BUILD_TESTS)
-+if(gRPC_BUILD_TESTS OR gRPC_BUILD_CLI)
-
- add_executable(fake_transport_security_test
- test/core/tsi/fake_transport_security_test.cc
-@@ -10762,7 +10763,7 @@ target_link_libraries(global_config_test
-
-
- endif()
--if(gRPC_BUILD_TESTS)
-+if(gRPC_BUILD_TESTS OR gRPC_BUILD_CLI)
-
- add_executable(grpc_cli
- ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.cc
Added: parse_json-fix-status-error.patch
===
--- parse_json-fix-status-error.patch (rev 0)
+++ parse_json-fix-status-error.patch 2021-05-08 12:19:20 UTC (rev 928790)
@@ -0,0 +1,22 @@
+From d30b04ed7b53f36fded3f94c32ebaed88cfa1232 Mon Sep 17 00:00:00 2001
+From: Esun Kim
+Date: Wed, 17 Mar 2021 10:00:44 -0700
+Subject: [PATCH] Fix status error (#25731)
+
+---
+ test/cpp/qps/parse_json.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/cpp/qps/parse_json.cc b/test/cpp/qps/parse_json.cc
+index 8777f171420d..f3ac1052d4d5 100644
+--- a/test/cpp/qps/parse_json.cc
b/test/cpp/qps/parse_json.cc
+@@ -34,7 +34,7 @@ void ParseJson(const std::string& json, const std::string&
type,
+ auto status = JsonToBinaryString(
+ type_resolver.get(), "type.googleapis.com/" + type,
