external/libassuan/0001-const-up-std_cmd_table.patch.1 | 25 +++++++++++++++++ external/libassuan/UnpackedTarball_libassuan.mk | 4 ++ 2 files changed, 29 insertions(+)
New commits: commit 3a6c93982b9d637943f00f443ee0156a31aced4d Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jul 23 21:25:10 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Jul 24 09:49:07 2025 +0200 const up libassuan Change-Id: I4009bca1f8a33bb5a9518c46531ac39fead80d2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188252 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/external/libassuan/0001-const-up-std_cmd_table.patch.1 b/external/libassuan/0001-const-up-std_cmd_table.patch.1 new file mode 100644 index 000000000000..96d47e7c6c32 --- /dev/null +++ b/external/libassuan/0001-const-up-std_cmd_table.patch.1 @@ -0,0 +1,25 @@ +From afe702126204f7f017d907435b9ae48975cbf243 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <[email protected]> +Date: Wed, 23 Jul 2025 21:19:30 +0100 +Subject: [PATCH libassuan] const up std_cmd_table + +--- + src/assuan-handler.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/assuan-handler.c b/src/assuan-handler.c +index a04ab4e..5f155d4 100644 +--- a/src/assuan-handler.c ++++ b/src/assuan-handler.c +@@ -394,7 +394,7 @@ w32_handler_sendfd (assuan_context_t ctx, char *line) + /* This is a table with the standard commands and handler for them. + The table is used to initialize a new context and associate strings + with default handlers */ +-static struct { ++static const struct { + const char *name; + gpg_error_t (*handler)(assuan_context_t, char *line); + const char *help; +-- +2.49.0 + diff --git a/external/libassuan/UnpackedTarball_libassuan.mk b/external/libassuan/UnpackedTarball_libassuan.mk index 3604fa36a395..961247e13f83 100644 --- a/external/libassuan/UnpackedTarball_libassuan.mk +++ b/external/libassuan/UnpackedTarball_libassuan.mk @@ -13,6 +13,9 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libassuan,$(LIBASSUAN_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libassuan,0)) +# 0001-const-up-std_cmd_table.patch.1 +# upstream attempt made by git-email to [email protected] + $(eval $(call gb_UnpackedTarball_add_patches,libassuan, \ external/libassuan/find-libgpg-error.patch \ external/libassuan/fix-autoconf-macros.patch \ @@ -20,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libassuan, \ external/libassuan/w32-build-fixes-2.patch \ $(if $(filter LINUX,$(OS)),external/libassuan/rpath.patch) \ external/libassuan/w32-stdc.patch \ + external/libassuan/0001-const-up-std_cmd_table.patch.1 \ )) # vim: set noet sw=4 ts=4:
