const up libassuan

Change-Id: I4009bca1f8a33bb5a9518c46531ac39fead80d2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188252
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara
2025-07-24 09:49:07 +02:00
parent ffcd9cbaf2
commit 3a6c93982b
2 changed files with 29 additions and 0 deletions
+25
View File
@@ -0,0 +1,25 @@
From afe702126204f7f017d907435b9ae48975cbf243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
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
+4
View File
@@ -13,6 +13,9 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libassuan,$(LIBASSUAN_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libassuan,0)) $(eval $(call gb_UnpackedTarball_set_patchlevel,libassuan,0))
# 0001-const-up-std_cmd_table.patch.1
# upstream attempt made by git-email to gnupg-devel@gnupg.org
$(eval $(call gb_UnpackedTarball_add_patches,libassuan, \ $(eval $(call gb_UnpackedTarball_add_patches,libassuan, \
external/libassuan/find-libgpg-error.patch \ external/libassuan/find-libgpg-error.patch \
external/libassuan/fix-autoconf-macros.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 \ external/libassuan/w32-build-fixes-2.patch \
$(if $(filter LINUX,$(OS)),external/libassuan/rpath.patch) \ $(if $(filter LINUX,$(OS)),external/libassuan/rpath.patch) \
external/libassuan/w32-stdc.patch \ external/libassuan/w32-stdc.patch \
external/libassuan/0001-const-up-std_cmd_table.patch.1 \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: