download.lst | 4 ++--
external/libassuan/ExternalPackage_libassuan.mk | 2 +-
external/libassuan/ExternalProject_libassuan.mk | 2 ++
external/libassuan/w32-build-fixes.patch.1 | 10 +++++-----
4 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 814ff5301d4db1119aeec63a41cdaaa49d71348b
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Sun Dec 10 23:56:16 2017 +0100
libassuan: upgrade to release 2.5.1
Change-Id: Ic6ec245b0011676b1346ea75c016b3af02a0361c
Reviewed-on: https://gerrit.libreoffice.org/46205
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 342c245320ba..0faaa5312987 100644
--- a/download.lst
+++ b/download.lst
@@ -126,8 +126,8 @@ export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fa
export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
export LCMS2_SHA256SUM := 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
export LCMS2_TARBALL := lcms2-2.8.tar.gz
-export LIBASSUAN_SHA256SUM := 22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71
-export LIBASSUAN_TARBALL := libassuan-2.4.3.tar.bz2
+export LIBASSUAN_SHA256SUM := 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449
+export LIBASSUAN_TARBALL := libassuan-2.5.1.tar.bz2
export LIBATOMIC_OPS_SHA256SUM := cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad
export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
export LIBEOT_SHA256SUM := cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a
diff --git a/external/libassuan/ExternalPackage_libassuan.mk b/external/libassuan/ExternalPackage_libassuan.mk
index 41af53b2c373..955dddd3c7ae 100644
--- a/external/libassuan/ExternalPackage_libassuan.mk
+++ b/external/libassuan/ExternalPackage_libassuan.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),LINUX)
-$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.7.3))
+$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.1))
else ifeq ($(OS),MACOSX)
diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk
index 03570ff9e9ef..83d79a520988 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -28,6 +28,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl
&& ./configure \
--enable-static \
--disable-shared \
+ --disable-doc \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(CXXFLAGS)" \
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
@@ -42,6 +43,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
$(call gb_ExternalProject_run,build,\
autoreconf \
&& ./configure \
+ --disable-doc \
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
$(if $(filter LINUX,$(OS)), \
diff --git a/external/libassuan/w32-build-fixes.patch.1 b/external/libassuan/w32-build-fixes.patch.1
index 9b5c78f1c10f..b0dbbf841a24 100755
--- a/external/libassuan/w32-build-fixes.patch.1
+++ b/external/libassuan/w32-build-fixes.patch.1
@@ -53,12 +53,12 @@ diff -ru libassuan.orig/src/assuan-handler.c libassuan/src/assuan-handler.c
diff -ru libassuan.orig/Makefile.am libassuan/Makefile.am
--- libassuan.orig/Makefile.am 2016-07-14 10:09:22.000000000 +0200
+++ libassuan/Makefile.am 2017-09-25 21:20:19.928317500 +0200
-@@ -28,7 +28,7 @@
- tests/ChangeLog-2011 contrib/ChangeLog-2011 \
- build-aux/git-log-footer build-aux/git-log-fix
+@@ -35,7 +35,7 @@
+ doc =
+ endif
--SUBDIRS = m4 src doc tests
-+SUBDIRS = m4 src doc
+-SUBDIRS = m4 src $(doc) tests
++SUBDIRS = m4 src $(doc)
dist-hook: gen-ChangeLog