[Libreoffice-commits] core.git: external/gpgmepp

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Oct 5 11:20:57 UTC 2018


 external/gpgmepp/UnpackedTarball_gpgmepp.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c26e13307fae1be23ab7e019ab7d82bacad04155
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Oct 5 10:35:53 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Oct 5 13:20:31 2018 +0200

    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 at redhat.com>

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 \


More information about the Libreoffice-commits mailing list