From 92f50a7b4546c672e88ba7676ddd7e0e8981073b Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 13 Dec 2022 13:30:56 +0000
Subject: [PATCH] pcre2: update to 10.42 and drop upstreamed patch

release notes:
- https://github.com/PCRE2Project/pcre2/releases/tag/pcre2-10.42

log:
- https://github.com/PCRE2Project/pcre2/compare/pcre2-10.41...pcre2-10.42
---
 packages/devel/pcre2/package.mk               |  4 +-
 .../patches/libpcre2-pcre2posix-header.patch  | 70 -------------------
 2 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 packages/devel/pcre2/patches/libpcre2-pcre2posix-header.patch

diff --git a/packages/devel/pcre2/package.mk b/packages/devel/pcre2/package.mk
index d7a03ba198..1b71c0eb55 100644
--- a/packages/devel/pcre2/package.mk
+++ b/packages/devel/pcre2/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pcre2"
-PKG_VERSION="10.41"
-PKG_SHA256="0f78cebd3e28e346475fb92e95fe9999945b4cbaad5f3b42aca47b887fb53308"
+PKG_VERSION="10.42"
+PKG_SHA256="8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.pcre.org/"
 PKG_URL="https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PKG_VERSION}/pcre2-${PKG_VERSION}.tar.bz2"
diff --git a/packages/devel/pcre2/patches/libpcre2-pcre2posix-header.patch b/packages/devel/pcre2/patches/libpcre2-pcre2posix-header.patch
deleted file mode 100644
index 72edb80cd3..0000000000
--- a/packages/devel/pcre2/patches/libpcre2-pcre2posix-header.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From cd8dc40b901bdedf5bcc0b3acdd9eede16802f39 Mon Sep 17 00:00:00 2001
-From: Philip Hazel <Philip.Hazel@gmail.com>
-Date: Fri, 9 Dec 2022 09:40:52 +0000
-Subject: [PATCH] Move default of PCRE2_CALL_CONVENTION from pcre2posix.c to
- pcre2posix.h
-
----
- src/pcre2posix.c | 14 --------------
- src/pcre2posix.h | 16 +++++++++++++++-
- 2 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/src/pcre2posix.c b/src/pcre2posix.c
-index 3ffdc954..a15174dc 100644
---- a/src/pcre2posix.c
-+++ b/src/pcre2posix.c
-@@ -92,20 +92,6 @@ changed. This #define is a copy of the one in pcre2_internal.h. */
- #include "pcre2.h"
- #include "pcre2posix.h"
- 
--/* When compiling with the MSVC compiler, it is sometimes necessary to include
--a "calling convention" before exported function names. (This is secondhand
--information; I know nothing about MSVC myself). For example, something like
--
--  void __cdecl function(....)
--
--might be needed. In order to make this easy, all the exported functions have
--PCRE2_CALL_CONVENTION just before their names. It is rarely needed; if not
--set, we ensure here that it has no effect. */
--
--#ifndef PCRE2_CALL_CONVENTION
--#define PCRE2_CALL_CONVENTION
--#endif
--
- /* Table to translate PCRE2 compile time error codes into POSIX error codes.
- Only a few PCRE2 errors with a value greater than 23 turn into special POSIX
- codes: most go to REG_BADPAT. The second table lists, in pairs, those that
-diff --git a/src/pcre2posix.h b/src/pcre2posix.h
-index 00b5c8a6..6e3b2cff 100644
---- a/src/pcre2posix.h
-+++ b/src/pcre2posix.h
-@@ -9,7 +9,7 @@ POSIX wrapper interface.
- 
-                        Written by Philip Hazel
-      Original API code Copyright (c) 1997-2012 University of Cambridge
--          New API code Copyright (c) 2016-2019 University of Cambridge
-+          New API code Copyright (c) 2016-2022 University of Cambridge
- 
- -----------------------------------------------------------------------------
- Redistribution and use in source and binary forms, with or without
-@@ -116,6 +116,20 @@ typedef struct {
-   regoff_t rm_eo;
- } regmatch_t;
- 
-+/* When compiling with the MSVC compiler, it is sometimes necessary to include
-+a "calling convention" before exported function names. (This is secondhand
-+information; I know nothing about MSVC myself). For example, something like
-+
-+  void __cdecl function(....)
-+
-+might be needed. In order to make this easy, all the exported functions have
-+PCRE2_CALL_CONVENTION just before their names. It is rarely needed; if not
-+set, we ensure here that it has no effect. */
-+
-+#ifndef PCRE2_CALL_CONVENTION
-+#define PCRE2_CALL_CONVENTION
-+#endif
-+
- /* When an application links to a PCRE2 DLL in Windows, the symbols that are
- imported have to be identified as such. When building PCRE2, the appropriate
- export settings are needed, and are set in pcre2posix.c before including this