Skip to content

Commit 9457a26

Browse files
authored
Merge pull request #214 from git-for-windows/pcre2-10.45
pcre2: update to 10.45
2 parents fe9b973 + 5693efe commit 9457a26

File tree

4 files changed

+63
-55
lines changed

4 files changed

+63
-55
lines changed

pcre2/0001-Allow-building-an-MSYS-DLL.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 59176104933cb63074a9b611cb4669770c7fc0a3 Mon Sep 17 00:00:00 2001
1+
From 2f936020bd0534203d431cdb2c415518df7f167b Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Tue, 13 Dec 2022 15:18:52 +0100
44
Subject: [PATCH 1/3] Allow building an MSYS DLL
@@ -9,10 +9,10 @@ Signed-off-by: Johannes Schindelin <[email protected]>
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/configure.ac b/configure.ac
12-
index 6091ea4..9afc110 100644
12+
index 27b0fe2..87a3e07 100644
1313
--- a/configure.ac
1414
+++ b/configure.ac
15-
@@ -932,7 +932,7 @@ fi
15+
@@ -970,7 +970,7 @@ fi
1616
NO_UNDEFINED=
1717
EXPORT_ALL_SYMBOLS=
1818
case $host_os in

pcre2/0002-RunTest-adjust-ISO-8859-1-tests-for-Cygwin.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 9d466b31c059f7045c5f424d1ddc57438c5f2284 Mon Sep 17 00:00:00 2001
1+
From f4312bcb770b4c11e451dbe70807a8624c48c73e Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Fri, 2 Jun 2017 17:54:57 +0200
44
Subject: [PATCH 2/3] RunTest: adjust ISO-8859-1 tests for Cygwin
@@ -33,7 +33,7 @@ Signed-off-by: Johannes Schindelin <[email protected]>
3333
1 file changed, 38 insertions(+)
3434

3535
diff --git a/RunTest b/RunTest
36-
index d426a59..f0df2bb 100755
36+
index dafef3e..9f3e7a6 100755
3737
--- a/RunTest
3838
+++ b/RunTest
3939
@@ -572,6 +572,44 @@ for bmode in "$test8" "$test16" "$test32"; do
@@ -61,7 +61,7 @@ index d426a59..f0df2bb 100755
6161
+ s/\xaa \xb5 \xba //
6262
+ # rewrap after removing three characters
6363
+ N;N
64-
+ s/\(\n *\)\(. . . \)/\2\1/g
64+
+ s/\(\n *\)\( . . .\)/\2\1/g
6565
+ }
6666
+
6767
+ # test E-circumflex and U-acute which Cygwin considers

pcre2/0003-pcre2-10.40-cygwin-jit.patch

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
From ded6ccc89556e1bd5ab448f58e3a1103c11bddf5 Mon Sep 17 00:00:00 2001
1+
From 644325d16aa9c5be6632768053a73f23c91ea5e0 Mon Sep 17 00:00:00 2001
22
From: Yaakov Selkowitz <[email protected]>
33
Date: Thu, 12 May 2016 20:52:27 -0500
44
Subject: [PATCH 3/3] pcre2-10.40-cygwin-jit
55

66
Originally added in https://cygwin.com/git-cygwin-packages/?p=git/cygwin-packages/pcre2.git;a=commit;h=d2472e4e74b52cb7f0936f8978c955b311fb71c3
77
---
8-
src/sljit/sljitConfigInternal.h | 6 ++--
9-
src/sljit/sljitNativeX86_64.c | 50 +++++++++++++++----------------
10-
src/sljit/sljitNativeX86_common.c | 16 +++++-----
8+
deps/sljit/sljit_src/sljitConfigInternal.h | 6 +--
9+
deps/sljit/sljit_src/sljitNativeX86_64.c | 50 ++++++++++----------
10+
deps/sljit/sljit_src/sljitNativeX86_common.c | 16 +++----
1111
3 files changed, 36 insertions(+), 36 deletions(-)
1212

