diff options
| author | Ali Mohammad Pur <ali.mpfard@gmail.com> | 2022-05-16 23:09:40 +0430 |
|---|---|---|
| committer | Ali Mohammad Pur <Ali.mpfard@gmail.com> | 2022-05-19 20:17:10 +0430 |
| commit | 9e12cd00986cdc6351c01c273c7f4a1789a80ea2 (patch) | |
| tree | df352e981925fdc0643e0b8a6fc7658fab609342 | |
| parent | 5b91e02dc91e84cc7fcf503ae4d1237741f4f66b (diff) | |
| download | serenity-9e12cd00986cdc6351c01c273c7f4a1789a80ea2.zip | |
Ports: Update pcre2's patches to use git patches
| -rw-r--r-- | Ports/pcre2/patches/0001-Disable-pcre2test-s-S-flag-on-serenity.patch | 25 | ||||
| -rw-r--r-- | Ports/pcre2/patches/ReadMe.md | 7 | ||||
| -rw-r--r-- | Ports/pcre2/patches/fix-pcre2test.patch | 11 |
3 files changed, 32 insertions, 11 deletions
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 new file mode 100644 index 0000000000..6dc9152bcd --- /dev/null +++ b/Ports/pcre2/patches/0001-Disable-pcre2test-s-S-flag-on-serenity.patch @@ -0,0 +1,25 @@ +From b393ee4471f82747803f0c557d9a7895a4b293b3 Mon Sep 17 00:00:00 2001 +From: Brian Callahan <bcallah@openbsd.org> +Date: Thu, 23 Jan 2020 23:43:31 -0500 +Subject: [PATCH] Disable pcre2test's `-S` flag on serenity + +--- + src/pcre2test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pcre2test.c b/src/pcre2test.c +index 84987d7..35a7a5a 100644 +--- a/src/pcre2test.c ++++ b/src/pcre2test.c +@@ -8689,7 +8689,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__) + fprintf(stderr, "pcre2test: -S is not supported on this OS\n"); + exit(1); + #else +-- +2.36.1 + diff --git a/Ports/pcre2/patches/ReadMe.md b/Ports/pcre2/patches/ReadMe.md new file mode 100644 index 0000000000..d24d3a96e6 --- /dev/null +++ b/Ports/pcre2/patches/ReadMe.md @@ -0,0 +1,7 @@ +# Patches for pcre2 on SerenityOS + +## `0001-Disable-pcre2test-s-S-flag-on-serenity.patch` + +Disable pcre2test's `-S` flag on serenity + + diff --git a/Ports/pcre2/patches/fix-pcre2test.patch b/Ports/pcre2/patches/fix-pcre2test.patch deleted file mode 100644 index 96ba5f825b..0000000000 --- a/Ports/pcre2/patches/fix-pcre2test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pcre2-10.34/src/pcre2test.c.orig Sun Jan 19 18:24:43 2020 -+++ pcre2-10.34/src/pcre2test.c Sun Jan 19 18:24:59 2020 -@@ -8604,7 +8604,7 @@ - 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__) - fprintf(stderr, "pcre2test: -S is not supported on this OS\n"); - exit(1); - #else |