diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-12-28 22:15:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-01-08 15:52:25 +0100 |
| commit | e0721a655ca69d699024fd91da7071da0485b218 (patch) | |
| tree | e4743271e938e62368cb4beff2c40c544e05386d /configure.ac | |
| parent | fdfd132dc2f596472f0dfd99f7acd2a3d6509527 (diff) | |
Update gpgme to 1.16.0
* remove GPGME_CAN_EXPORT_MINIMAL_KEY, upstream now has support for
key export flags in c++ wrapper (gpgmepp >= 1.14)
* therefore, external/gpgmepp/add-minimal-keyexport.patch now fully
obsolete, tweaked xmlsecurity code to use upstream function
* bits of external/gpgmepp/find-libgpg-error-libassuan.patch are
upstream now (configure and makefile pieces, though we keep
configure.ac changes for the while - to not pick up system versions
too easily)
* external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1
was from upstream anyway, removed
Change-Id: I991c20c0eeff0f9135e97c991afcb905be55a959
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127665
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit 78dae8b20b85686d1a642415195d2e10fbb2dc1f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128085
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index aca958768d0a..ce82177fa691 100644 --- a/configure.ac +++ b/configure.ac @@ -12443,7 +12443,7 @@ elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], - [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp development package])], []) + [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], []) # progress_callback is the only func with plain C linkage # checking for it also filters out older, KDE-dependent libgpgmepp versions AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], @@ -12453,7 +12453,6 @@ elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then else AC_MSG_RESULT([internal]) BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" - AC_DEFINE([GPGME_CAN_EXPORT_MINIMAL_KEY]) GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src" LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src" |