summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Astals Cid2018-04-23 13:48:13 +0200
committerAlbert Astals Cid2018-04-23 13:48:52 +0200
commit05079f1a568b6645afac184a4899cbe19664123d (patch)
tree8d2777f03683344b1c363a13c28b452e6ce42431
parentc077674e5a59ec0b8d045a20e72e48ee777ec965 (diff)
downloadaur-05079f1a568b6645afac184a4899cbe19664123d.tar.gz
Don't seem to need this patch anymore
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--bug_2067.patch13
3 files changed, 4 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4e8b34560aa..14928858490 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mingw-w64-pcre2
pkgdesc = A library that implements Perl 5-style regular expressions. 2nd version (mingw-w64)
pkgver = 10.31
- pkgrel = 2
+ pkgrel = 3
url = http://www.pcre.org/
arch = any
license = BSD
@@ -17,9 +17,7 @@ pkgbase = mingw-w64-pcre2
options = !strip
options = !buildflags
source = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.31.tar.bz2
- source = bug_2067.patch
sha256sums = e07d538704aa65e477b6a392b32ff9fc5edf75ab9a40ddfc876186c4ff4d68ac
- sha256sums = 9b16b5e4ba28bddb1ed061e3562f1e900dfac4e887ca81059b9a168e10575402
pkgname = mingw-w64-pcre2
diff --git a/PKGBUILD b/PKGBUILD
index a1464135e73..e9869cd0e0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mingw-w64-pcre2
pkgver=10.31
-pkgrel=2
+pkgrel=3
pkgdesc=" A library that implements Perl 5-style regular expressions. 2nd version (mingw-w64)"
arch=(any)
url="http://www.pcre.org/"
@@ -9,16 +9,13 @@ makedepends=(mingw-w64-configure mingw-w64-readline mingw-w64-bzip2 mingw-w64-zl
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"
-"bug_2067.patch")
-sha256sums=('e07d538704aa65e477b6a392b32ff9fc5edf75ab9a40ddfc876186c4ff4d68ac'
- '9b16b5e4ba28bddb1ed061e3562f1e900dfac4e887ca81059b9a168e10575402')
+source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-$pkgver.tar.bz2")
+sha256sums=('e07d538704aa65e477b6a392b32ff9fc5edf75ab9a40ddfc876186c4ff4d68ac')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
prepare() {
cd "$srcdir/pcre2-$pkgver"
- patch -p1 -i ../bug_2067.patch
}
build() {
diff --git a/bug_2067.patch b/bug_2067.patch
deleted file mode 100644
index be0100814b4..00000000000
--- a/bug_2067.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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>