From 04e66ac54169dd2a00d53abec093375bba90fd60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
Date: Sun, 13 Jul 2025 20:14:44 +0100
Subject: [PATCH] const up mariadb-connector-c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I905bb80e1e0f61ac3c1d95fc28643de796098bbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187826
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
---
 ...-up-my_uca1400_collation_definitions.patch | 26 +++++++++++++++++++
 .../UnpackedTarball_mariadb-connector-c.mk    |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 external/mariadb-connector-c/0001-const-up-my_uca1400_collation_definitions.patch

diff --git a/external/mariadb-connector-c/0001-const-up-my_uca1400_collation_definitions.patch b/external/mariadb-connector-c/0001-const-up-my_uca1400_collation_definitions.patch
new file mode 100644
index 000000000000..535dad041fce
--- /dev/null
+++ b/external/mariadb-connector-c/0001-const-up-my_uca1400_collation_definitions.patch
@@ -0,0 +1,26 @@
+From ce34b9e5fea880c42b431939aed0449d16288d3b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
+Date: Sun, 13 Jul 2025 20:11:56 +0100
+Subject: [PATCH] const up my_uca1400_collation_definitions
+
+move this symbol out of the .data section
+---
+ libmariadb/ma_charset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmariadb/ma_charset.c b/libmariadb/ma_charset.c
+index ff4d82f..05fcac9 100644
+--- a/libmariadb/ma_charset.c
++++ b/libmariadb/ma_charset.c
+@@ -968,7 +968,7 @@ typedef struct my_uca1400_collation_definition_st
+   with IDs of their closest UCA1400 counterparts, for character sets
+   utf8mb3, utf8mb4, ucs2, utf16, utf32.
+ */
+-static MY_UCA1400_COLLATION_DEFINITION
++static const MY_UCA1400_COLLATION_DEFINITION
+ my_uca1400_collation_definitions[MY_UCA1400_COLLATION_DEFINITION_COUNT]=
+ {
+ #define COLDEF(tl,name,id_utf8mb3,id_utf8mb4,id_ucs2,id_utf16,id_utf32) \
+-- 
+2.49.0
+
diff --git a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index bcbbd6f48178..567e8ddad5e9 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -23,9 +23,13 @@ $(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.
 endif
 endif # $(OS),WNT
 
+# 0001-const-up-my_uca1400_collation_definitions.patch upstreamed as:
+# https://github.com/mariadb-corporation/mariadb-connector-c/pull/290
+
 $(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\
     external/mariadb-connector-c/clang-cl.patch.0 \
     external/mariadb-connector-c/c23.patch.0 \
+    external/mariadb-connector-c/0001-const-up-my_uca1400_collation_definitions.patch \
 ))
 
 # TODO are any "plugins" needed?