Merge pull request #2981 from lazka/pcre2-update

pcre2: Update to 10.40

pcre2/PKGBUILD

@@ -2,32 +2,30 @@
 
 pkgbase=pcre2
 pkgname=('pcre2' 'libpcre2_8' 'libpcre2_16' 'libpcre2_32' 'libpcre2posix' 'pcre2-devel')
-pkgver=10.37
+pkgver=10.40
 pkgrel=1
 pkgdesc="A library that implements Perl 5-style regular expressions"
 arch=('i686' 'x86_64')
 url="https://www.pcre.org/"
 license=('BSD')
 makedepends=('libreadline-devel' 'libbz2-devel' 'zlib-devel' 'autotools' 'gcc')
-source=(https://ftp.pcre.org/pub/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}
+source=(https://github.com/PCRE2Project/pcre2/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-        pcre2-10.31-msys2.patch)
+sha256sums=('14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68'
-sha256sums=('4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270'
+            'SKIP')
-            'SKIP'
-            '3b1b15dbc5bb56cddd12069eb1173c93f76edf7355a1ee1da84f96333b1a5265')
 validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel <ph10@hermes.cam.ac.uk>
 
 prepare() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
-  # MSYS2 patches
-  patch -p1 -i ${srcdir}/pcre2-10.31-msys2.patch
   autoreconf -fi
 }
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
+
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-      --build=${CHOST} \
+      --build=${CYGWIN_CHOST} \
       --prefix=/usr \
       --disable-jit \
       --enable-pcre2-8 \

pcre2/pcre2-10.31-msys2.patch

@@ -1,25 +0,0 @@
-diff -Naur pcre2-10.31-orig/config.guess pcre2-10.31/config.guess
---- pcre2-10.31-orig/config.guess	2018-02-12 14:15:50.000000000 +0300
-+++ pcre2-10.31/config.guess	2018-06-26 10:00:07.094240500 +0300
-@@ -903,6 +903,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-pc-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
- 	exit ;;
-diff -Naur pcre2-10.31-orig/configure.ac pcre2-10.31/configure.ac
---- pcre2-10.31-orig/configure.ac	2018-02-12 14:15:35.000000000 +0300
-+++ pcre2-10.31/configure.ac	2018-06-26 10:00:07.094240500 +0300
-@@ -858,7 +858,7 @@
- NO_UNDEFINED=
- EXPORT_ALL_SYMBOLS=
- case $host_os in
--  cygwin* | mingw* )
-+  cygwin* | msys* | mingw* )
-     if test X"$enable_shared" = Xyes; then
-       NO_UNDEFINED="-no-undefined"
-       EXPORT_ALL_SYMBOLS="-Wl,--export-all-symbols"