external/gpgmepp/0001-const-up-gpgme.patch.1
| 157 ++++++++++
external/gpgmepp/UnpackedTarball_gpgmepp.mk
| 3
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
4 files changed, 203 insertions(+), 1 deletion(-)
New commits:
commit d15a74dc07ed3be3d448bbaf52b883b4638a92a0
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 26 12:23:33 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Jul 28 15:38:07 2025 +0200
const up gpgme[pp]
Change-Id: I3edb89cd80f4353c62a31ee0cdb425246b53ca86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188397
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/external/gpgmepp/0001-const-up-gpgme.patch.1
b/external/gpgmepp/0001-const-up-gpgme.patch.1
new file mode 100644
index 000000000000..c1aa4a084231
--- /dev/null
+++ b/external/gpgmepp/0001-const-up-gpgme.patch.1
@@ -0,0 +1,157 @@
+From 7b414525f301d13387814ef3aa8729db6762c2b2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com>
+Date: Sat, 26 Jul 2025 12:22:40 +0100
+Subject: [PATCH] const up gpgme
+
+---
+ src/engine-assuan.c | 2 +-
+ src/engine-backend.h | 14 +++++++-------
+ src/engine-g13.c | 2 +-
+ src/engine-gpg.c | 2 +-
+ src/engine-gpgconf.c | 2 +-
+ src/engine-gpgsm.c | 2 +-
+ src/engine-spawn.c | 2 +-
+ src/engine-uiserver.c | 2 +-
+ src/engine.c | 4 ++--
+ 9 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/src/engine-assuan.c b/src/engine-assuan.c
+index e96313ff..be13940d 100644
+--- a/src/engine-assuan.c
++++ b/src/engine-assuan.c
+@@ -801,7 +801,7 @@ llass_io_event (void *engine, gpgme_event_io_t type, void
*type_data)
+ }
+
+
+-struct engine_ops _gpgme_engine_ops_assuan =
++const struct engine_ops _gpgme_engine_ops_assuan =
+ {
+ /* Static functions. */
+ _gpgme_get_default_agent_socket,
+diff --git a/src/engine-backend.h b/src/engine-backend.h
+index b0533f77..9c3ee306 100644
+--- a/src/engine-backend.h
++++ b/src/engine-backend.h
+@@ -176,15 +176,15 @@ struct engine_ops
+ };
+
+
+-extern struct engine_ops _gpgme_engine_ops_gpg; /* OpenPGP. */
+-extern struct engine_ops _gpgme_engine_ops_gpgsm; /* CMS. */
+-extern struct engine_ops _gpgme_engine_ops_gpgconf; /* gpg-conf. */
+-extern struct engine_ops _gpgme_engine_ops_assuan; /* Low-level Assuan. */
+-extern struct engine_ops _gpgme_engine_ops_g13; /* Crypto VFS. */
++extern const struct engine_ops _gpgme_engine_ops_gpg; /* OpenPGP. */
++extern const struct engine_ops _gpgme_engine_ops_gpgsm; /* CMS. */
++extern const struct engine_ops _gpgme_engine_ops_gpgconf; /* gpg-conf. */
++extern const struct engine_ops _gpgme_engine_ops_assuan; /* Low-level
Assuan. */
++extern const struct engine_ops _gpgme_engine_ops_g13; /* Crypto VFS.
*/
+ #ifdef ENABLE_UISERVER
+-extern struct engine_ops _gpgme_engine_ops_uiserver;
++extern const struct engine_ops _gpgme_engine_ops_uiserver;
+ #endif
+-extern struct engine_ops _gpgme_engine_ops_spawn; /* Spawn engine. */
++extern const struct engine_ops _gpgme_engine_ops_spawn; /* Spawn
engine. */
+
+
+ /* Prototypes for extra functions in engine-gpgconf.c */
+diff --git a/src/engine-g13.c b/src/engine-g13.c
+index e30c1834..4e18c52d 100644
+--- a/src/engine-g13.c
++++ b/src/engine-g13.c
+@@ -768,7 +768,7 @@ g13_io_event (void *engine, gpgme_event_io_t type, void
*type_data)
+ }
+
+
+-struct engine_ops _gpgme_engine_ops_g13 =
++const struct engine_ops _gpgme_engine_ops_g13 =
+ {
+ /* Static functions. */
+ _gpgme_get_default_g13_name,
+diff --git a/src/engine-gpg.c b/src/engine-gpg.c
+index c6c5c4e6..e4f10f55 100644
+--- a/src/engine-gpg.c
++++ b/src/engine-gpg.c
+@@ -4245,7 +4245,7 @@ gpg_getdirect (void *engine, const char *argv[],
+
+
+
+-struct engine_ops _gpgme_engine_ops_gpg =
++const struct engine_ops _gpgme_engine_ops_gpg =
+ {
+ /* Static functions. */
+ _gpgme_get_default_gpg_name,
+diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
+index d1b977ad..e3d882cc 100644
+--- a/src/engine-gpgconf.c
++++ b/src/engine-gpgconf.c
+@@ -1272,7 +1272,7 @@ _gpgme_conf_release (gpgme_conf_comp_t conf)
+ }
+
+
+-struct engine_ops _gpgme_engine_ops_gpgconf =
++const struct engine_ops _gpgme_engine_ops_gpgconf =
+ {
+ /* Static functions. */
+ _gpgme_get_default_gpgconf_name,
+diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
+index e9d69d7a..f274b416 100644
+--- a/src/engine-gpgsm.c
++++ b/src/engine-gpgsm.c
+@@ -2402,7 +2402,7 @@ gpgsm_passwd (void *engine, gpgme_key_t key, unsigned
int flags)
+
+
+
+-struct engine_ops _gpgme_engine_ops_gpgsm =
++const struct engine_ops _gpgme_engine_ops_gpgsm =
+ {
+ /* Static functions. */
+ _gpgme_get_default_gpgsm_name,
+diff --git a/src/engine-spawn.c b/src/engine-spawn.c
+index 7fdac9ca..0e3c09fa 100644
+--- a/src/engine-spawn.c
++++ b/src/engine-spawn.c
+@@ -432,7 +432,7 @@ engspawn_op_spawn (void *engine,
+
+
+
+-struct engine_ops _gpgme_engine_ops_spawn =
++const struct engine_ops _gpgme_engine_ops_spawn =
+ {
+ /* Static functions. */
+ engspawn_get_file_name,
+diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c
+index 6c89082e..c64bc18e 100644
+--- a/src/engine-uiserver.c
++++ b/src/engine-uiserver.c
+@@ -1415,7 +1415,7 @@ uiserver_io_event (void *engine, gpgme_event_io_t type,
void *type_data)
+ }
+
+
+-struct engine_ops _gpgme_engine_ops_uiserver =
++const struct engine_ops _gpgme_engine_ops_uiserver =
+ {
+ /* Static functions. */
+ _gpgme_get_default_uisrv_socket,
+diff --git a/src/engine.c b/src/engine.c
+index d341488e..1efbcca7 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -39,12 +39,12 @@
+
+ struct engine
+ {
+- struct engine_ops *ops;
++ const struct engine_ops *ops;
+ void *engine;
+ };
+
+
+-static struct engine_ops *engine_ops[] =
++static const struct engine_ops* const engine_ops[] =
+ {
+ &_gpgme_engine_ops_gpg, /* OpenPGP. */
+ &_gpgme_engine_ops_gpgsm, /* CMS. */
+--
+2.49.0
+
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
index 30bef6435ee5..e1d232f3a992 100644
--- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
+++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,gpgmepp,0))
# * external/gpgmepp/configure.patch: see
# <https://lists.gnu.org/archive/html/autoconf/2020-11/msg00004.html>
"Fallout from
# _AC_UNDECLARED_WARNING in autoconf 2.70beta" for upstream discussion
+# * external/gpgmepp/0001-const-up-gpgme.patch.1
+# upstreaming effort made by sending patch to gnupg-de...@gnupg.org
$(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
external/gpgmepp/find-libgpg-error-libassuan.patch \
external/gpgmepp/fix-autoconf-macros.patch \
@@ -36,5 +38,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
external/gpgmepp/Wincompatible-function-pointer-types.patch \
external/gpgmepp/macos-macports-path.patch \
external/gpgmepp/macos-tdf152524.patch \
+ external/gpgmepp/0001-const-up-gpgme.patch.1 \
))
# vim: set noet sw=4 ts=4:
commit fa69be224d06dcef9af89b2ddaf3948c6cd4b21e
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jul 18 22:00:00 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Jul 28 15:37:54 2025 +0200
const up mariadb more
Change-Id: Idea6798d1df00e7cc1e9fa9a6c520bd1db3ee6c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188367
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.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 567e8ddad5e9..fb91af3e5a55 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -23,13 +23,16 @@ $(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:
+# 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?
