projects / packages / libreoffice.git / blame
| Commit | Line | Data |
|---|---|---|
| 689993e0 JP |
1 | From f7e170eb084cd4e92818de966b287330184749a8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Rene Engelhard <rene@debian.org> | |
| 3 | Date: Wed, 24 Aug 2022 09:55:33 +0200 | |
| 4 | Subject: Make configure work with gpgme >= 1.18 | |
| 5 | MIME-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ||
| 9 | Sam James wrote: | |
| 10 | > gpgme-1.18.0 dropped a bunch of internal symbols, | |
| 11 | > including progress_callback (see e.g. callbacks.h | |
| 12 | > which has a comment at the top saying it's internal). | |
| 13 | ||
| 14 | Plausibly the workaround to not link against older KDE-specific distro | |
| 15 | packages is not needed anymore. | |
| 16 | ||
| 17 | Check for main as a workaround as we do for other C++ libraries, too. | |
| 18 | ||
| 19 | Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4 | |
| 20 | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667 | |
| 21 | Tested-by: Jenkins | |
| 22 | Reviewed-by: Sam James <sam@gentoo.org> | |
| 23 | Reviewed-by: René Engelhard <rene@debian.org> | |
| 24 | --- | |
| 25 | configure.ac | 7 +++---- | |
| 26 | 1 file changed, 3 insertions(+), 4 deletions(-) | |
| 27 | ||
| 28 | (limited to 'configure.ac') | |
| 29 | ||
| 30 | diff --git a/configure.ac b/configure.ac | |
| 31 | index 24cb01aa0db0..61806988b94b 100644 | |
| 32 | --- a/configure.ac | |
| 33 | +++ b/configure.ac | |
| 34 | @@ -12539,12 +12539,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE | |
| 35 | # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way | |
| 36 | AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], | |
| 37 | [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp development package])], []) | |
| 38 | - # progress_callback is the only func with plain C linkage | |
| 39 | - # checking for it also filters out older, KDE-dependent libgpgmepp versions | |
| 40 | - AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], | |
| 41 | - [AC_MSG_ERROR(gpgmepp not found or not functional)], []) | |
| 42 | AC_CHECK_HEADER(gpgme.h, [], | |
| 43 | [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], []) | |
| 44 | + AC_CHECK_LIB(gpgmepp, main, [], | |
| 45 | + [AC_MSG_ERROR(gpgmepp not found or not functional)], []) | |
| 46 | + GPGMEPP_LIBS=-lgpgmepp | |
| 47 | else | |
| 48 | AC_MSG_RESULT([internal]) | |
| 49 | BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" | |
| 50 | -- | |
| 51 | cgit v1.2.1 | |
| 52 |