download.lst | 4 +-- external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk | 1 external/mariadb-connector-c/c23.patch.0 | 11 ---------- 3 files changed, 2 insertions(+), 14 deletions(-)
New commits: commit 3e107d03809a00343cf035598137936df494cd2a Author: Xisco Fauli <[email protected]> AuthorDate: Thu Sep 11 10:06:08 2025 +0200 Commit: Taichi Haradaguchi <[email protected]> CommitDate: Mon Sep 29 16:27:55 2025 +0200 mariadb-connector-c: upgrade to 3.3.17 c23.patch.0 has been fixed upstream Downloaded from https://dlm.mariadb.com/4441363/Connectors/c/connector-c-3.3.17/mariadb-connector-c-3.3.17-src.tar.gz Change-Id: Idf813aa383f22b8ae22ac92e23fc0ffa78050f38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190795 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190809 Reviewed-by: Taichi Haradaguchi <[email protected]> diff --git a/download.lst b/download.lst index 2557f492e1cc..abd535343507 100644 --- a/download.lst +++ b/download.lst @@ -481,8 +481,8 @@ LXML_TARBALL := lxml-5.4.0.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -MARIADB_CONNECTOR_C_SHA256SUM := b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe -MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.15-src.tar.gz +MARIADB_CONNECTOR_C_SHA256SUM := a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01 +MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.17-src.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk index 3ba6bfef583f..dbce7aec4bdd 100644 --- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk @@ -27,7 +27,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb-connector-c,1)) $(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\ external/mariadb-connector-c/clang-cl.patch.0 \ - external/mariadb-connector-c/c23.patch.0 \ )) # TODO are any "plugins" needed? diff --git a/external/mariadb-connector-c/c23.patch.0 b/external/mariadb-connector-c/c23.patch.0 deleted file mode 100644 index d19d6be4cdae..000000000000 --- a/external/mariadb-connector-c/c23.patch.0 +++ /dev/null @@ -1,11 +0,0 @@ ---- include/ma_global.h -+++ include/ma_global.h -@@ -683,7 +683,7 @@ - typedef int myf; /* Type of MyFlags in my_funcs */ - typedef char my_bool; /* Small bool */ - typedef unsigned long long my_ulonglong; --#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) -+#if !defined(bool) && !defined(bool_defined) && !(defined(__cplusplus) || __STDC_VERSION__ >= 202311L) - typedef char bool; /* Ordinary boolean values 0 1 */ - #endif - /* Macros for converting *constants* to the right type */
