Re: [PR PATCH] [Updated] re2: update to 2022.02.01.

[tibequadorian <tibequadorian@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1206 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages re2
https://github.com/void-linux/void-packages/pull/35662

re2: update to 2022.02.01.
[ci skip]

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/35662.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-re2-35662.patch --]
[-- Type: text/x-diff, Size: 8729 bytes --]

From cafff21991d438931651f0abc5c57ef78a91a14a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Feb 2022 22:01:13 +0100
Subject: [PATCH 1/9] re2: update to 2022.02.01.

---
 common/shlibs        | 2 +-
 srcpkgs/re2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 250e1e0b8cb5..bca9463a1236 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1305,7 +1305,7 @@ librumpdev_audio.so.0 netbsd-rumpkernel-20140526_3
 librumpclient.so.0 netbsd-rumpkernel-20140526_3
 libdotconf.so.0 dotconf-1.3_1
 libspeechd.so.2 speech-dispatcher-0.8_1
-libre2.so.7 re2-2020.06.01_1
+libre2.so.9 re2-2022.02.01_1
 libminizip.so.1 minizip-1.2.7_1
 libsrtp2.so.1 libsrtp-2.1.0_1
 libjsoncpp.so.24 jsoncpp-1.9.4_1
diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template
index 8eda81468731..93291db9927f 100644
--- a/srcpkgs/re2/template
+++ b/srcpkgs/re2/template
@@ -1,6 +1,6 @@
 # Template file for 're2'
 pkgname=re2
-version=2020.06.01
+version=2022.02.01
 revision=1
 wrksrc="${pkgname}-${version//./-}"
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/google/re2"
 distfiles="${homepage}/archive/${version//./-}.tar.gz"
-checksum=fb8e0f4ed7a212e3420507f27933ef5a8c01aec70e5148c6a35313573269fae6
+checksum=9c1e6acfd0fed71f40b025a7a1dabaf3ee2ebb74d64ced1f9ee1b0b01d22fd27
 
 post_install() {
 	vlicense LICENSE

From c3de4410c249aa917418e55596355484f65fcd08 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Feb 2022 21:29:53 +0100
Subject: [PATCH 2/9] cbang: rebuild against re2-2022.02.01

---
 srcpkgs/cbang/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 63388b2aa828..85628bbf6c0a 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,7 +1,7 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=3
+revision=4
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"

From 5a180afd096b1b78e2edce40d45be9edce27e2eb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Feb 2022 21:29:53 +0100
Subject: [PATCH 3/9] chromium: rebuild against re2-2022.02.01

---
 srcpkgs/chromium/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 2708747046d7..c4774db14b49 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -3,6 +3,7 @@ pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
 version=99.0.4844.51
 revision=1
+revision=2
 archs="i686* x86_64* aarch64* armv7l* ppc64le*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From b228bcd578be51a5b2a1fd2adfc85eb7790b80c5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Feb 2022 21:29:53 +0100
Subject: [PATCH 4/9] dnsdist: rebuild against re2-2022.02.01

---
 srcpkgs/dnsdist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index 35d8e23b0c9f..e170df8749e9 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
 # Template file for 'dnsdist'
 pkgname=dnsdist
 version=1.7.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
  --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2

From 28ccb9b25aadb1f352273aa7381d80578e7898d4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Feb 2022 21:29:53 +0100
Subject: [PATCH 5/9] electron10: rebuild against re2-2022.02.01

---
 srcpkgs/electron10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index 05506dddcb37..6b027a78f742 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -1,12 +1,12 @@
 # Template file for 'electron10'
 pkgname=electron10
 version=10.4.7
+revision=3
 _nodever=12.16.3
 _chromiumver=85.0.4183.121
-revision=2
 archs="x86_64* i686* aarch64*"
-build_wrksrc="src"
 create_wrksrc=yes
+build_wrksrc="src"
 hostmakedepends="$(vopt_if clang clang) python pkgconf perl gperf bison ninja nodejs hwids
  libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel
  pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
@@ -23,7 +23,7 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
  minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
  re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel
  $(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel"
-short_desc="Cross platform application development framework based on web technologies"
+short_desc="Cross platform application framework based on web technologies"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://electronjs.org"

From 39b2be2bcc526c89ad1a0cc2df8e2d8be22e9f12 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Feb 2022 21:29:53 +0100
Subject: [PATCH 6/9] electron13: rebuild against re2-2022.02.01

---
 srcpkgs/electron13/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/electron13/template b/srcpkgs/electron13/template
index 1ceb6f788a62..bc3cb1613b45 100644
--- a/srcpkgs/electron13/template
+++ b/srcpkgs/electron13/template
@@ -1,7 +1,7 @@
 # Template file for 'electron13'
 pkgname=electron13
 version=13.6.7
-revision=1
+revision=2
 _nodever=14.16.0
 _chromiumver=91.0.4472.164
 archs="x86_64* i686* aarch64* ppc64le*"
@@ -299,10 +299,10 @@ do_configure() {
 		conf+=('symbol_level=0')
 	fi
 
-        # this does not work on ppc64 yet
-        case "$XBPS_TARGET_MACHINE" in
-                ppc64*) conf+=( "enable_jxl_decoder=false" );;
-        esac
+	# this does not work on ppc64 yet
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*) conf+=( "enable_jxl_decoder=false" );;
+	esac
 
 	conf+=(
 		'enable_hangout_services_extension=true'

From 1ed07b72c200e1f0490a1c183316910ff61a7641 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Feb 2022 21:29:54 +0100
Subject: [PATCH 7/9] grpc: rebuild against re2-2022.02.01

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 4805cc956328..1ab5150611e1 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -52,7 +52,7 @@ post_install() {
 	# Remove unnecessary absl static libs and cmake modules
 	rm "${DESTDIR}"/usr/lib/libabsl*.a
 	rm -rf "${DESTDIR}/usr/lib/cmake/absl"
-	
+
 	# Add custom absl include root to grpcpp cflags
 	vsed -e 's,^Cflags:.*,& -I${includedir}/grpc_absl,' \
 		-i ${DESTDIR}/usr/lib/pkgconfig/grpc++*.pc

From 6b08032f834c57ccbbac17be86d222ade91a1518 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Feb 2022 21:29:54 +0100
Subject: [PATCH 8/9] python3-grpcio: rebuild against re2-2022.02.01

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index aeed305988a1..68c1d4927438 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.39.0
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"

From fa6a721f1cbc69e7c4016d89bc9c656aabded990 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Feb 2022 21:29:54 +0100
Subject: [PATCH 9/9] qt5-webengine: rebuild against re2-2022.02.01

---
 srcpkgs/qt5-webengine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 213672ab215c..af54e123bd8d 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
 version=5.15.8
-revision=1
+revision=2
 _version="${version}-lts"
 _chromium_commit=8c0a9b4459f5200a24ab9e687a3fb32e975382e5
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"