diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libassuan/ExternalPackage_libassuan.mk | 2 | ||||
| -rw-r--r-- | external/libassuan/w32-build-fixes.patch.1 | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/download.lst b/download.lst index 1ae0c34178ba..0426a650da60 100644 --- a/download.lst +++ b/download.lst @@ -142,8 +142,8 @@ export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fa export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_SHA256SUM := 18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 export LCMS2_TARBALL := lcms2-2.12.tar.gz -export LIBASSUAN_SHA256SUM := 91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702 -export LIBASSUAN_TARBALL := libassuan-2.5.3.tar.bz2 +export LIBASSUAN_SHA256SUM := 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 +export LIBASSUAN_TARBALL := libassuan-2.5.5.tar.bz2 export LIBATOMIC_OPS_SHA256SUM := 1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665 export LIBATOMIC_OPS_TARBALL := libatomic_ops-7.6.8.tar.gz export LIBEOT_SHA256SUM := cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a diff --git a/external/libassuan/ExternalPackage_libassuan.mk b/external/libassuan/ExternalPackage_libassuan.mk index 7a08028adbdd..0f24e5e2dec4 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.8.3)) +$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.5)) else ifeq ($(OS),MACOSX) diff --git a/external/libassuan/w32-build-fixes.patch.1 b/external/libassuan/w32-build-fixes.patch.1 index cac6ea1045bc..ebf98c5f5093 100644 --- a/external/libassuan/w32-build-fixes.patch.1 +++ b/external/libassuan/w32-build-fixes.patch.1 @@ -33,13 +33,14 @@ diff -ru libassuan.orig/src/Makefile.am libassuan/src/Makefile.am `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -@@ -148,9 +148,9 @@ +@@ -148,10 +148,10 @@ $(DESTDIR)$(bindir)/gpgcedev.dll endif +mkheader$(EXEEXT): mkheader.c Makefile -mkheader: mkheader.c Makefile - $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ + $(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c +assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h) + ./mkheader$(EXEEXT) $(host_os) $(srcdir)/assuan.h.in \ |