summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-10-05 10:35:53 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-10-05 13:20:31 +0200
commitc26e13307fae1be23ab7e019ab7d82bacad04155 (patch)
tree7355b5836a42c1d40dc23cff9795708dc164b548 /external
parentf6eee4f7966e09be82b51554ead4c4aac8c47457 (diff)
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 <sbergman@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/gpgmepp/UnpackedTarball_gpgmepp.mk2
1 files changed, 2 insertions, 0 deletions
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 <https://dev.gnupg.org/T4168> "gpgme: `make dist`
+# introduced VERSION can clash with new C++ <version>":
$(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
external/gpgmepp/find-libgpg-error-libassuan.patch \
external/gpgmepp/fix-autoconf-macros.patch \