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 9d3eb682d30c4e7e37bc844109746b711343f025
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Sep 11 10:06:08 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Sep 17 18:54:05 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 <xiscofa...@libreoffice.org>
Tested-by: Jenkins
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190808
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/download.lst b/download.lst
index b31d6f9e085a..e66af72cd2db 100644
--- a/download.lst
+++ b/download.lst
@@ -482,8 +482,8 @@ LXML_TARBALL := lxml-6.0.1.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 bcbbd6f48178..5d05006392ea 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -25,7 +25,6 @@ endif # $(OS),WNT
$(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 */
