summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBuildTools2017-08-17 19:48:54 -0700
committerBuildTools2017-08-17 19:48:54 -0700
commitbed82036a8ccd82c51ed13f50948330901a0788c (patch)
treed7421f1a16eddfcdc49f9a14a5b2fa6e94405ec6
parent091bbabdf1aee14415b1d582c95ba59cb0bd1318 (diff)
downloadaur-bed82036a8ccd82c51ed13f50948330901a0788c.tar.gz
10.23
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD15
-rw-r--r--bug_2067.patch13
3 files changed, 31 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b46608dc392..c2152d30f79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Feb 25 10:59:04 UTC 2017
+# Fri Aug 18 02:48:41 UTC 2017
pkgbase = mingw-w64-pcre2
pkgdesc = A library that implements Perl 5-style regular expressions. 2nd version (mingw-w64)
- pkgver = 10.22
+ pkgver = 10.23
pkgrel = 1
url = http://www.pcre.org/
arch = any
@@ -12,14 +12,16 @@ pkgbase = mingw-w64-pcre2
makedepends = mingw-w64-bzip2
makedepends = mingw-w64-zlib
depends = mingw-w64-crt
- optdepends = mingw-w64-readline
+ optdepends = mingw-w64-wineditline
optdepends = mingw-w64-bzip2
optdepends = mingw-w64-zlib
options = staticlibs
options = !strip
options = !buildflags
- source = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.22.tar.bz2
- md5sums = c0c02517938ee2b0d350d53edf450664
+ source = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.23.tar.bz2
+ source = bug_2067.patch
+ md5sums = b2cd00ca7e24049040099b0a46bb3649
+ md5sums = 455e0e7bdb851f6c2fc5a208d880b49c
pkgname = mingw-w64-pcre2
diff --git a/PKGBUILD b/PKGBUILD
index 0f42ce5ef57..83f2396e006 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mingw-w64-pcre2
-pkgver=10.22
+pkgver=10.23
pkgrel=1
pkgdesc=" A library that implements Perl 5-style regular expressions. 2nd version (mingw-w64)"
arch=(any)
@@ -8,12 +8,19 @@ license=("BSD")
makedepends=(mingw-w64-configure mingw-w64-readline mingw-w64-bzip2 mingw-w64-zlib)
depends=(mingw-w64-crt)
options=(staticlibs !strip !buildflags)
-optdepends=(mingw-w64-readline mingw-w64-bzip2 mingw-w64-zlib)
-source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-$pkgver.tar.bz2")
-md5sums=('c0c02517938ee2b0d350d53edf450664')
+optdepends=(mingw-w64-wineditline mingw-w64-bzip2 mingw-w64-zlib)
+source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-$pkgver.tar.bz2"
+"bug_2067.patch")
+md5sums=('b2cd00ca7e24049040099b0a46bb3649'
+ '455e0e7bdb851f6c2fc5a208d880b49c')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+prepare() {
+ cd "$srcdir/pcre2-$pkgver"
+ patch -p1 -i ../bug_2067.patch
+}
+
build() {
cd "$srcdir/pcre2-$pkgver"
for _arch in ${_architectures}; do
diff --git a/bug_2067.patch b/bug_2067.patch
new file mode 100644
index 00000000000..be0100814b4
--- /dev/null
+++ b/bug_2067.patch
@@ -0,0 +1,13 @@
+diff --git a/src/pcre2grep.c b/src/pcre2grep.c
+index e98d743..f00dac2 100644
+--- a/src/pcre2grep.c
++++ b/src/pcre2grep.c
+@@ -628,7 +628,7 @@ z/OS, and "no support". */
+
+ /************* Directory scanning Unix-style and z/OS ***********/
+
+-#if (defined HAVE_SYS_STAT_H && defined HAVE_DIRENT_H && defined HAVE_SYS_TYPES_H) || defined NATIVE_ZOS
++#if ((defined HAVE_SYS_STAT_H && defined HAVE_DIRENT_H && defined HAVE_SYS_TYPES_H) || defined NATIVE_ZOS) && !defined WIN32
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>