diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:54:39 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:54:39 +0000 |
| commit | 267c6f2ac71f92999e969232431ba04678e7437e (patch) | |
| tree | 358c9467650e1d0a1d7227a21dac2e3d08b622b2 /external/gpgmepp/find-libgpg-error-libassuan.patch | |
| parent | Initial commit. (diff) | |
| download | libreoffice-267c6f2ac71f92999e969232431ba04678e7437e.tar.xz libreoffice-267c6f2ac71f92999e969232431ba04678e7437e.zip | |
Adding upstream version 4:24.2.0.upstream/4%24.2.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/gpgmepp/find-libgpg-error-libassuan.patch')
| -rw-r--r-- | external/gpgmepp/find-libgpg-error-libassuan.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/external/gpgmepp/find-libgpg-error-libassuan.patch b/external/gpgmepp/find-libgpg-error-libassuan.patch new file mode 100644 index 0000000000..a98a7d845a --- /dev/null +++ b/external/gpgmepp/find-libgpg-error-libassuan.patch @@ -0,0 +1,66 @@ +diff --git a/configure.ac b/configure.ac +index f28480b..92a3e85 100644 +--- configure.ac ++++ configure.ac +@@ -719,8 +719,18 @@ + + # Checking for libgpg-error. + have_gpg_error=no +-AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION", +- have_gpg_error=yes, have_gpg_error=no) ++if test "x${GPG_ERROR_CFLAGS}" = x; then ++ AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION", ++ have_gpg_error=yes, have_gpg_error=no) ++else ++ have_gpg_error=yes ++ GPG_ERROR_CFLAGS="$GPG_ERROR_CFLAGS" ++ GPG_ERROR_LIBS="$GPG_ERROR_LIBS" ++ AC_SUBST(GPG_ERROR_CFLAGS) ++ AC_SUBST(GPG_ERROR_LIBS) ++ ++fi ++ + AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME, + [The default error source for GPGME.]) + +@@ -729,8 +739,17 @@ + + # And for libassuan. + have_libassuan=no +-AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION", ++if test "x${LIBASSUAN_CFLAGS}" = x; then ++ AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION", + have_libassuan=yes, have_libassuan=no) ++else ++ have_libassuan=yes ++ LIBASSUAN_CFLAGS="$LIBASSUAN_CFLAGS" ++ LIBASSUAN_LIBS="$LIBASSUAN_LIBS" ++ AC_SUBST(LIBASSUAN_CFLAGS) ++ AC_SUBST(LIBASSUAN_LIBS) ++fi ++ + if test "$have_libassuan" = "yes"; then + AC_DEFINE_UNQUOTED(GPGME_LIBASSUAN_VERSION, "$libassuan_version", + [version of the libassuan library]) +--- lang/cpp/tests/Makefile.am 2020-06-20 00:43:49.213657887 +0200 ++++ lang/cpp/tests/Makefile.am~ 2019-01-25 13:27:34.000000000 +0100 +@@ -21,7 +21,7 @@ + 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++ + + 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++ + + AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ |