external/mariadb-connector-c/0001-const-up-mariadb_defaults-and-MADB_OS_CHARSET.patch
| 39 ++++++++++
external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
| 5 +
2 files changed, 43 insertions(+), 1 deletion(-)
New commits:
commit 94d2add57c96ab6f38ef2e53bd14549218cc86fb
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jul 18 22:00:00 2025 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jul 28 14:46:04 2025 +0200
const up mariadb more
Change-Id: Idea6798d1df00e7cc1e9fa9a6c520bd1db3ee6c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188470
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git
a/external/mariadb-connector-c/0001-const-up-mariadb_defaults-and-MADB_OS_CHARSET.patch
b/external/mariadb-connector-c/0001-const-up-mariadb_defaults-and-MADB_OS_CHARSET.patch
new file mode 100644
index 000000000000..fa35ab625a09
--- /dev/null
+++
b/external/mariadb-connector-c/0001-const-up-mariadb_defaults-and-MADB_OS_CHARSET.patch
@@ -0,0 +1,39 @@
+From 35a6ae021579d43b9f18c6f4918618042539967c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com>
+Date: Sat, 26 Jul 2025 16:38:15 +0100
+Subject: [PATCH] const up mariadb_defaults and MADB_OS_CHARSET
+
+---
+ libmariadb/ma_charset.c | 2 +-
+ libmariadb/mariadb_lib.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libmariadb/ma_charset.c b/libmariadb/ma_charset.c
+index c277e6a..7d8311a 100644
+--- a/libmariadb/ma_charset.c
++++ b/libmariadb/ma_charset.c
+@@ -1242,7 +1242,7 @@ struct st_madb_os_charset {
+ #define MADB_CS_EXACT 2
+
+ /* Please add new character sets at the end. */
+-struct st_madb_os_charset MADB_OS_CHARSET[]=
++const struct st_madb_os_charset MADB_OS_CHARSET[]=
+ {
+ #ifdef _WIN32
+ /* Windows code pages */
+diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
+index c5dfedd..15ee455 100644
+--- a/libmariadb/mariadb_lib.c
++++ b/libmariadb/mariadb_lib.c
+@@ -660,7 +660,7 @@ struct st_default_options {
+ const char *conf_key;
+ };
+
+-struct st_default_options mariadb_defaults[] =
++const struct st_default_options mariadb_defaults[] =
+ {
+ {{MARIADB_OPT_PORT}, MARIADB_OPTION_INT,"port"},
+ {{MARIADB_OPT_UNIXSOCKET}, MARIADB_OPTION_STR, "socket"},
+--
+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 37ad5027272b..2cbce8b00032 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -24,13 +24,16 @@ endif
endif # $(OS),WNT
$(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb-connector-c,1))
-# 0001-const-up-my_uca1400_collation_definitions.patch upstreamed as:
+# 0001-const-up-my_uca1400_collation_definitions.patch and
+# 0001-const-up-mariadb_defaults-and-MADB_OS_CHARSET.patch
+# upstreaming attempt at:
# 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
\
+
external/mariadb-connector-c/0001-const-up-mariadb_defaults-and-MADB_OS_CHARSET.patch
\
))
# TODO are any "plugins" needed?