13-
diff --git a/src/sljit/sljitConfigInternal.h b/src/sljit/sljitConfigInternal.h
14-
index de06dd8..67daa14 100644
15-
--- a/src/sljit/sljitConfigInternal.h
16-
+++ b/src/sljit/sljitConfigInternal.h
17-
@@ -602,15 +602,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void *code);
13+
diff --git a/deps/sljit/sljit_src/sljitConfigInternal.h b/deps/sljit/sljit_src/sljitConfigInternal.h
14+
index 3ae944e..c58c3be 100644
15+
--- a/deps/sljit/sljit_src/sljitConfigInternal.h
16+
+++ b/deps/sljit/sljit_src/sljitConfigInternal.h
17+
@@ -617,15 +617,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void *code);
1818
#define SLJIT_NUMBER_OF_TEMPORARY_REGISTERS 2
1919
#define SLJIT_NUMBER_OF_FLOAT_REGISTERS 15
2020
#define SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS 1
@@ -27,16 +27,16 @@ index de06dd8..67daa14 100644
2727
+#else /* _WIN64 || __CYGWIN__ */
2828
#define SLJIT_NUMBER_OF_SAVED_REGISTERS 8
2929
#define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 10
30-
#define SLJIT_LOCALS_OFFSET_BASE (4 * SSIZE_OF(sw))
30+
#define SLJIT_LOCALS_OFFSET_BASE (4 * (sljit_s32)sizeof(sljit_sw))
3131
-#endif /* !_WIN64 */
3232
+#endif /* !_WIN64 && !__CYGWIN__ */
3333
#define SLJIT_TMP_DEST_REG SLJIT_TMP_R0
3434
#define SLJIT_TMP_MEM_REG SLJIT_TMP_R0
3535
#define SLJIT_TMP_DEST_FREG SLJIT_TMP_FR0
36-
diff --git a/src/sljit/sljitNativeX86_64.c b/src/sljit/sljitNativeX86_64.c
37-
index 1ab7929..d748fa7 100644
38-
--- a/src/sljit/sljitNativeX86_64.c
39-
+++ b/src/sljit/sljitNativeX86_64.c
36+
diff --git a/deps/sljit/sljit_src/sljitNativeX86_64.c b/deps/sljit/sljit_src/sljitNativeX86_64.c
37+
index e4d3db8..3862568 100644
38+
--- a/deps/sljit/sljit_src/sljitNativeX86_64.c
39+
+++ b/deps/sljit/sljit_src/sljitNativeX86_64.c
4040
@@ -447,7 +447,7 @@ static sljit_u8* generate_mov_addr_code(struct sljit_jump *jump, sljit_u8 *code_
4141
return code_ptr;
4242
}
@@ -46,12 +46,14 @@ index 1ab7929..d748fa7 100644
4646
typedef struct {
4747
sljit_sw regs[2];
4848
} sljit_sse2_reg;
49-
@@ -461,11 +461,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
49+
@@ -461,13 +461,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
5050
sljit_s32 word_arg_count = 0;
5151
sljit_s32 saved_arg_count = SLJIT_KEPT_SAVEDS_COUNT(options);
5252
sljit_s32 saved_regs_size, tmp, i;
5353
-#ifdef _WIN64
5454
+#if defined _WIN64 || defined __CYGWIN__
55+
sljit_s32 fscratches;
56+
sljit_s32 fsaveds;
5557
sljit_s32 saved_float_regs_size;
5658
sljit_s32 saved_float_regs_offset = 0;
5759
sljit_s32 float_arg_count = 0;
@@ -60,7 +62,7 @@ index 1ab7929..d748fa7 100644
6062
sljit_u8 *inst;
6163

6264
CHECK_ERROR();
63-
@@ -504,7 +504,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
65+
@@ -513,7 +513,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
6466
PUSH_REG(reg_lmap[i]);
6567
}
6668

@@ -69,7 +71,7 @@ index 1ab7929..d748fa7 100644
6971
local_size += SLJIT_LOCALS_OFFSET;
7072
saved_float_regs_size = GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, sse2_reg);
7173

