From b939a59c780a093e6e483b3cc1fcc09bfff0ed6d Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 10 Nov 2024 14:53:24 +0000 Subject: [PATCH] extra/grpc to 1.67.1-1 --- extra/grpc/.SRCINFO | 30 +++++++++++++++++++++++++----- extra/grpc/PKGBUILD | 27 +++++++++++++++------------ 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/extra/grpc/.SRCINFO b/extra/grpc/.SRCINFO index 4447b9784..e9474cdcc 100644 --- a/extra/grpc/.SRCINFO +++ b/extra/grpc/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = grpc pkgdesc = High performance, open source, general RPC framework that puts mobile and HTTP/2 first. - pkgver = 1.65.5 - pkgrel = 5 + pkgver = 1.67.1 + pkgrel = 1 url = https://grpc.io arch = x86_64 license = Apache-2.0 @@ -22,12 +22,16 @@ pkgbase = grpc makedepends = python-build makedepends = python-installer makedepends = python-wheel - source = https://github.com/grpc/grpc/archive/v1.65.5/grpc-1.65.5.tar.gz + source = https://github.com/grpc/grpc/archive/v1.67.1/grpc-1.67.1.tar.gz source = https://github.com/google/googletest/archive/0e402173c97aea7a00749e825b194bfede4f2e45/googletest-0e402173c97aea7a00749e825b194bfede4f2e45.tar.gz - sha256sums = bdab9cb52e3ee703d6c09d15716bcc10a150b2e9e414182e5b375d32050dba84 + sha256sums = d74f8e99a433982a12d7899f6773e285c9824e1d9a173ea1d1fb26c9bd089299 sha256sums = c8de6c60e12ad014a28225c5247ee735861d85cf906df617f6a29954ca05f547 pkgname = grpc + depends = glibc + depends = gcc-libs + depends = zlib + depends = systemd-libs depends = c-ares depends = protobuf depends = openssl @@ -48,29 +52,45 @@ pkgname = grpc pkgname = python-grpcio pkgdesc = Python language bindings for grpc, remote procedure call (RPC) framework + depends = glibc + depends = gcc-libs + depends = zlib + depends = openssl depends = c-ares depends = python depends = re2 depends = abseil-cpp + depends = python-grpcio-tools pkgname = python-grpcio-tools pkgdesc = Python protobuf generator for GRPC + depends = glibc + depends = gcc-libs + depends = protobuf + depends = python depends = python-setuptools - depends = python-grpcio depends = python-protobuf pkgname = php-grpc pkgdesc = gRPC module for PHP + depends = glibc + depends = gcc-libs depends = grpc depends = php backup = etc/php/conf.d/grpc.ini pkgname = php-legacy-grpc pkgdesc = gRPC module for PHP Legacy + depends = glibc + depends = gcc-libs depends = grpc depends = php-legacy backup = etc/php-legacy/conf.d/grpc.ini pkgname = grpc-cli pkgdesc = gRPC protocol buffers cli + depends = glibc + depends = gcc-libs depends = grpc + depends = protobuf + depends = abseil-cpp diff --git a/extra/grpc/PKGBUILD b/extra/grpc/PKGBUILD index 8111769e8..6e85664c9 100644 --- a/extra/grpc/PKGBUILD +++ b/extra/grpc/PKGBUILD @@ -7,9 +7,9 @@ pkgbase='grpc' pkgname=('grpc' 'python-grpcio' 'python-grpcio-tools' 'php-grpc' 'php-legacy-grpc' 'grpc-cli') -pkgver=1.65.5 +pkgver=1.67.1 _gtestver=0e402173c97aea7a00749e825b194bfede4f2e45 -pkgrel=5 +pkgrel=1 pkgdesc="High performance, open source, general RPC framework that puts mobile and HTTP/2 first." arch=('x86_64') url='https://grpc.io' @@ -18,7 +18,7 @@ makedepends=('re2' 're2c' 'protobuf' 'php' 'php-legacy' 'c-ares' 'openssl' 'chrp 'cmake' 'benchmark' 'abseil-cpp' 'ninja' 'python-setuptools' 'python-build' 'python-installer' 'python-wheel') source=("https://github.com/grpc/grpc/archive/v$pkgver/$pkgbase-$pkgver.tar.gz" "https://github.com/google/googletest/archive/$_gtestver/googletest-$_gtestver.tar.gz") -sha256sums=('bdab9cb52e3ee703d6c09d15716bcc10a150b2e9e414182e5b375d32050dba84' +sha256sums=('d74f8e99a433982a12d7899f6773e285c9824e1d9a173ea1d1fb26c9bd089299' 'c8de6c60e12ad014a28225c5247ee735861d85cf906df617f6a29954ca05f547') prepare() { @@ -45,11 +45,10 @@ build() { cd "$srcdir/$pkgbase-$pkgver" cmake -Bbuild \ -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG -Wno-attributes -Wno-deprecated-declarations -Wno-return-type -Wno-non-virtual-dtor" \ -DgRPC_INSTALL=ON \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_CXX_STANDARD=17 \ - -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DgRPC_BUILD_TESTS=ON \ -DgRPC_BUILD_CODEGEN=ON \ @@ -116,7 +115,7 @@ check() { } package_grpc() { - depends=('c-ares' 'protobuf' 'openssl' 're2' 'abseil-cpp') + depends=('glibc' 'gcc-libs' 'zlib' 'systemd-libs' 'c-ares' 'protobuf' 'openssl' 're2' 'abseil-cpp') provides=( 'libupb.so' 'libgrpcpp_channelz.so' @@ -139,7 +138,7 @@ package_grpc() { package_python-grpcio() { pkgdesc='Python language bindings for grpc, remote procedure call (RPC) framework' - depends=('c-ares' 'python' 're2' 'abseil-cpp') + depends=('glibc' 'gcc-libs' 'zlib' 'openssl' 'c-ares' 'python' 're2' 'abseil-cpp' 'python-grpcio-tools') cd "$srcdir/$pkgbase-$pkgver" python -m installer --destdir="$pkgdir" dist/*.whl @@ -148,7 +147,7 @@ package_python-grpcio() { package_python-grpcio-tools() { pkgdesc='Python protobuf generator for GRPC' - depends=('python-setuptools' 'python-grpcio' 'python-protobuf') + depends=('glibc' 'gcc-libs' 'protobuf' 'python' 'python-setuptools' 'python-protobuf') cd "$srcdir/$pkgbase-$pkgver" install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE @@ -159,7 +158,7 @@ package_python-grpcio-tools() { package_php-grpc() { pkgdesc='gRPC module for PHP' - depends=('grpc' 'php') + depends=('glibc' 'gcc-libs' 'grpc' 'php') backup=('etc/php/conf.d/grpc.ini') # Install PHP extension. @@ -176,7 +175,7 @@ package_php-grpc() { package_php-legacy-grpc() { pkgdesc='gRPC module for PHP Legacy' - depends=('grpc' 'php-legacy') + depends=('glibc' 'gcc-libs' 'grpc' 'php-legacy') backup=('etc/php-legacy/conf.d/grpc.ini') # Install PHP extension. @@ -193,12 +192,16 @@ package_php-legacy-grpc() { package_grpc-cli() { pkgdesc='gRPC protocol buffers cli' - depends=('grpc') + depends=('glibc' 'gcc-libs' 'grpc' 'protobuf' 'abseil-cpp') cd "$srcdir/$pkgbase-$pkgver" install -dm0755 "$pkgdir/usr/lib" - cp -a build/libgrpc++_test_config.so* "$pkgdir/usr/lib/" + # Remove RPATH + chrpath -d build/grpc_cli build/libgrpc++_test_config.so* + + cp -a build/libgrpc++_test_config.so* "$pkgdir/usr/lib/" install -Dm0755 build/grpc_cli "$pkgdir/usr/bin/grpc_cli" install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + }