diff --git a/pcre2/0001-Allow-building-an-MSYS-DLL.patch b/pcre2/0001-Allow-building-an-MSYS-DLL.patch index c822a31f5d3..26166c9e495 100644 --- a/pcre2/0001-Allow-building-an-MSYS-DLL.patch +++ b/pcre2/0001-Allow-building-an-MSYS-DLL.patch @@ -1,4 +1,4 @@ -From 59176104933cb63074a9b611cb4669770c7fc0a3 Mon Sep 17 00:00:00 2001 +From 2f936020bd0534203d431cdb2c415518df7f167b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 13 Dec 2022 15:18:52 +0100 Subject: [PATCH 1/3] Allow building an MSYS DLL @@ -9,10 +9,10 @@ Signed-off-by: Johannes Schindelin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 6091ea4..9afc110 100644 +index 27b0fe2..87a3e07 100644 --- a/configure.ac +++ b/configure.ac -@@ -932,7 +932,7 @@ fi +@@ -970,7 +970,7 @@ fi NO_UNDEFINED= EXPORT_ALL_SYMBOLS= case $host_os in diff --git a/pcre2/0002-RunTest-adjust-ISO-8859-1-tests-for-Cygwin.patch b/pcre2/0002-RunTest-adjust-ISO-8859-1-tests-for-Cygwin.patch index 30bbee5b83b..f7e996a9423 100644 --- a/pcre2/0002-RunTest-adjust-ISO-8859-1-tests-for-Cygwin.patch +++ b/pcre2/0002-RunTest-adjust-ISO-8859-1-tests-for-Cygwin.patch @@ -1,4 +1,4 @@ -From 9d466b31c059f7045c5f424d1ddc57438c5f2284 Mon Sep 17 00:00:00 2001 +From f4312bcb770b4c11e451dbe70807a8624c48c73e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 2 Jun 2017 17:54:57 +0200 Subject: [PATCH 2/3] RunTest: adjust ISO-8859-1 tests for Cygwin @@ -33,7 +33,7 @@ Signed-off-by: Johannes Schindelin 1 file changed, 38 insertions(+) diff --git a/RunTest b/RunTest -index d426a59..f0df2bb 100755 +index dafef3e..9f3e7a6 100755 --- a/RunTest +++ b/RunTest @@ -572,6 +572,44 @@ for bmode in "$test8" "$test16" "$test32"; do @@ -61,7 +61,7 @@ index d426a59..f0df2bb 100755 + s/\xaa \xb5 \xba // + # rewrap after removing three characters + N;N -+ s/\(\n *\)\(. . . \)/\2\1/g ++ s/\(\n *\)\( . . .\)/\2\1/g + } + + # test E-circumflex and U-acute which Cygwin considers diff --git a/pcre2/0003-pcre2-10.40-cygwin-jit.patch b/pcre2/0003-pcre2-10.40-cygwin-jit.patch index 5e4585a1ea9..cbffd15e610 100644 --- a/pcre2/0003-pcre2-10.40-cygwin-jit.patch +++ b/pcre2/0003-pcre2-10.40-cygwin-jit.patch @@ -1,20 +1,20 @@ -From ded6ccc89556e1bd5ab448f58e3a1103c11bddf5 Mon Sep 17 00:00:00 2001 +From 644325d16aa9c5be6632768053a73f23c91ea5e0 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 12 May 2016 20:52:27 -0500 Subject: [PATCH 3/3] pcre2-10.40-cygwin-jit Originally added in https://cygwin.com/git-cygwin-packages/?p=git/cygwin-packages/pcre2.git;a=commit;h=d2472e4e74b52cb7f0936f8978c955b311fb71c3 --- - src/sljit/sljitConfigInternal.h | 6 ++-- - src/sljit/sljitNativeX86_64.c | 50 +++++++++++++++---------------- - src/sljit/sljitNativeX86_common.c | 16 +++++----- + deps/sljit/sljit_src/sljitConfigInternal.h | 6 +-- + deps/sljit/sljit_src/sljitNativeX86_64.c | 50 ++++++++++---------- + deps/sljit/sljit_src/sljitNativeX86_common.c | 16 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) -diff --git a/src/sljit/sljitConfigInternal.h b/src/sljit/sljitConfigInternal.h -index de06dd8..67daa14 100644 ---- a/src/sljit/sljitConfigInternal.h -+++ b/src/sljit/sljitConfigInternal.h -@@ -602,15 +602,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void *code); +diff --git a/deps/sljit/sljit_src/sljitConfigInternal.h b/deps/sljit/sljit_src/sljitConfigInternal.h +index 3ae944e..c58c3be 100644 +--- a/deps/sljit/sljit_src/sljitConfigInternal.h ++++ b/deps/sljit/sljit_src/sljitConfigInternal.h +@@ -617,15 +617,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void *code); #define SLJIT_NUMBER_OF_TEMPORARY_REGISTERS 2 #define SLJIT_NUMBER_OF_FLOAT_REGISTERS 15 #define SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS 1 @@ -27,16 +27,16 @@ index de06dd8..67daa14 100644 +#else /* _WIN64 || __CYGWIN__ */ #define SLJIT_NUMBER_OF_SAVED_REGISTERS 8 #define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 10 - #define SLJIT_LOCALS_OFFSET_BASE (4 * SSIZE_OF(sw)) + #define SLJIT_LOCALS_OFFSET_BASE (4 * (sljit_s32)sizeof(sljit_sw)) -#endif /* !_WIN64 */ +#endif /* !_WIN64 && !__CYGWIN__ */ #define SLJIT_TMP_DEST_REG SLJIT_TMP_R0 #define SLJIT_TMP_MEM_REG SLJIT_TMP_R0 #define SLJIT_TMP_DEST_FREG SLJIT_TMP_FR0 -diff --git a/src/sljit/sljitNativeX86_64.c b/src/sljit/sljitNativeX86_64.c -index 1ab7929..d748fa7 100644 ---- a/src/sljit/sljitNativeX86_64.c -+++ b/src/sljit/sljitNativeX86_64.c +diff --git a/deps/sljit/sljit_src/sljitNativeX86_64.c b/deps/sljit/sljit_src/sljitNativeX86_64.c +index e4d3db8..3862568 100644 +--- a/deps/sljit/sljit_src/sljitNativeX86_64.c ++++ b/deps/sljit/sljit_src/sljitNativeX86_64.c @@ -447,7 +447,7 @@ static sljit_u8* generate_mov_addr_code(struct sljit_jump *jump, sljit_u8 *code_ return code_ptr; } @@ -46,12 +46,14 @@ index 1ab7929..d748fa7 100644 typedef struct { sljit_sw regs[2]; } sljit_sse2_reg; -@@ -461,11 +461,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi +@@ -461,13 +461,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi sljit_s32 word_arg_count = 0; sljit_s32 saved_arg_count = SLJIT_KEPT_SAVEDS_COUNT(options); sljit_s32 saved_regs_size, tmp, i; -#ifdef _WIN64 +#if defined _WIN64 || defined __CYGWIN__ + sljit_s32 fscratches; + sljit_s32 fsaveds; sljit_s32 saved_float_regs_size; sljit_s32 saved_float_regs_offset = 0; sljit_s32 float_arg_count = 0; @@ -60,7 +62,7 @@ index 1ab7929..d748fa7 100644 sljit_u8 *inst; CHECK_ERROR(); -@@ -504,7 +504,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi +@@ -513,7 +513,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi PUSH_REG(reg_lmap[i]); } @@ -69,7 +71,7 @@ index 1ab7929..d748fa7 100644 local_size += SLJIT_LOCALS_OFFSET; saved_float_regs_size = GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, sse2_reg); -@@ -512,16 +512,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi +@@ -521,16 +521,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi saved_float_regs_offset = ((local_size + 0xf) & ~0xf); local_size = saved_float_regs_offset + saved_float_regs_size; } @@ -89,7 +91,7 @@ index 1ab7929..d748fa7 100644 switch (word_arg_count) { case 0: tmp = SLJIT_R2; -@@ -536,7 +536,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi +@@ -545,7 +545,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi tmp = SLJIT_R3; break; } @@ -98,7 +100,7 @@ index 1ab7929..d748fa7 100644 switch (word_arg_count + float_arg_count) { case 0: tmp = SLJIT_R3; -@@ -551,7 +551,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi +@@ -560,7 +560,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi tmp = TMP_REG1; break; } @@ -107,7 +109,7 @@ index 1ab7929..d748fa7 100644 if (arg_types & SLJIT_ARG_TYPE_SCRATCH_REG) { if (tmp != SLJIT_R0 + word_arg_count) EMIT_MOV(compiler, SLJIT_R0 + word_arg_count, 0, tmp, 0); -@@ -561,13 +561,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi +@@ -570,13 +570,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi } word_arg_count++; } else { @@ -123,7 +125,7 @@ index 1ab7929..d748fa7 100644 } arg_types >>= SLJIT_ARG_SHIFT; } -@@ -575,7 +575,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi +@@ -584,7 +584,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi local_size = ((local_size + saved_regs_size + 0xf) & ~0xf) - saved_regs_size; compiler->local_size = local_size; @@ -132,7 +134,7 @@ index 1ab7929..d748fa7 100644 if (local_size > 0) { if (local_size <= 4 * 4096) { if (local_size > 4096) -@@ -604,12 +604,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi +@@ -613,12 +613,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi if (local_size > 0) EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_MEM1(SLJIT_SP), -local_size); } @@ -147,7 +149,7 @@ index 1ab7929..d748fa7 100644 if (saved_float_regs_size > 0) { compiler->mode32 = 1; -@@ -624,7 +624,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi +@@ -633,7 +633,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi saved_float_regs_offset += 16; } } @@ -156,24 +158,30 @@ index 1ab7929..d748fa7 100644 return SLJIT_SUCCESS; } -@@ -634,23 +634,23 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *comp - sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size) +@@ -643,11 +643,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *comp + sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size) { sljit_s32 saved_regs_size; -#ifdef _WIN64 +#if defined _WIN64 || defined __CYGWIN__ + sljit_s32 fscratches; + sljit_s32 fsaveds; sljit_s32 saved_float_regs_size; -#endif /* _WIN64 */ +#endif /* _WIN64 || __CYGWIN__ */ CHECK_ERROR(); - CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size)); - set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size); + CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size)); +@@ -655,7 +655,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *comp + + scratches = ENTER_GET_REGS(scratches); -#ifdef _WIN64 +#if defined _WIN64 || defined __CYGWIN__ - local_size += SLJIT_LOCALS_OFFSET; - saved_float_regs_size = GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, sse2_reg); + saveds = ENTER_GET_REGS(saveds); + fscratches = compiler->fscratches; + fsaveds = compiler->fsaveds; +@@ -665,9 +665,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *comp if (saved_float_regs_size > 0) local_size = ((local_size + 0xf) & ~0xf) + saved_float_regs_size; @@ -185,7 +193,7 @@ index 1ab7929..d748fa7 100644 /* Including the return address saved by the call instruction. */ saved_regs_size = GET_SAVED_REGISTERS_SIZE(scratches, saveds - SLJIT_KEPT_SAVEDS_COUNT(options), 1); -@@ -663,13 +663,13 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit +@@ -680,13 +680,13 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit sljit_uw size; sljit_s32 local_size, i, tmp; sljit_u8 *inst; @@ -202,7 +210,7 @@ index 1ab7929..d748fa7 100644 saved_float_regs_offset = GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, sse2_reg); if (saved_float_regs_offset > 0) { -@@ -689,7 +689,7 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit +@@ -706,7 +706,7 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit compiler->mode32 = 0; } @@ -211,7 +219,7 @@ index 1ab7929..d748fa7 100644 local_size = compiler->local_size; -@@ -766,7 +766,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return_to(struct sljit_compiler *c +@@ -783,7 +783,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return_to(struct sljit_compiler *c /* Call / return instructions */ /* --------------------------------------------------------------------- */ @@ -220,10 +228,10 @@ index 1ab7929..d748fa7 100644 static sljit_s32 call_with_args(struct sljit_compiler *compiler, sljit_s32 arg_types, sljit_s32 *src_ptr) { -diff --git a/src/sljit/sljitNativeX86_common.c b/src/sljit/sljitNativeX86_common.c -index ecb7e9b..91dfcc8 100644 ---- a/src/sljit/sljitNativeX86_common.c -+++ b/src/sljit/sljitNativeX86_common.c +diff --git a/deps/sljit/sljit_src/sljitNativeX86_common.c b/deps/sljit/sljit_src/sljitNativeX86_common.c +index 9f599d5..1113bc4 100644 +--- a/deps/sljit/sljit_src/sljitNativeX86_common.c ++++ b/deps/sljit/sljit_src/sljitNativeX86_common.c @@ -88,7 +88,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2] = { /* Note: r12 & 0x7 == 0b100, which decoded as SIB byte present Note: avoid to use r12 and r13 for memory addressing @@ -242,7 +250,7 @@ index ecb7e9b..91dfcc8 100644 #define HALFWORD_MAX 0x7fffffffl #define HALFWORD_MIN -0x80000000l #else -@@ -1377,7 +1377,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile +@@ -1409,7 +1409,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile case SLJIT_DIV_UW: case SLJIT_DIV_SW: #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) @@ -251,7 +259,7 @@ index ecb7e9b..91dfcc8 100644 SLJIT_ASSERT( reg_map[SLJIT_R0] == 0 && reg_map[SLJIT_R1] == 2 -@@ -1394,7 +1394,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile +@@ -1426,7 +1426,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile op = GET_OPCODE(op); if ((op | 0x2) == SLJIT_DIV_UW) { @@ -260,7 +268,7 @@ index ecb7e9b..91dfcc8 100644 EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_R1, 0); inst = emit_x86_instruction(compiler, 1, SLJIT_R1, 0, SLJIT_R1, 0); #else -@@ -1405,7 +1405,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile +@@ -1437,7 +1437,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile } if ((op | 0x2) == SLJIT_DIV_SW) { @@ -269,7 +277,7 @@ index ecb7e9b..91dfcc8 100644 EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_R1, 0); #endif -@@ -1430,7 +1430,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile +@@ -1462,7 +1462,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile inst[0] = GROUP_F7; inst[1] = MOD_REG | ((op >= SLJIT_DIVMOD_UW) ? reg_map[TMP_REG1] : reg_map[SLJIT_R1]); #else /* !SLJIT_CONFIG_X86_32 */ @@ -278,7 +286,7 @@ index ecb7e9b..91dfcc8 100644 size = (!compiler->mode32 || op >= SLJIT_DIVMOD_UW) ? 3 : 2; #else /* !_WIN64 */ size = (!compiler->mode32) ? 3 : 2; -@@ -1438,7 +1438,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile +@@ -1470,7 +1470,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile inst = (sljit_u8*)ensure_buf(compiler, 1 + size); FAIL_IF(!inst); INC_SIZE(size); @@ -287,7 +295,7 @@ index ecb7e9b..91dfcc8 100644 if (!compiler->mode32) *inst++ = REX_W | ((op >= SLJIT_DIVMOD_UW) ? REX_B : 0); else if (op >= SLJIT_DIVMOD_UW) -@@ -1468,7 +1468,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile +@@ -1500,7 +1500,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile inst[1] |= IDIV; break; } diff --git a/pcre2/PKGBUILD b/pcre2/PKGBUILD index 19cfacc35ab..c74fe0c3708 100644 --- a/pcre2/PKGBUILD +++ b/pcre2/PKGBUILD @@ -2,7 +2,7 @@ pkgbase=pcre2 pkgname=('pcre2' 'libpcre2_8' 'libpcre2_16' 'libpcre2_32' 'libpcre2posix' 'pcre2-devel') -pkgver=10.44 +pkgver=10.45 pkgrel=1 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('i686' 'x86_64') @@ -13,12 +13,12 @@ source=(https://github.com/PCRE2project/pcre2/releases/download/${pkgbase}-${pkg 0001-Allow-building-an-MSYS-DLL.patch 0002-RunTest-adjust-ISO-8859-1-tests-for-Cygwin.patch 0003-pcre2-10.40-cygwin-jit.patch) -sha256sums=('d34f02e113cf7193a1ebf2770d3ac527088d485d4e047ed10e5d217c6ef5de96' +sha256sums=('21547f3516120c75597e5b30a992e27a592a31950b5140e7b8bfde3f192033c4' 'SKIP' - '4130d1c668750006a91ad5217f3206642d5d57f4d86ce4465a09dfa3d051f245' - 'f1fb2eac8776ad338cdbe1db94050fa785d4ec7fc69f4c658ae26287b89f8acd' - '055755e4eb78bb684110e41980e3b8d7d960cecc370602e72bed0c5b880f4f99') -validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel + '75d0b002035698d427b31a81c2efc518beea17e0e410f59185ef02e599b45f04' + '0edaf45f742d388ddf96313e92d44f4942da2b0dc24ca0a0b47b5b223b6eee67' + 'e90e776d43a57767ac551e896e6191920577bbfc659bbd6fc6b48380c2c8fd44') +validpgpkeys=('A95536204A3BB489715231282A98E77EB6F24CA8') # Nicholas Wilson prepare() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -78,7 +78,7 @@ package_pcre2() { mkdir -p ${pkgdir}/usr/bin cp -f ${srcdir}/dest/usr/bin/*.exe ${pkgdir}/usr/bin/ cp -rf ${srcdir}/dest/usr/share ${pkgdir}/usr/ - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENCE.md "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.md } package_libpcre2_8() {