From c26e13307fae1be23ab7e019ab7d82bacad04155 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 5 Oct 2018 10:35:53 +0200 Subject: Record external/gpgmepp/version.patch as sent upstream Change-Id: Ibc0dc42f3df8c5a4acc1ccece5a4ef63bd04fd39 Reviewed-on: https://gerrit.libreoffice.org/61405 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- external/gpgmepp/UnpackedTarball_gpgmepp.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'external') diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk b/external/gpgmepp/UnpackedTarball_gpgmepp.mk index ed02aa57af35..d7472a27a18d 100644 --- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk +++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk @@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,gpgmepp,$(GPGME_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,gpgmepp,0)) +# * external/gpgmepp/version.patch upstream at "gpgme: `make dist` +# introduced VERSION can clash with new C++ ": $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \ external/gpgmepp/find-libgpg-error-libassuan.patch \ external/gpgmepp/fix-autoconf-macros.patch \ -- cgit