From 7341b78d623128e869a7ea6af7ddb789ed52d87e Mon Sep 17 00:00:00 2001
From: Peter Vicman <peter.vicman@gmail.com>
Date: Sun, 11 Dec 2022 18:01:00 +0100
Subject: [PATCH] mariadb: update to 10.10.2 and addon (1) pcre2 patch is
 needed to build mariadb: https://github.com/PCRE2Project/pcre2/issues/173

---
 packages/addons/service/mariadb/package.mk    |  8 +--
 .../patches/libpcre2-pcre2posix-header.patch  | 70 +++++++++++++++++++
 2 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 packages/devel/pcre2/patches/libpcre2-pcre2posix-header.patch

diff --git a/packages/addons/service/mariadb/package.mk b/packages/addons/service/mariadb/package.mk
index e84bf9d85b..36be5bc034 100644
--- a/packages/addons/service/mariadb/package.mk
+++ b/packages/addons/service/mariadb/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mariadb"
-PKG_VERSION="10.9.4"
-PKG_REV="0"
-PKG_SHA256="1dff08a0f37ea5cf8f00cbd12d40e80759fae7d73184ccf56b5b51acfdcfc054"
+PKG_VERSION="10.10.2"
+PKG_REV="1"
+PKG_SHA256="57cbd0112b22b592f657cd4eb82e2f36ad901351317bf8e17849578e803f3cb2"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://mariadb.org"
 PKG_URL="https://downloads.mariadb.com/MariaDB/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
@@ -74,7 +74,7 @@ make_host() {
 }
 
 makeinstall_host() {
-  :
+  cp -a strings/uca-dump ${TOOLCHAIN}/bin
 }
 
 post_makeinstall_target() {
diff --git a/packages/devel/pcre2/patches/libpcre2-pcre2posix-header.patch b/packages/devel/pcre2/patches/libpcre2-pcre2posix-header.patch
new file mode 100644
index 0000000000..72edb80cd3
--- /dev/null
+++ b/packages/devel/pcre2/patches/libpcre2-pcre2posix-header.patch
@@ -0,0 +1,70 @@
+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