ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

const up libgpg-error

Browse Source 
Change-Id: I3a76a570a36cbf45f6afc9da94f23e421431e1fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188206
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara
2025-07-23 13:19:49 +02:00
parent 2449fa7f5e
commit 69f6ff3c03
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/libgpg-error/0001-const-up-handle_metacmd.cmds-array.patch.1
Vendored
+26
View File
@@ -0,0 +1,26 @@
From 419478c33f9ac8b0bc9648c63e1ad4fd17ec410f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
Date: Wed, 23 Jul 2025 09:27:31 +0100
Subject: [PATCH Libgpg-error] const up handle_metacmd.cmds array
and move it out of the .data section
---
src/argparse.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/argparse.c b/src/argparse.c
index 5fb03b3..4fdd93b 100644
--- a/src/argparse.c
+++ b/src/argparse.c
@@ -1480,7 +1480,7 @@ handle_meta_expand (gpgrt_argparse_t *arg, unsigned int alternate, char *args)
static int
handle_metacmd (gpgrt_argparse_t *arg, char *keyword)
{
- static struct {
+ static const struct {
const char *name; /* Name of the command. */
unsigned short alternate; /* Use alternate version of the command. */
unsigned short needarg:1; /* Command requires an argument. */
--
2.49.0
external/libgpg-error/UnpackedTarball_libgpg-error.mk
Vendored
+4
View File
@@ -13,6 +13,9 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libgpg-error,$(LIBGPGERROR_TARBALL)
$(eval $(call gb_UnpackedTarball_set_patchlevel,libgpg-error,0))
# 0001-const-up-handle_metacmd.cmds-array.patch
# upstream attempt made by git-email to gnupg-devel@gnupg.org
$(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \
$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \
@@ -23,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
$(if $(filter LINUX,$(OS)),external/libgpg-error/libgpgerror-bundled-soname.patch.1) \
external/libgpg-error/clang-cl.patch \
external/libgpg-error/undeclared-environ-macOS.patch \
external/libgpg-error/0001-const-up-handle_metacmd.cmds-array.patch.1 \
))
# vim: set noet sw=4 ts=4: