perl-re-engine-re2 0.14-1: Update to new version

3 files changed, 14 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 769646fd4de3..9db7a6d0e1fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = perl-re-engine-re2
 	pkgdesc = Module for handling arrays using integer ranges
-	pkgver = 0.13
+	pkgver = 0.14
 	pkgrel = 1
 	url = https://github.com/dgl/re-engine-RE2
 	arch = x86_64
@@ -9,14 +9,11 @@ pkgbase = perl-re-engine-re2
 	makedepends = perl-extutils-cppguess
 	depends = perl
 	depends = re2
-	source = https://www.cpan.org/modules/by-module/re/re-engine-RE2-0.13.tar.gz
+	source = https://www.cpan.org/modules/by-module/re/re-engine-RE2-0.14.tar.gz
+	source = use-c++11-for-re2.patch::https://github.com/dgl/re-engine-RE2/pull/5.patch
 	source = https://rt.cpan.org/Ticket/Attachment/1183237/624278/re-engine-RE2-0.11-Unbundle-re2.patch
-	source = perl5.24.patch::https://github.com/dgl/re-engine-RE2/pull/1.patch
-	source = perl5.29.9.patch
-	sha512sums = c0c04f9115b4d84786bbac7de461a2b133dcea3986f2586739d9aabc8c50b0bd66409118d9cc3397236a138c78779327844abe48d116b0b56d82e40311520cca
+	sha512sums = 8eab9d55185af7e5356e90c9e63495d65f4b4ace6aff3828f7178fab0104bcd8c7f58b52e49e1f24cd394183e9455b11c7a1ad2a13986c1c3ff6e11ebe5c0dbe
+	sha512sums = c45fea8fe500752d1b6ea31186d0991175e289258b0a9ba35a5db98d6ff8245f8ffdfdd283fec261d3672d2f52cd9bef3c15fe9b7fc2ee18965b9f653afb77ea
 	sha512sums = c3bda383bd7c81666c1770f12728b3dce653c90b43b3ddb98268bfd59bb14247750bdb1f36d20b5d3b943910298375747360da1d7e10fd22438a66a5d2395cce
-	sha512sums = 811c997ccccd908daa91fbc70b91d16c6672532e86b79b1bcdd68ef1e60334c6babeeee5c68256b08b55c9d545b23aabf2944ea3a110116314a02fe601196d81
-	sha512sums = 35fa432ea26d975a9a163cf41316e7816fc4ef74b5342996055bb4900aa5c370a9ba0c82a8f05c9f20d36d078c1b8484aa703267a41e738894c2e9f85ac053e0
 
 pkgname = perl-re-engine-re2
-
diff --git a/PKGBUILD b/PKGBUILD
index 1639f4e22df1..32ccb28c8e1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
 
 pkgname=perl-re-engine-re2
-pkgver=0.13
+pkgver=0.14
 pkgrel=1
 pkgdesc="Module for handling arrays using integer ranges"
 arch=('x86_64')
@@ -10,26 +10,23 @@ license=('GPL' 'PerlArtistic')
 depends=('perl' 're2')
 makedepends=('perl-extutils-cppguess')
 source=("https://www.cpan.org/modules/by-module/re/re-engine-RE2-${pkgver}.tar.gz"
-        "https://rt.cpan.org/Ticket/Attachment/1183237/624278/re-engine-RE2-0.11-Unbundle-re2.patch"
-        "perl5.24.patch::https://github.com/dgl/re-engine-RE2/pull/1.patch"
-        "perl5.29.9.patch")
-sha512sums=('c0c04f9115b4d84786bbac7de461a2b133dcea3986f2586739d9aabc8c50b0bd66409118d9cc3397236a138c78779327844abe48d116b0b56d82e40311520cca'
-            'c3bda383bd7c81666c1770f12728b3dce653c90b43b3ddb98268bfd59bb14247750bdb1f36d20b5d3b943910298375747360da1d7e10fd22438a66a5d2395cce'
-            '811c997ccccd908daa91fbc70b91d16c6672532e86b79b1bcdd68ef1e60334c6babeeee5c68256b08b55c9d545b23aabf2944ea3a110116314a02fe601196d81'
-            '35fa432ea26d975a9a163cf41316e7816fc4ef74b5342996055bb4900aa5c370a9ba0c82a8f05c9f20d36d078c1b8484aa703267a41e738894c2e9f85ac053e0')
+        "use-c++11-for-re2.patch::https://github.com/dgl/re-engine-RE2/pull/5.patch"
+        "https://rt.cpan.org/Ticket/Attachment/1183237/624278/re-engine-RE2-0.11-Unbundle-re2.patch")
+sha512sums=('8eab9d55185af7e5356e90c9e63495d65f4b4ace6aff3828f7178fab0104bcd8c7f58b52e49e1f24cd394183e9455b11c7a1ad2a13986c1c3ff6e11ebe5c0dbe'
+            'c45fea8fe500752d1b6ea31186d0991175e289258b0a9ba35a5db98d6ff8245f8ffdfdd283fec261d3672d2f52cd9bef3c15fe9b7fc2ee18965b9f653afb77ea'
+            'c3bda383bd7c81666c1770f12728b3dce653c90b43b3ddb98268bfd59bb14247750bdb1f36d20b5d3b943910298375747360da1d7e10fd22438a66a5d2395cce')
 
 prepare() {
   cd "${srcdir}/re-engine-RE2-${pkgver}"
 
+  patch -Rp1 < "${srcdir}/use-c++11-for-re2.patch"
   patch -Np1 < "${srcdir}/re-engine-RE2-0.11-Unbundle-re2.patch"
-  patch -Np1 < "${srcdir}/perl5.24.patch"
-  patch -Np1 < "${srcdir}/perl5.29.9.patch"
 }
 
 build() {
   cd "${srcdir}/re-engine-RE2-${pkgver}"
 
-  perl Makefile.PL NO_PACKLIST=true
+  perl Makefile.PL NO_PACKLIST=true NO_PERLLOCAL=true
   make
 }
 
@@ -42,5 +39,5 @@ check() {
 package() {
   cd "${srcdir}/re-engine-RE2-${pkgver}"
 
-  make pure_install INSTALLDIRS=vendor DESTDIR="${pkgdir}"
+  make install INSTALLDIRS=vendor DESTDIR="${pkgdir}"
 }
diff --git a/perl5.29.9.patch b/perl5.29.9.patch
deleted file mode 100644
index 3445e10b1e7e..000000000000
--- a/perl5.29.9.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Based on https://github.com/rurban/re-engine-PCRE2/commit/6b5cc9b4e686910e25fa411c62711fdf44383285
---- package.pristine/t/01.basic.t	2014-08-09 12:11:06.000000000 +0200
-+++ package.new/t/01.basic.t	2020-05-12 20:44:30.693250260 +0200
-@@ -3,13 +3,13 @@
- use re::engine::RE2;
- 
- ok("Hello, world" !~ /Goodbye, world/);
--is($1, undef);
-+ok(!$1);
- 
- ok("Hello, world" =~ /Hello, (world)/);
- is($1, 'world');
- 
- no re::engine::RE2;
--is(eval '"Hello, world" =~ /(?<=Moose|Mo), (world)/', undef);
-+ok(!eval '"Hello, world" =~ /(?<=Moose|Mo), (world)/');
- 
- if (fork) {
-     ok(1);