mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libassuan: upgrade to release 2.5.1

Browse Source 
Change-Id: Ic6ec245b0011676b1346ea75c016b3af02a0361c
Reviewed-on: https://gerrit.libreoffice.org/46205
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
This commit is contained in:
Thorsten Behrens
2017-12-10 23:56:16 +01:00
parent a4408a523a
commit 814ff5301d
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
download.lst
View File

@@ -126,8 +126,8 @@ export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fa
export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
export LCMS2_SHA256SUM := 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22 export LCMS2_SHA256SUM := 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
export LCMS2_TARBALL := lcms2-2.8.tar.gz export LCMS2_TARBALL := lcms2-2.8.tar.gz
export LIBASSUAN_SHA256SUM := 22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71 export LIBASSUAN_SHA256SUM := 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449
export LIBASSUAN_TARBALL := libassuan-2.4.3.tar.bz2 export LIBASSUAN_TARBALL := libassuan-2.5.1.tar.bz2
export LIBATOMIC_OPS_SHA256SUM := cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad export LIBATOMIC_OPS_SHA256SUM := cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad
export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
export LIBEOT_SHA256SUM := cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a export LIBEOT_SHA256SUM := cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a

2
external/libassuan/ExternalPackage_libassuan.mk vendored
View File

@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),LINUX) 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) else ifeq ($(OS),MACOSX)

2
external/libassuan/ExternalProject_libassuan.mk vendored
View File

@@ -28,6 +28,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl
&& ./configure \ && ./configure \
--enable-static \ --enable-static \
--disable-shared \ --disable-shared \
--disable-doc \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(CXXFLAGS)" \ CXXFLAGS="$(CXXFLAGS)" \
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
@@ -42,6 +43,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
autoreconf \ autoreconf \
&& ./configure \ && ./configure \
--disable-doc \
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
$(if $(filter LINUX,$(OS)), \ $(if $(filter LINUX,$(OS)), \

10
external/libassuan/w32-build-fixes.patch.1 vendored
View File

@@ -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 diff -ru libassuan.orig/Makefile.am libassuan/Makefile.am
--- libassuan.orig/Makefile.am 2016-07-14 10:09:22.000000000 +0200 --- libassuan.orig/Makefile.am 2016-07-14 10:09:22.000000000 +0200
+++ libassuan/Makefile.am 2017-09-25 21:20:19.928317500 +0200 +++ libassuan/Makefile.am 2017-09-25 21:20:19.928317500 +0200
@@ -28,7 +28,7 @@ @@ -35,7 +35,7 @@
tests/ChangeLog-2011 contrib/ChangeLog-2011 \ doc =
build-aux/git-log-footer build-aux/git-log-fix endif
-SUBDIRS = m4 src doc tests -SUBDIRS = m4 src $(doc) tests
+SUBDIRS = m4 src doc +SUBDIRS = m4 src $(doc)
dist-hook: gen-ChangeLog dist-hook: gen-ChangeLog