From 6fd576d51323c7dc9e3fb492c510d12a2ff9e8e5 Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Fri, 22 Apr 2022 19:11:49 +0000
Subject: user/perl-re-engine-re2: bump { 0.13 --> 0.14 }. add patch for
 nullptr type mismatch. fixes #571.

---
 user/perl-re-engine-re2/APKBUILD                 |  9 ++++++---
 user/perl-re-engine-re2/fix-nullptr-retval.patch | 12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 user/perl-re-engine-re2/fix-nullptr-retval.patch

(limited to 'user')

diff --git a/user/perl-re-engine-re2/APKBUILD b/user/perl-re-engine-re2/APKBUILD
index dcee65c4e..3e5a51871 100644
--- a/user/perl-re-engine-re2/APKBUILD
+++ b/user/perl-re-engine-re2/APKBUILD
@@ -5,7 +5,7 @@ _pkgreal=re-engine-RE2
 _author=DGL
 _au=${_author%%"${_author#??}"}
 _a=${_author%%"${_author#?}"}
-pkgver=0.13
+pkgver=0.14
 pkgrel=0
 pkgdesc="RE2-based regex engine for Perl"
 url="https://metacpan.org/pod/re::engine::RE2"
@@ -15,7 +15,9 @@ license="(Artistic-2.0 OR GPL-2.0-only) AND BSD-3-Clause"
 depends="perl"
 makedepends="perl-dev perl-extutils-cppguess"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz
+	fix-nullptr-retval.patch
+	"
 builddir="$srcdir/re-engine-RE2-$pkgver"
 
 build() {
@@ -32,4 +34,5 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="c0c04f9115b4d84786bbac7de461a2b133dcea3986f2586739d9aabc8c50b0bd66409118d9cc3397236a138c78779327844abe48d116b0b56d82e40311520cca  re-engine-RE2-0.13.tar.gz"
+sha512sums="8eab9d55185af7e5356e90c9e63495d65f4b4ace6aff3828f7178fab0104bcd8c7f58b52e49e1f24cd394183e9455b11c7a1ad2a13986c1c3ff6e11ebe5c0dbe  re-engine-RE2-0.14.tar.gz
+d5e2171796bdeb2ce1fe3e449e62c847546a7d927b972e4ac7d5e3a700419d6db779c0ff20c15f6108a7bca3de13823cdf320e32dbbd1de68c83bc6f1a7ab35d  fix-nullptr-retval.patch"
diff --git a/user/perl-re-engine-re2/fix-nullptr-retval.patch b/user/perl-re-engine-re2/fix-nullptr-retval.patch
new file mode 100644
index 000000000..251d8e1ac
--- /dev/null
+++ b/user/perl-re-engine-re2/fix-nullptr-retval.patch
@@ -0,0 +1,12 @@
+diff -ur a/re2/re2/dfa.cc b/re2/re2/dfa.cc
+--- a/re2/re2/dfa.cc	2022-04-22 19:08:28.597201892 +0000
++++ b/re2/re2/dfa.cc	2022-04-22 19:09:19.608577242 +0000
+@@ -1734,7 +1734,7 @@
+     return false;
+   }
+   if (params.start == DeadState)
+-    return NULL;
++    return false;
+   if (params.start == FullMatchState) {
+     if (run_forward == want_earliest_match)
+       *epp = text.begin();
-- 
cgit v1.2.3-60-g2f50