summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEWouters <6179932+EWouters@users.noreply.github.com>2022-06-03 20:14:12 +0200
committerLinus Groh <mail@linusgroh.de>2022-06-08 11:40:31 +0100
commitbb98991ff800890a6947826ead7b3364407a58a0 (patch)
tree4b63aba3e7e6f4d8378678260325a9ade7c54262
parenta25ab52ee754ff724da8aa0ba92386ee878a63ad (diff)
downloadserenity-bb98991ff800890a6947826ead7b3364407a58a0.zip
Ports/pcre2: Update pcre2 to version 10.40
-rw-r--r--Ports/AvailablePorts.md2
-rwxr-xr-xPorts/pcre2/package.sh4
-rw-r--r--Ports/pcre2/patches/0001-Disable-pcre2test-s-S-flag-on-serenity.patch8
3 files changed, 7 insertions, 7 deletions
diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index ad507c00a4..6d9ddc78a3 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -173,7 +173,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`p7zip`](p7zip/) | p7zip | 17.04 | https://github.com/jinfeihan57/p7zip |
| [`patch`](patch/) | patch (GNU) | 2.7.6 | https://savannah.gnu.org/projects/patch/ |
| [`pcre`](pcre/) | Perl-compatible Regular Expressions (PCRE) | 8.45 | https://www.pcre.org/ |
-| [`pcre2`](pcre2/) | Perl-compatible Regular Expressions (PCRE2) | 10.39 | https://www.pcre.org/ |
+| [`pcre2`](pcre2/) | Perl-compatible Regular Expressions (PCRE2) | 10.40 | https://www.pcre.org/ |
| [`pfetch`](pfetch/) | pfetch | a906ff8 | https://github.com/dylanaraps/pfetch/ |
| [`php`](php/) | PHP | 8.1.4 | https://www.php.net/ |
| [`pkgconf`](pkgconf/) | pkgconf | 1.8.0 | https://github.com/pkgconf/pkgconf |
diff --git a/Ports/pcre2/package.sh b/Ports/pcre2/package.sh
index e4ebc34222..505d75bc14 100755
--- a/Ports/pcre2/package.sh
+++ b/Ports/pcre2/package.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env -S bash ../.port_include.sh
-port=pcre2
-version=10.39
+port='pcre2'
+version='10.40'
useconfigure=true
files="https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.gz pcre2-${version}.tar.gz
https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.gz.sig pcre2-${version}.tar.gz.sig"
diff --git a/Ports/pcre2/patches/0001-Disable-pcre2test-s-S-flag-on-serenity.patch b/Ports/pcre2/patches/0001-Disable-pcre2test-s-S-flag-on-serenity.patch
index 6dc9152bcd..60bc751b34 100644
--- a/Ports/pcre2/patches/0001-Disable-pcre2test-s-S-flag-on-serenity.patch
+++ b/Ports/pcre2/patches/0001-Disable-pcre2test-s-S-flag-on-serenity.patch
@@ -8,15 +8,15 @@ Subject: [PATCH] Disable pcre2test's `-S` flag on serenity
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pcre2test.c b/src/pcre2test.c
-index 84987d7..35a7a5a 100644
+index ea52a20..e9454c4 100644
--- a/src/pcre2test.c
+++ b/src/pcre2test.c
-@@ -8689,7 +8689,7 @@ while (argc > 1 && argv[op][0] == '-' && argv[op][1] != 0)
+@@ -8917,7 +8917,7 @@ while (argc > 1 && argv[op][0] == '-' && argv[op][1] != 0)
else if (strcmp(arg, "-S") == 0 && argc > 2 &&
((uli = strtoul(argv[op+1], &endptr, 10)), *endptr == 0))
{
--#if defined(_WIN32) || defined(WIN32) || defined(__minix) || defined(NATIVE_ZOS) || defined(__VMS)
-+#if defined(_WIN32) || defined(WIN32) || defined(__minix) || defined(NATIVE_ZOS) || defined(__VMS) || defined(__serenity__)
+-#if defined(_WIN32) || defined(WIN32) || defined(__HAIKU__) || defined(NATIVE_ZOS) || defined(__VMS)
++#if defined(_WIN32) || defined(WIN32) || defined(__HAIKU__) || defined(NATIVE_ZOS) || defined(__VMS) || defined(__serenity__)
fprintf(stderr, "pcre2test: -S is not supported on this OS\n");
exit(1);
#else