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

[Massimiliano Torromeo]

    Date: Friday, December 4, 2020 @ 09:59:08
  Author: mtorromeo
Revision: 769940

upgpkg: grpc 1.34.0-1

Modified:
  grpc/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-04 09:55:05 UTC (rev 769939)
+++ PKGBUILD	2020-12-04 09:59:08 UTC (rev 769940)
@@ -4,30 +4,24 @@
 
 pkgbase='grpc'
 pkgname=('grpc' 'python-grpcio' 'php-grpc' 'grpc-cli')
-pkgver=1.33.2
+pkgver=1.34.0
 _gtestver=c9ccac7cb7345901884aabf5d1a786cfa6e2f397
 _abseilcppver=20200225.2
-pkgrel=3
+pkgrel=1
 pkgdesc="High performance, open source, general RPC framework that puts mobile and HTTP/2 first."
 arch=('x86_64')
 url='https://grpc.io'
 license=('BSD')
-makedepends=('re2' 're2c' 'protobuf' 'php' 'c-ares' 'openssl' 'chrpath' 'gflags' 'cython' 'cmake' 'benchmark')
+makedepends=('re2' 're2c' 'protobuf' 'php' 'c-ares' 'openssl' 'chrpath' 'cython' 'cmake' 'benchmark')
 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://patch-diff.githubusercontent.com/raw/grpc/grpc/pull/24450/grpcio-system-re2.patch"
-        "https://patch-diff.githubusercontent.com/raw/grpc/grpc/pull/24449/grpcio-no-boringssl-fix.patch")
-sha256sums=('2060769f2d4b0d3535ba594b2ab614d7f68a492f786ab94b4318788d45e3278a'
+        "https://github.com/abseil/abseil-cpp/archive/$_abseilcppver/abseil-cpp-$_abseilcppver.tar.gz")
+sha256sums=('7372a881122cd85a7224435a1d58bc5e11c88d4fb98a64b83f36f3d1c2f16d39'
             '443d383db648ebb8e391382c0ab63263b7091d03197f304390baac10f178a468'
-            'f41868f7a938605c92936230081175d1eae87f6ea2c248f41077c8f88316f111'
-            '21524e855406ad0c5f8f1af24fd8b25653298430adf11ea26b96b472b8f2073a'
-            'a105e796854fb726908a0b6f5501d50478f52afad6ed3e8aeffe5d30b855aead')
+            'f41868f7a938605c92936230081175d1eae87f6ea2c248f41077c8f88316f111')
 
 prepare() {
   cd "$srcdir/$pkgbase-$pkgver"
-  patch -p1 -i ../grpcio-system-re2.patch
-  patch -p1 -i ../grpcio-no-boringssl-fix.patch
 
   ln -sf "$srcdir/googletest-$_gtestver/"{googlemock,googletest} \
     third_party/googletest
@@ -35,8 +29,6 @@
   rm -rf third_party/abseil-cpp
   ln -s "$srcdir/abseil-cpp-$_abseilcppver/" third_party/abseil-cpp
 
-  sed '/TARGET gflags::gflags/i \  set(_gRPC_GFLAGS_LIBRARIES gflags)' -i cmake/gflags.cmake
-
   mkdir build
 }
 
@@ -53,7 +45,6 @@
     -DgRPC_PROTOBUF_PROVIDER=package \
     -DgRPC_SSL_PROVIDER=package \
     -DgRPC_ZLIB_PROVIDER=package \
-    -DgRPC_GFLAGS_PROVIDER=package \
     -DgRPC_RE2_PROVIDER=package \
     -DgRPC_BENCHMARK_PROVIDER=package \
     ..
@@ -114,7 +105,7 @@
 
 package_grpc-cli() {
   pkgdesc='gRPC protocol buffers cli'
-  depends=('grpc' 'gflags')
+  depends=('grpc')
 
   cd "$srcdir/$pkgbase-$pkgver"
   install -dm0755 "$pkgdir/usr/lib"