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

[Antonio Rojas]

    Date: Saturday, June 11, 2022 @ 13:29:53
  Author: arojas
Revision: 448170

Update to 21.1

Modified:
  protobuf/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-11 10:48:10 UTC (rev 448169)
+++ PKGBUILD	2022-06-11 13:29:53 UTC (rev 448170)
@@ -9,8 +9,9 @@
 
 pkgbase='protobuf'
 pkgname=('protobuf' 'python-protobuf')
-pkgver=3.20.1
-pkgrel=2
+pkgver=21.1
+_pkgver=3.$pkgver
+pkgrel=1
 pkgdesc="Protocol Buffers - Google's data interchange format"
 arch=('x86_64')
 url='https://developers.google.com/protocol-buffers/'
@@ -17,23 +18,19 @@
 license=('BSD')
 depends=('gcc-libs' 'glibc' 'zlib')
 makedepends=('unzip' 'python-setuptools')
-source=("https://github.com/protocolbuffers/$pkgname/releases/download/v$pkgver/$pkgname-all-$pkgver.tar.gz"
-         https://github.com/protocolbuffers/protobuf/commit/b180b280.patch)
-sha512sums=('8b32f944be76a4713084a9b18664d17bb6947fafa10412ebaf98f1cebb0e7650e0d9389d9bbb1d53df6c6e96c44467ec2e52cf1740b4e091ddb5f2c0ae9aa742'
-            '4b64418216b2e776a5471df887278b798385788c4de92e5c176f8b3505e5b522251fc45ae57b3f139ab4bf51b0d320c5bd4a655dd98c1b1da4b3347d0e3ba7f5')
+source=("https://github.com/protocolbuffers/$pkgname/releases/download/v$pkgver/$pkgname-all-$pkgver.tar.gz")
+sha512sums=('dad30603c9070bcc7121f7d32b0945ea28fabfed8ae0562735318a0123526bd612fea82761246a9de1b8ae5fe483dc91d69f721be6a055f03e4895151905f8e5')
 
 prepare() {
-  cd "$pkgbase-$pkgver"
+  cd "$pkgbase-$_pkgver"
   autoreconf -vfi
 
 # Don't fail tests on deprecation warnings
   sed -e "/DeprecationWarning/d" -i python/google/protobuf/internal/*test.py
-
-  patch -p1 -i ../b180b280.patch # Fix broken generated code with GCC 12.1
 }
 
 build() {
-  cd "$pkgbase-$pkgver"
+  cd "$pkgbase-$_pkgver"
   ./configure --prefix=/usr
   make
   cd python
@@ -41,7 +38,7 @@
 }
 
 check() {
-  cd "$pkgbase-$pkgver"
+  cd "$pkgbase-$_pkgver"
   make check
 
   cd python
@@ -52,7 +49,7 @@
   replaces=('protobuf-cpp')
   provides=('libprotoc.so' 'libprotobuf.so' 'libprotobuf-lite.so')
 
-  cd "$pkgbase-$pkgver"
+  cd "$pkgbase-$_pkgver"
   make DESTDIR="$pkgdir" install
 
   install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
@@ -67,7 +64,7 @@
   depends=('python' 'python-six' "protobuf=$pkgver")
 
   local python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
-  cd "$pkgbase-$pkgver"
+  cd "$pkgbase-$_pkgver"
   (
     cd python
     PYTHONPATH="$PWD/build/lib.linux-$CARCH-${python_version}:PYTHONPATH" \