RepositoryExternal.mk | 1 +
download.lst | 4 ++--
external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk | 8
+++-----
external/mariadb-connector-c/configs/wnt_ma_config.h | 4 ----
4 files changed, 6 insertions(+), 11 deletions(-)
New commits:
commit 5a0498ded11d514c21e3124333a3560da1373202
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Oct 20 08:52:46 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Oct 21 08:43:44 2023 +0200
mariadb connector: upgrade to release 3.3.7 (fixes tdf#157826)
Change-Id: I053b827b7bc14535760236fcb057c154c359f4dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158252
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 82a3478a1ac4..744353b58fe3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -312,6 +312,7 @@ $(call gb_LinkTarget_use_system_win32_libs,$(1),\
kernel32 \
shlwapi \
crypt32 \
+ bcrypt \
)
endef
diff --git a/download.lst b/download.lst
index ad03e50a6ad4..07b4934cf760 100644
--- a/download.lst
+++ b/download.lst
@@ -436,8 +436,8 @@ LXML_TARBALL := lxml-4.9.2.tgz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-MARIADB_CONNECTOR_C_SHA256SUM :=
431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
-MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.1.8-src.tar.gz
+MARIADB_CONNECTOR_C_SHA256SUM :=
975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf
+MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.7-src.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 3458089ce99e..b8802e16695e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -21,12 +21,10 @@ $(eval $(call
gb_StaticLibrary_set_include,mariadb-connector-c,\
# This is needed for MSVC 2008: it somehow finds a dlopen somewhere
# but the static library then contains unreferenced symbols.
# This macro enables a re-definition to native Win32 APIs in my_global.h.
-## TODO missing enable: -D HAVE_COMPRESS
-## (but then need to add "-lz" to mysqlcppconn linking)
-$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -D
ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1))
+$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN
-DHAVE_COMPRESS -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD
-DSQLITE_ENABLE_COLUMN_METADATA=1))
ifeq ($(OS),WNT)
-$(eval $(call
gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED
-DHAVE_STRTOULL))
+$(eval $(call
gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED
-DHAVE_STRTOULL -DHAVE_WINCRYPT))
$(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
$$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/win-iconv \
@@ -46,7 +44,7 @@ $(eval $(call
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/ma_default \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_dtoa \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_errmsg \
- UnpackedTarball/mariadb-connector-c/libmariadb/ma_hash \
+ UnpackedTarball/mariadb-connector-c/libmariadb/ma_hashtbl \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_init \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_io \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_list \
diff --git a/external/mariadb-connector-c/configs/wnt_ma_config.h
b/external/mariadb-connector-c/configs/wnt_ma_config.h
index d06393509881..acd08c125a95 100644
--- a/external/mariadb-connector-c/configs/wnt_ma_config.h
+++ b/external/mariadb-connector-c/configs/wnt_ma_config.h
@@ -72,11 +72,7 @@
# define HAVE_LONG 1
#endif
-#ifdef _M_X64
#define SIZEOF_LONG_LONG 8
-#else
-#define SIZEOF_LONG_LONG 4
-#endif
#if defined(SIZEOF_LONG_LONG)
# define HAVE_LONG_LONG 1
#endif
