haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

libpcre2: bump version

Browse Source
This commit is contained in:
Jerome Duval
2022-02-24 18:14:30 +01:00
parent 838f976d30
commit eca4df69ed
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dev-libs/libpcre2/libpcre2-10.37.recipe → dev-libs/libpcre2/libpcre2-10.39.recipe
View File

@@ -10,16 +10,16 @@ HOMEPAGE="https://www.pcre.org/"
COPYRIGHT="1997-2017 University of Cambridge"
LICENSE="PCRE"
REVISION="1"
SOURCE_URI="https://ftp.pcre.org/pub/pcre/pcre2-$portVersion.tar.bz2"
CHECKSUM_SHA256="4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270"
SOURCE_URI="https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$portVersion/pcre2-$portVersion.tar.bz2"
CHECKSUM_SHA256="0f03caf57f81d9ff362ac28cd389c055ec2bf0678d277349a1a4bee00ad6d440"
SOURCE_DIR="pcre2-$portVersion"
PATCHES="libpcre2-$portVersion.patchset"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
libpcre2Version="0.10.2"
libpcre2posixVersion="3.0.0"
libpcre2Version="0.10.4"
libpcre2posixVersion="3.0.1"
libpcre2VersionCompat="$libpcre2Version compat >= ${libpcre2Version%%.*}"
libpcre2posixVersionCompat="$libpcre2posixVersion compat >= ${libpcre2posixVersion%%.*}"
portVersionCompat="$portVersion compat >= 10"

30
dev-libs/libpcre2/patches/libpcre2-10.37.patchset → dev-libs/libpcre2/patches/libpcre2-10.39.patchset
View File

@@ -1,45 +1,45 @@
From 03c1ce3a7e4d136494802d35162ce0b9635b6fdc Mon Sep 17 00:00:00 2001
From bf4934e8a907b00cb9197b8c8d4edb463d897843 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 f564127..35c8930 100644
index db2ce65..f3b049f 100644
--- a/src/pcre2_jit_compile.c
+++ b/src/pcre2_jit_compile.c
@@ -3952,6 +3952,8 @@ DEFINE_COMPILER;
SLJIT_UNUSED_ARG(backtracks);
SLJIT_UNUSED_ARG(must_be_valid);
@@ -3759,6 +3759,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;
+{
+
#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
struct sljit_jump *jump;
#endif
@@ -4027,6 +4029,7 @@ if (common->invalid_utf && !must_be_valid)
#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32 */
@@ -3820,6 +3822,7 @@ if (common->invalid_utf)
#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
#endif /* SUPPORT_UNICODE */
OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
}
+}
static void check_newlinechar(compiler_common *common, int nltype, jump_list **backtracks, BOOL jumpifmatch)
{
#define READ_CHAR_UPDATE_STR_PTR 0x1
#define READ_CHAR_UTF8_NEWLINE 0x2
--
2.24.0
2.30.2
From f3c74ee6806efba2623d5b0b2e36053fc22a4dd9 Mon Sep 17 00:00:00 2001
From 3a4670bf68c77ad68c67b7c044aae99d01c627d1 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 57bd110..5c219cf 100644
index 84987d7..ca7c3fa 100644
--- a/src/pcre2test.c
+++ b/src/pcre2test.c
@@ -8632,7 +8632,9 @@ while (argc > 1 && argv[op][0] == '-' && argv[op][1] != 0)
@@ -8717,7 +8717,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 57bd110..5c219cf 100644
op++;
argc--;
--
2.24.0
2.30.2