From a8504e1e6853bd0bda7243060f96449d3acc5bc0 Mon Sep 17 00:00:00 2001
From: kenmays <maybird1776@yahoo.com>
Date: Thu, 15 Feb 2024 03:38:56 -0800
Subject: [PATCH] libpcre2: bump to v10.42 (#9991)

* libpcre2: bump version
---
 ...cre2-10.39.recipe => libpcre2-10.42.recipe} | 12 ++++++------
 ...-10.39.patchset => libpcre2-10.42.patchset} | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename dev-libs/libpcre2/{libpcre2-10.39.recipe => libpcre2-10.42.recipe} (93%)
 rename dev-libs/libpcre2/patches/{libpcre2-10.39.patchset => libpcre2-10.42.patchset} (75%)

diff --git a/dev-libs/libpcre2/libpcre2-10.39.recipe b/dev-libs/libpcre2/libpcre2-10.42.recipe
similarity index 93%
rename from dev-libs/libpcre2/libpcre2-10.39.recipe
rename to dev-libs/libpcre2/libpcre2-10.42.recipe
index 1718937eb..2be25b16d 100644
--- a/dev-libs/libpcre2/libpcre2-10.39.recipe
+++ b/dev-libs/libpcre2/libpcre2-10.42.recipe
@@ -7,19 +7,19 @@ even for building proprietary software.
 PCRE2 is a re-working of the original PCRE library to provide an entirely new \
 API."
 HOMEPAGE="https://www.pcre.org/"
-COPYRIGHT="1997-2017 University of Cambridge"
+COPYRIGHT="1997-2022 University of Cambridge"
 LICENSE="PCRE"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$portVersion/pcre2-$portVersion.tar.bz2"
-CHECKSUM_SHA256="0f03caf57f81d9ff362ac28cd389c055ec2bf0678d277349a1a4bee00ad6d440"
+CHECKSUM_SHA256="8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840"
 SOURCE_DIR="pcre2-$portVersion"
 PATCHES="libpcre2-$portVersion.patchset"
 
 ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86 x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
-libpcre2Version="0.10.4"
-libpcre2posixVersion="3.0.1"
+libpcre2Version="0.11.2"
+libpcre2posixVersion="3.0.4"
 libpcre2VersionCompat="$libpcre2Version compat >= ${libpcre2Version%%.*}"
 libpcre2posixVersionCompat="$libpcre2posixVersion compat >= ${libpcre2posixVersion%%.*}"
 portVersionCompat="$portVersion compat >= 10"
diff --git a/dev-libs/libpcre2/patches/libpcre2-10.39.patchset b/dev-libs/libpcre2/patches/libpcre2-10.42.patchset
similarity index 75%
rename from dev-libs/libpcre2/patches/libpcre2-10.39.patchset
rename to dev-libs/libpcre2/patches/libpcre2-10.42.patchset
index 80b90d30e..b6f5c94be 100644
--- a/dev-libs/libpcre2/patches/libpcre2-10.39.patchset
+++ b/dev-libs/libpcre2/patches/libpcre2-10.42.patchset
@@ -1,14 +1,14 @@
-From bf4934e8a907b00cb9197b8c8d4edb463d897843 Mon Sep 17 00:00:00 2001
+From db4f91a001f4eb4c48fc4c82df7f1d1989ea87b7 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 30 Apr 2019 18:33:26 +0200
 Subject: gcc2 fix
 
 
 diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
-index db2ce65..f3b049f 100644
+index 0afd27c..24db5d8 100644
 --- a/src/pcre2_jit_compile.c
 +++ b/src/pcre2_jit_compile.c
-@@ -3759,6 +3759,8 @@ static void peek_char_back(compiler_common *common, sljit_u32 max, jump_list **b
+@@ -3833,6 +3833,8 @@ static void peek_char_back(compiler_common *common, sljit_u32 max, jump_list **b
  contain the start of the subject buffer. Affects TMP1, TMP2, and RETURN_ADDR. */
  DEFINE_COMPILER;
  
@@ -17,7 +17,7 @@ index db2ce65..f3b049f 100644
  #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
  struct sljit_jump *jump;
  #endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32 */
-@@ -3820,6 +3822,7 @@ if (common->invalid_utf)
+@@ -3894,6 +3896,7 @@ if (common->invalid_utf)
  #endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
  #endif /* SUPPORT_UNICODE */
  }
@@ -26,20 +26,20 @@ index db2ce65..f3b049f 100644
  #define READ_CHAR_UPDATE_STR_PTR 0x1
  #define READ_CHAR_UTF8_NEWLINE 0x2
 -- 
-2.30.2
+2.42.1
 
 
-From 3a4670bf68c77ad68c67b7c044aae99d01c627d1 Mon Sep 17 00:00:00 2001
+From ab93da802ce6618b9fddf9bf082a546a9d6963ce Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sun, 24 Nov 2019 11:14:44 +0100
 Subject: workaround broken setrlimit on Haiku.
 
 
 diff --git a/src/pcre2test.c b/src/pcre2test.c
-index 84987d7..ca7c3fa 100644
+index 4fa5884..397e8a0 100644
 --- a/src/pcre2test.c
 +++ b/src/pcre2test.c
-@@ -8717,7 +8717,9 @@ while (argc > 1 && argv[op][0] == '-' && argv[op][1] != 0)
+@@ -9016,7 +9016,9 @@ while (argc > 1 && argv[op][0] == '-' && argv[op][1] != 0)
        {
        fprintf(stderr, "pcre2test: setting stack size %luMiB failed: %s\n",
          (unsigned long int)stack_size, strerror(errno));
@@ -50,5 +50,5 @@ index 84987d7..ca7c3fa 100644
      op++;
      argc--;
 -- 
-2.30.2
+2.42.1