external/gpgmepp/0001-const-up-gpgme.patch.1 | 157 +++++++++++++++++++++++++++ external/gpgmepp/UnpackedTarball_gpgmepp.mk | 3 2 files changed, 160 insertions(+)
New commits: commit 6e03c9cc7b353b660ea43cc3fdb1e22ba5e98e55 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jul 26 12:23:33 2025 +0100 Commit: Noel Grandin <[email protected]> CommitDate: Mon Jul 28 15:40:16 2025 +0200 const up gpgme[pp] Change-Id: I3edb89cd80f4353c62a31ee0cdb425246b53ca86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188471 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Noel Grandin <[email protected]> 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?= <[email protected]> +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 [email protected] $(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:
