ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

libassuan: upgrade to 3.0.2

Browse Source 
Downloaded from https://gnupg.org/ftp/gcrypt/libassuan/libassuan-3.0.2.tar.bz2

Change-Id: I007756045035517ef17eaa45086b3858eaf49f69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181870
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2025-02-19 11:40:42 +01:00
parent ec71ff69fe
commit dbff1a3506
4 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download.lst
+2 -2
View File
@@ -404,8 +404,8 @@ LCMS2_TARBALL := lcms2-2.17.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
LIBASSUAN_SHA256SUM := c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1
LIBASSUAN_TARBALL := libassuan-3.0.1.tar.bz2
LIBASSUAN_SHA256SUM := d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6
LIBASSUAN_TARBALL := libassuan-3.0.2.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
external/libassuan/ExternalPackage_libassuan.mk
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),LINUX)
$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.9,src/.libs/libassuan.so.9.0.1))
$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.9,src/.libs/libassuan.so.9.0.2))
else ifeq ($(OS),MACOSX)
external/libassuan/UnpackedTarball_libassuan.mk
Vendored
-1
View File
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libassuan,0))
$(eval $(call gb_UnpackedTarball_add_patches,libassuan, \
external/libassuan/find-libgpg-error.patch \
external/libassuan/drop_putc_unlocked.patch.1 \
external/libassuan/fix-autoconf-macros.patch \
$(if $(filter MSC,$(COM)),external/libassuan/w32-build-fixes.patch.1) \
external/libassuan/w32-build-fixes-2.patch \
external/libassuan/drop_putc_unlocked.patch.1
Vendored
-26
View File
@@ -1,26 +0,0 @@
commit 69069bc63e6b1152e34e39bc322132fd4fd7284d
Author: Werner Koch <wk@gnupg.org>
Date: Tue Jun 25 09:06:04 2024 +0200
Remove an declaration for an unused function
* src/assuan-defs.h (putc_unlocked): Remove declaration.
--
It seems the test for putc_unlocked was remove a long time ago.
GnuPG-bug-id: 7111
diff --git a/src/assuan-defs.h b/src/assuan-defs.h
index faf9aae..5052e8e 100644
--- a/src/assuan-defs.h
+++ b/src/assuan-defs.h
@@ -431,9 +431,6 @@ char *stpcpy (char *dest, const char *src);
#define clearenv _assuan_clearenv
int setenv (const char *name, const char *value, int replace);
#endif
-#ifndef HAVE_PUTC_UNLOCKED
-int putc_unlocked (int c, FILE *stream);
-#endif
#define DIM(v) (sizeof(v)/sizeof((v)[0]))