diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-12-28 21:47:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-01-08 20:00:18 +0100 |
| commit | 4f76a8329a8cc31fac1e4a9ee6f4658a6802b854 (patch) | |
| tree | 2eb2c9a976ecb26ad77823a24c06bf112e4d54a1 /external | |
| parent | e0721a655ca69d699024fd91da7071da0485b218 (diff) | |
Update libassuan to 2.5.5
Change-Id: Icd1034f4c6b43605f5d43fe28f7e0d191311daf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127664
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit 568a5bba2a30ab588b52677106bf209d4c0df758)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128084
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libassuan/ExternalPackage_libassuan.mk | 2 | ||||
| -rw-r--r-- | external/libassuan/w32-build-fixes.patch.1 | 5 |
2 files changed, 4 insertions, 3 deletions
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 \ |