diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-07-25 15:19:24 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-07-26 13:02:55 +0200 |
| commit | 7ed01bd70318a460e2b321bc4bc5a2161b2d1e71 (patch) | |
| tree | 87abb650e1b3463d0b1b3e7709a645197f3ae120 /external/gpgmepp | |
| parent | ca5d7b4a1941a5e7651c7c270e351018a21afe97 (diff) | |
libassuan: upgrade to 3.0.1
Downloaded from https://gnupg.org/ftp/gcrypt/libassuan/libassuan-3.0.1.tar.bz2
Change-Id: Ie56dd4d88998c6b2a825a502aa34bae3436d2b25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169198
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
(cherry picked from commit 79d74f036f65dcf128fb9b967b345a9009028f53)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170961
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'external/gpgmepp')
| -rw-r--r-- | external/gpgmepp/find-libgpg-error-libassuan.patch | 21 | ||||
| -rw-r--r-- | external/gpgmepp/w32-build-fixes.patch.1 | 2 |
2 files changed, 12 insertions, 11 deletions
diff --git a/external/gpgmepp/find-libgpg-error-libassuan.patch b/external/gpgmepp/find-libgpg-error-libassuan.patch index a98a7d845a34..038a9b0b0691 100644 --- a/external/gpgmepp/find-libgpg-error-libassuan.patch +++ b/external/gpgmepp/find-libgpg-error-libassuan.patch @@ -53,14 +53,15 @@ index f28480b..92a3e85 100644 @LDADD_FOR_TESTS_KLUDGE@ -lstdc++ AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ ---- lang/cpp/tests/Makefile.in 2020-06-20 00:44:49.542344510 +0200 -+++ lang/cpp/tests/Makefile.in~ 2020-06-13 00:55:19.021212970 +0200 -@@ -427,7 +427,7 @@ - top_srcdir = @top_srcdir@ - AM_LDFLAGS = -no-install - LDADD = ../../cpp/src/libgpgmepp.la \ -+ ../../../src/libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ \ -- ../../../src/libgpgme.la @GPG_ERROR_LIBS@ \ - @LDADD_FOR_TESTS_KLUDGE@ -lstdc++ +diff -ur gpgmepp.org/src/Makefile.am gpgmepp/src/Makefile.am +--- src/Makefile.am 2024-07-02 13:24:02.549609519 +0200 ++++ src/Makefile.am 2024-07-02 13:24:29.573606613 +0200 +@@ -111,7 +111,7 @@ + gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ - AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ + gpgme_json_SOURCES = gpgme-json.c cJSON.c cJSON.h +-gpgme_json_LDADD = -lm libgpgme.la $(GPG_ERROR_LIBS) ++gpgme_json_LDADD = -lm libgpgme.la @LIBASSUAN_LIBS@ $(GPG_ERROR_LIBS) + + + if HAVE_W32_SYSTEM diff --git a/external/gpgmepp/w32-build-fixes.patch.1 b/external/gpgmepp/w32-build-fixes.patch.1 index 250b2022c540..a0a83910bbb6 100644 --- a/external/gpgmepp/w32-build-fixes.patch.1 +++ b/external/gpgmepp/w32-build-fixes.patch.1 @@ -111,7 +111,7 @@ diff -ru gpgme.orig/src/Makefile.am gpgme/src/Makefile.am +gpgme_tool_LDADD = -gpgme_json_SOURCES = gpgme-json.c cJSON.c cJSON.h --gpgme_json_LDADD = -lm libgpgme.la $(GPG_ERROR_LIBS) +-gpgme_json_LDADD = -lm libgpgme.la @LIBASSUAN_LIBS@ $(GPG_ERROR_LIBS) +gpgme_json_SOURCES = +gpgme_json_LDADD = |