From be1bb0240206f8fec1bd44f95d0130856e753c07 Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Wed, 18 May 2022 19:29:54 +0000
Subject: user/protobuf: bump { 3.18.1 --> 3.20.1 }. bump googletest. disable
 parallel build. fixes #692.

---
 user/protobuf/APKBUILD | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'user/protobuf')

diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD
index f22a9b731..c1c3b49af 100644
--- a/user/protobuf/APKBUILD
+++ b/user/protobuf/APKBUILD
@@ -3,8 +3,8 @@
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=protobuf
 _gemname=google-protobuf
-pkgver=3.18.1
-_tstver=1.11.0
+pkgver=3.20.1
+_tstver=8d51dc50eb7e7698427fed81b85edad0e032112e
 pkgrel=0
 pkgdesc="Library for extensible, efficient structure packing"
 url="https://github.com/google/protobuf"
@@ -19,12 +19,12 @@ makedepends="$depends_dev autoconf automake libtool ruby ruby-dev ruby-rake
 checkdepends="ruby-json ruby-test-unit"
 subpackages="ruby-$_gemname:_ruby py3-$pkgname:_python $pkgname-dev $pkgname-vim::noarch"
 source="$pkgname-$pkgver.tar.gz::https://github.com/google/$pkgname/archive/v$pkgver.tar.gz
-	googletest-$_tstver.tar.gz::https://github.com/google/googletest/archive/release-$_tstver.tar.gz"
+	googletest-$_tstver.tar.gz::https://github.com/google/googletest/archive/$_tstver.tar.gz"
 
 prepare() {
 	# symlink tests to the test directory
-	rm -rf third_party/*
-	ln -sf "$srcdir"/googletest-release-$_tstver \
+	rm -rf third_party/googletest
+	ln -sf "$srcdir"/googletest-$_tstver \
 		"$builddir"/third_party/googletest
 }
 
@@ -41,7 +41,7 @@ build() {
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		${CMAKE_CROSSOPTS} cmake
-	make
+	make -j1
 
 	# Build for Ruby
 	cd "$builddir"/ruby
@@ -114,5 +114,5 @@ vim() {
 		"$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim
 }
 
-sha512sums="d8ee0ae70ca4920787fca0e7d3053281754123a54280ce678d6ccaf294949959719a882c9e07300ab94e666ceb800967bcd549fa603d89b73f91e9368bd8f119  protobuf-3.18.1.tar.gz
-6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28  googletest-1.11.0.tar.gz"
+sha512sums="fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0  protobuf-3.20.1.tar.gz
+f7f804abf68af5e4e6cd767151773394fb8297d7d7fc878532ebb22b8c41d13554f68fa38a27470d458b590259a939e93cee7e5f5f6de8f1726c7ce85a606099  googletest-8d51dc50eb7e7698427fed81b85edad0e032112e.tar.gz"
-- 
cgit v1.2.3-60-g2f50