[arch-commits] Commit in grpc/trunk (3 files)

[Evangelos Foutras]

    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
===================================================================
--- PKGBUILD	2021-05-08 12:13:21 UTC (rev 928789)
+++ PKGBUILD	2021-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 <veblush at google.com>
+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, json, &binary);
+   if (!status.ok()) {
+-    std::string errmsg(status.error_message());
++    std::string errmsg(status.message());
+     gpr_log(GPR_ERROR, "Failed to convert json to binary: errcode=%d msg=%s",
+             status.code(), errmsg.c_str());
+     gpr_log(GPR_ERROR, "JSON: %s", json.c_str());