72-
@@ -512,16 +512,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
74+
@@ -521,16 +521,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
7375
saved_float_regs_offset = ((local_size + 0xf) & ~0xf);
7476
local_size = saved_float_regs_offset + saved_float_regs_size;
7577
}
@@ -89,7 +91,7 @@ index 1ab7929..d748fa7 100644
8991
switch (word_arg_count) {
9092
case 0:
9193
tmp = SLJIT_R2;
92-
@@ -536,7 +536,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
94+
@@ -545,7 +545,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
9395
tmp = SLJIT_R3;
9496
break;
9597
}
@@ -98,7 +100,7 @@ index 1ab7929..d748fa7 100644
98100
switch (word_arg_count + float_arg_count) {
99101
case 0:
100102
tmp = SLJIT_R3;
101-
@@ -551,7 +551,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
103+
@@ -560,7 +560,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
102104
tmp = TMP_REG1;
103105
break;
104106
}
@@ -107,7 +109,7 @@ index 1ab7929..d748fa7 100644
107109
if (arg_types & SLJIT_ARG_TYPE_SCRATCH_REG) {
108110
if (tmp != SLJIT_R0 + word_arg_count)
109111
EMIT_MOV(compiler, SLJIT_R0 + word_arg_count, 0, tmp, 0);
110-
@@ -561,13 +561,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
112+
@@ -570,13 +570,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
111113
}
112114
word_arg_count++;
113115
} else {
@@ -123,7 +125,7 @@ index 1ab7929..d748fa7 100644
123125
}
124126
arg_types >>= SLJIT_ARG_SHIFT;
125127
}
126-
@@ -575,7 +575,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
128+
@@ -584,7 +584,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
127129
local_size = ((local_size + saved_regs_size + 0xf) & ~0xf) - saved_regs_size;
128130
compiler->local_size = local_size;
129131

@@ -132,7 +134,7 @@ index 1ab7929..d748fa7 100644
132134
if (local_size > 0) {
133135
if (local_size <= 4 * 4096) {
134136
if (local_size > 4096)
135-
@@ -604,12 +604,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
137+
@@ -613,12 +613,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
136138
if (local_size > 0)
137139
EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_MEM1(SLJIT_SP), -local_size);
138140
}
@@ -147,7 +149,7 @@ index 1ab7929..d748fa7 100644
147149
if (saved_float_regs_size > 0) {
148150
compiler->mode32 = 1;
149151

150-
@@ -624,7 +624,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
152+
@@ -633,7 +633,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
151153
saved_float_regs_offset += 16;
152154
}
153155
}
@@ -156,24 +158,30 @@ index 1ab7929..d748fa7 100644
156158

157159
return SLJIT_SUCCESS;
158160
}
159-
@@ -634,23 +634,23 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *comp
160-
sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
161+
@@ -643,11 +643,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *comp
162+
sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
161163
{
162164
sljit_s32 saved_regs_size;
163165
-#ifdef _WIN64
164166
+#if defined _WIN64 || defined __CYGWIN__
167+
sljit_s32 fscratches;
168+
sljit_s32 fsaveds;
165169
sljit_s32 saved_float_regs_size;
166170
-#endif /* _WIN64 */
167171
+#endif /* _WIN64 || __CYGWIN__ */
168172

169173
CHECK_ERROR();
170-
CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
171-
set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
174+
CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size));
175+
@@ -655,7 +655,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *comp
176+
177+
scratches = ENTER_GET_REGS(scratches);
172178

173179
-#ifdef _WIN64
174180
+#if defined _WIN64 || defined __CYGWIN__
175-
local_size += SLJIT_LOCALS_OFFSET;
176-
saved_float_regs_size = GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, sse2_reg);
181+
saveds = ENTER_GET_REGS(saveds);
182+
fscratches = compiler->fscratches;
183+
fsaveds = compiler->fsaveds;
184+
@@ -665,9 +665,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *comp
177185

