download.lst | 4 ++--
external/libassuan/ExternalPackage_libassuan.mk | 2 +-
external/libassuan/w32-build-fixes.patch.1 | 14 --------------
3 files changed, 3 insertions(+), 17 deletions(-)
New commits:
commit 64148345dfe046e21955ec60042c4e64acb04049
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Jun 24 10:18:55 2023 +0900
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jun 28 09:59:54 2023 +0200
Update libassuan to 2.5.6
Change-Id: Iea5af01231e67c24d34287929a54f5ec86af47ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153545
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 88019e3ac34e35c193df0ae682722f6ec3ba5133)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153669
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index ae37b394ae52..6a76dee49b12 100644
--- a/download.lst
+++ b/download.lst
@@ -289,8 +289,8 @@ LCMS2_TARBALL := lcms2-2.12.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBASSUAN_SHA256SUM :=
8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
-LIBASSUAN_TARBALL := libassuan-2.5.5.tar.bz2
+LIBASSUAN_SHA256SUM :=
e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426
+LIBASSUAN_TARBALL := libassuan-2.5.6.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/libassuan/ExternalPackage_libassuan.mk
b/external/libassuan/ExternalPackage_libassuan.mk
index 0f24e5e2dec4..2df7b562d584 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.5))
+$(eval $(call
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.6))
else ifeq ($(OS),MACOSX)
diff --git a/external/libassuan/w32-build-fixes.patch.1
b/external/libassuan/w32-build-fixes.patch.1
index ebf98c5f5093..8d77eef37cd5 100644
--- a/external/libassuan/w32-build-fixes.patch.1
+++ b/external/libassuan/w32-build-fixes.patch.1
@@ -33,20 +33,6 @@ 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,10 +148,10 @@
- $(DESTDIR)$(bindir)/gpgcedev.dll
- endif
-
-+mkheader$(EXEEXT): mkheader.c Makefile
--mkheader: mkheader.c Makefile
- $(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 \
--assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
-- ./mkheader $(host_os) $(srcdir)/assuan.h.in \
- $(PACKAGE_VERSION) $(VERSION_NUMBER) >$@
diff -ru libassuan.orig/src/assuan-handler.c libassuan/src/assuan-handler.c
--- libassuan.orig/src/assuan-handler.c 2016-06-25 16:27:49.000000000 +0200
+++ libassuan/src/assuan-handler.c 2017-09-24 15:32:51.200956200 +0200
