From 43ce768f17098024092d263f0891ae52c39cb1f8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 6 Oct 2019 18:39:13 +0200
Subject: [PATCH] grpc: update to 1.24.1.

---
 common/shlibs         | 10 +++++-----
 srcpkgs/grpc/template | 11 ++++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 26c5d9ec37c..688275b7d9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3464,16 +3464,16 @@ liboblibs.so.0.0 oblibs-0.0.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.7 grpc-1.19.1_1
-libgpr.so.7 grpc-1.19.1_1
+libaddress_sorting.so.8 grpc-1.24.1_1
+libgpr.so.8 grpc-1.24.1_1
 libgrpc++.so.1 grpc-1.19.1_1
 libgrpc++_cronet.so.1 grpc-1.19.1_1
 libgrpc++_error_details.so.1 grpc-1.19.1_1
 libgrpc++_reflection.so.1 grpc-1.19.1_1
 libgrpc++_unsecure.so.1 grpc-1.19.1_1
-libgrpc.so.7 grpc-1.19.1_1
-libgrpc_cronet.so.7 grpc-1.19.1_1
-libgrpc_unsecure.so.7 grpc-1.19.1_1
+libgrpc.so.8 grpc-1.24.1_1
+libgrpc_cronet.so.8 grpc-1.24.1_1
+libgrpc_unsecure.so.8 grpc-1.24.1_1
 libgrpcpp_channelz.so.1 grpc-1.19.1_1
 libircclient.so.1 libircclient-1.10_1
 libFAudio.so.0 FAudio-19.05_1
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 87571420750..1883ecd8036 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,8 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.22.0
+version=1.24.1
 revision=1
+_upbver=931bbecbd3230ae7f22efa5d203639facc47f719
 build_style=gnu-makefile
 make_build_args="prefix=\$(DESTDIR)/usr AROPTS=rc LD=\$(CC)"
 make_install_args="prefix=\$(DESTDIR)/usr"
@@ -12,12 +13,16 @@ short_desc="High performance, open source, general RPC framework"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
-distfiles="https://github.com/$pkgname/$pkgname/archive/v${version}/$pkgname-${version}.tar.gz"
-checksum=11ac793c562143d52fd440f6549588712badc79211cdc8c509b183cb69bddad8
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}/${pkgname}-${version}.tar.gz
+ https://github.com/protocolbuffers/upb/archive/${_upbver}/upb-${_upbver}.tar.gz"
+checksum="ffadb8c6bcd725b60c370484062363c4c476335fbd5f377dcc66ac9c91aeae03
+ 95150db57b51b65f3422c38953956e0f786945d842d76f8ab685fbcd93ab5caa"
 nocross=yes
 
 post_extract() {
 	sed -r 's/-Werror//g;/ldconfig/d;s/ strip-(static|shared)_c(xx)? / /' -i Makefile
+	rm -rf third_party/upb
+	mv ../upb-${_upbver} third_party/upb
 }
 post_install() {
 	vlicense NOTICE.txt