178186
if (saved_float_regs_size > 0)
179187
local_size = ((local_size + 0xf) & ~0xf) + saved_float_regs_size;
@@ -185,7 +193,7 @@ index 1ab7929..d748fa7 100644
185193

186194
/* Including the return address saved by the call instruction. */
187195
saved_regs_size = GET_SAVED_REGISTERS_SIZE(scratches, saveds - SLJIT_KEPT_SAVEDS_COUNT(options), 1);
188-
@@ -663,13 +663,13 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit
196+
@@ -680,13 +680,13 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit
189197
sljit_uw size;
190198
sljit_s32 local_size, i, tmp;
191199
sljit_u8 *inst;
@@ -202,7 +210,7 @@ index 1ab7929..d748fa7 100644
202210
saved_float_regs_offset = GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, sse2_reg);
203211

204212
if (saved_float_regs_offset > 0) {
205-
@@ -689,7 +689,7 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit
213+
@@ -706,7 +706,7 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit
206214

207215
compiler->mode32 = 0;
208216
}
@@ -211,7 +219,7 @@ index 1ab7929..d748fa7 100644
211219

212220
local_size = compiler->local_size;
213221

214-
@@ -766,7 +766,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return_to(struct sljit_compiler *c
222+
@@ -783,7 +783,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return_to(struct sljit_compiler *c
215223
/* Call / return instructions */
216224
/* --------------------------------------------------------------------- */
217225

@@ -220,10 +228,10 @@ index 1ab7929..d748fa7 100644
220228

221229
static sljit_s32 call_with_args(struct sljit_compiler *compiler, sljit_s32 arg_types, sljit_s32 *src_ptr)
222230
{
223-
diff --git a/src/sljit/sljitNativeX86_common.c b/src/sljit/sljitNativeX86_common.c
224-
index ecb7e9b..91dfcc8 100644
225-
--- a/src/sljit/sljitNativeX86_common.c
226-
+++ b/src/sljit/sljitNativeX86_common.c
231+
diff --git a/deps/sljit/sljit_src/sljitNativeX86_common.c b/deps/sljit/sljit_src/sljitNativeX86_common.c
232+
index 9f599d5..1113bc4 100644
233+
--- a/deps/sljit/sljit_src/sljitNativeX86_common.c
234+
+++ b/deps/sljit/sljit_src/sljitNativeX86_common.c
227235
@@ -88,7 +88,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2] = {
228236
/* Note: r12 & 0x7 == 0b100, which decoded as SIB byte present
229237
Note: avoid to use r12 and r13 for memory addressing
@@ -242,7 +250,7 @@ index ecb7e9b..91dfcc8 100644
242250
#define HALFWORD_MAX 0x7fffffffl
243251
#define HALFWORD_MIN -0x80000000l
244252
#else
245-
@@ -1377,7 +1377,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
253+
@@ -1409,7 +1409,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
246254
case SLJIT_DIV_UW:
247255
case SLJIT_DIV_SW:
248256
#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
@@ -251,7 +259,7 @@ index ecb7e9b..91dfcc8 100644
251259
SLJIT_ASSERT(
252260
reg_map[SLJIT_R0] == 0
253261
&& reg_map[SLJIT_R1] == 2
254-
@@ -1394,7 +1394,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
262+
@@ -1426,7 +1426,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
255263

256264
op = GET_OPCODE(op);
257265
if ((op | 0x2) == SLJIT_DIV_UW) {
@@ -260,7 +268,7 @@ index ecb7e9b..91dfcc8 100644
260268
EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_R1, 0);
261269
inst = emit_x86_instruction(compiler, 1, SLJIT_R1, 0, SLJIT_R1, 0);
262270
#else
263-
@@ -1405,7 +1405,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
271+
@@ -1437,7 +1437,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
264272
}
265273

266274
if ((op | 0x2) == SLJIT_DIV_SW) {
@@ -269,7 +277,7 @@ index ecb7e9b..91dfcc8 100644
269277
EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_R1, 0);
270278
#endif
271279

272-
@@ -1430,7 +1430,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
280+
@@ -1462,7 +1462,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
273281
inst[0] = GROUP_F7;
274282
inst[1] = MOD_REG | ((op >= SLJIT_DIVMOD_UW) ? reg_map[TMP_REG1] : reg_map[SLJIT_R1]);
275283
#else /* !SLJIT_CONFIG_X86_32 */
@@ -278,7 +286,7 @@ index ecb7e9b..91dfcc8 100644
278286
size = (!compiler->mode32 || op >= SLJIT_DIVMOD_UW) ? 3 : 2;
279287
#else /* !_WIN64 */
280288
size = (!compiler->mode32) ? 3 : 2;
281-
@@ -1438,7 +1438,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
289+
@@ -1470,7 +1470,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
282290
inst = (sljit_u8*)ensure_buf(compiler, 1 + size);
283291
FAIL_IF(!inst);
284292
INC_SIZE(size);
@@ -287,7 +295,7 @@ index ecb7e9b..91dfcc8 100644
287295
if (!compiler->mode32)
288296
*inst++ = REX_W | ((op >= SLJIT_DIVMOD_UW) ? REX_B : 0);
289297
else if (op >= SLJIT_DIVMOD_UW)
290-
@@ -1468,7 +1468,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
298+
@@ -1500,7 +1500,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
291299
inst[1] |= IDIV;
292300
break;
293301
}

pcre2/PKGBUILD

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pkgbase=pcre2
44
pkgname=('pcre2' 'libpcre2_8' 'libpcre2_16' 'libpcre2_32' 'libpcre2posix' 'pcre2-devel')
5-
pkgver=10.44
5+
pkgver=10.45
66
pkgrel=1
77
pkgdesc="A library that implements Perl 5-style regular expressions"
88
arch=('i686' 'x86_64')
@@ -13,12 +13,12 @@ source=(https://github.com/PCRE2project/pcre2/releases/download/${pkgbase}-${pkg
1313
0001-Allow-building-an-MSYS-DLL.patch
1414
0002-RunTest-adjust-ISO-8859-1-tests-for-Cygwin.patch
1515
0003-pcre2-10.40-cygwin-jit.patch)
16-
sha256sums=('d34f02e113cf7193a1ebf2770d3ac527088d485d4e047ed10e5d217c6ef5de96'
16+
sha256sums=('21547f3516120c75597e5b30a992e27a592a31950b5140e7b8bfde3f192033c4'
1717
'SKIP'
18-
'4130d1c668750006a91ad5217f3206642d5d57f4d86ce4465a09dfa3d051f245'
19-
'f1fb2eac8776ad338cdbe1db94050fa785d4ec7fc69f4c658ae26287b89f8acd'
20-
'055755e4eb78bb684110e41980e3b8d7d960cecc370602e72bed0c5b880f4f99')
21-
validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel <[email protected].uk>
18+
'75d0b002035698d427b31a81c2efc518beea17e0e410f59185ef02e599b45f04'
19+
'0edaf45f742d388ddf96313e92d44f4942da2b0dc24ca0a0b47b5b223b6eee67'
20+
'e90e776d43a57767ac551e896e6191920577bbfc659bbd6fc6b48380c2c8fd44')
21+
validpgpkeys=('A95536204A3BB489715231282A98E77EB6F24CA8') # Nicholas Wilson <[email protected].uk>
2222

2323
prepare() {
2424
cd "${srcdir}"/${pkgname}-${pkgver}
@@ -78,7 +78,7 @@ package_pcre2() {
7878
mkdir -p ${pkgdir}/usr/bin
7979
cp -f ${srcdir}/dest/usr/bin/*.exe ${pkgdir}/usr/bin/
8080
cp -rf ${srcdir}/dest/usr/share ${pkgdir}/usr/
81-
install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
81+
install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENCE.md "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.md
8282
}
8383

8484
package_libpcre2_8() {

0 commit comments

Comments
 (0)