[Libreoffice-commits] core.git: download.lst external/gpgme external/libgpg-error

Thorsten Behrens Thorsten.Behrens at CIB.de
Tue Aug 15 20:22:46 UTC 2017 

 download.lst                                          |    8 +--
 external/gpgme/ExternalPackage_gpgme.mk               |    4 -
 external/libgpg-error/ExternalPackage_libgpg-error.mk |    2 
 external/libgpg-error/UnpackedTarball_libgpg-error.mk |    1 
 external/libgpg-error/fix-autoconf-macros.patch       |   39 ------------------
 5 files changed, 7 insertions(+), 47 deletions(-)

New commits:
commit 1bb07b763560b7af64da27025b8f6299308b62a6
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Tue May 23 02:24:34 2017 +0200

    gpg4libre: update libgpg-error and gpgme to latest
    
    * libgpg-error has some fixes around autogen & win32 critical sects
    * gpgme has a few nice additions around keyinfos
    * update lib versions to deliver
    * remove external/libgpg-error/fix-autoconf-macros.patch -> this is
      upstream now
    
    Change-Id: I5a58ac15a485621c54ca1c7a768268e8a541256c
    Reviewed-on: https://gerrit.libreoffice.org/37926
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/download.lst b/download.lst
index 569940d7f655..7684e42e473d 100644
--- a/download.lst
+++ b/download.lst
@@ -79,8 +79,8 @@ export FREETYPE_SHA256SUM := 3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe
 export FREETYPE_TARBALL := freetype-2.7.1.tar.bz2
 export GLM_SHA256SUM := d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
 export GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
-export GPGME_SHA256SUM := 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33
-export GPGME_TARBALL := gpgme-1.8.0.tar.bz2
+export GPGME_SHA256SUM := 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
+export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
 export GRAPHITE_SHA256SUM := aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9
 export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
 export HARFBUZZ_SHA256SUM := ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131
@@ -135,8 +135,8 @@ export LIBEXTTEXTCAT_SHA256SUM := 9595601c41051356d03d0a7d5dcad334fe1b420d221f68
 export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
 export LIBGLTF_SHA256SUM := 119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da
 export LIBGLTF_TARBALL := libgltf-0.1.0.tar.gz
-export LIBGPGERROR_SHA256SUM := 4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69
-export LIBGPGERROR_TARBALL := libgpg-error-1.26.tar.bz2
+export LIBGPGERROR_SHA256SUM := 4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
+export LIBGPGERROR_TARBALL := libgpg-error-1.27.tar.bz2
 export LIBLANGTAG_SHA256SUM := d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e
 export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
 export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
diff --git a/external/gpgme/ExternalPackage_gpgme.mk b/external/gpgme/ExternalPackage_gpgme.mk
index 1a483a62481c..4148f3598f24 100644
--- a/external/gpgme/ExternalPackage_gpgme.mk
+++ b/external/gpgme/ExternalPackage_gpgme.mk
@@ -13,8 +13,8 @@ $(eval $(call gb_ExternalPackage_use_external_project,gpgme,gpgme))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
-$(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.3.0))
-$(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.17.0))
+$(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.4.0))
+$(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.18.0))
 
 endif # $(DISABLE_DYNLOADING)
 
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index ba6e8c67f754..f23c8998819d 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,libgpg-error,libgpg-error)
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
-$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.so.0,src/.libs/libgpg-error.so.0.21.0))
+$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.so.0,src/.libs/libgpg-error.so.0.22.0))
 
 endif # $(DISABLE_DYNLOADING)
 
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index 4606e80e860c..8ac6cf77a560 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libgpg-error,$(LIBGPGERROR_TARBALL)
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libgpg-error,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
-    external/libgpg-error/fix-autoconf-macros.patch \
     external/libgpg-error/disable-rpath-option.patch \
 ))
 
diff --git a/external/libgpg-error/fix-autoconf-macros.patch b/external/libgpg-error/fix-autoconf-macros.patch
deleted file mode 100644
index ba3246124b12..000000000000
--- a/external/libgpg-error/fix-autoconf-macros.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur libgpg-error.org/configure.ac libgpg-error/configure.ac
---- configure.ac	2017-02-16 18:43:50.697941033 +0100
-+++ configure.ac~	2017-02-16 18:44:07.085881259 +0100
-@@ -33,6 +33,11 @@
- # decimalized short revision number, a beta version string, and a flag
- # indicating a development version (mym4_isgit). Note that the m4
- # processing is done by autoconf and not during the configure run.
-+m4_define([m4_chomp_all],
-+[m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [
-+/], [/ ]), [/*$]), [$1])])
-+
-+m4_define([m4_esyscmd_s], [m4_chomp_all(m4_esyscmd([$1]))])
- m4_define([mym4_version], [mym4_version_major.mym4_version_minor])
- m4_define([mym4_revision],
-           m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
-@@ -65,7 +70,22 @@
- AC_SUBST(VERSION_NUMBER)
- 
- AC_CONFIG_AUX_DIR([build-aux])
--AM_INIT_AUTOMAKE([serial-tests dist-bzip2])
-+
-+dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
-+dnl gives an error if it sees this, but for automake >= 1.13
-+dnl serial-tests is required so we have to include it.  Solution is to
-+dnl test for the version of automake (by running an external command)
-+dnl and provide it if necessary.  Note we have to do this entirely using
-+dnl m4 macros since automake queries this macro by running
-+dnl 'autoconf --trace ...'.
-+m4_define([serial_tests], [
-+    m4_esyscmd([automake --version |
-+                head -1 |
-+                awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}'
-+    ])
-+])
-+AM_INIT_AUTOMAKE(foreign serial_tests dist-bzip2) dnl NB: Do not [quote] this parameter.
-+
- AM_MAINTAINER_MODE
- AC_CONFIG_SRCDIR([src/err-sources.h.in])
- AC_CONFIG_HEADER([config.h])

More information about the Libreoffice-commits mailing list