strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libgpg-error: upgrade to 1.51

Browse source 
* external/libgpg-error/w32-build-fixes-6.patch fixes
libgpg-error.lib(libgpg_error_la-spawn-w32.obj) : error LNK2019: unresolved external symbol __imp__AllowSetForegroundWindow@4 referenced in function __gpgrt_process_spawn

Downloaded from https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.51.tar.bz2

Change-Id: I6001d1932d1226c0daa037408523f98a9e719f2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176446
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli 2024-11-11 21:08:13 +01:00
parent 3aecdee689
commit 908b85de63
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download.lst
View file

@ -429,8 +429,8 @@ LIBFFI_TARBALL := libffi-3.4.6.tar.gz
# three static lines # three static lines
# so that git cherry-pick # so that git cherry-pick
# will not run into conflicts # will not run into conflicts
LIBGPGERROR_SHA256SUM := 69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a LIBGPGERROR_SHA256SUM := be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2
LIBGPGERROR_TARBALL := libgpg-error-1.50.tar.bz2 LIBGPGERROR_TARBALL := libgpg-error-1.51.tar.bz2
# three static lines # three static lines
# so that git cherry-pick # so that git cherry-pick
# will not run into conflicts # will not run into conflicts

2
external/libgpg-error/ExternalPackage_libgpg-error.mk vendored
View file

@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.37.0)) $(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.38.0))
else ifeq ($(OS),MACOSX) else ifeq ($(OS),MACOSX)

3
external/libgpg-error/UnpackedTarball_libgpg-error.mk vendored
View file

@ -17,8 +17,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \ $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \
$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \ $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \
$(if $(filter MSC,$(COM)),external/libgpg-error/w32-disable-dllinit.patch.1) \ $(if $(filter MSC,$(COM)),external/libgpg-error/w32-disable-dllinit.patch.1) \
external/libgpg-error/w32-build-fixes-4.patch \ $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-4.patch) \
$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-5.patch) \ $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-5.patch) \
$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-6.patch) \
$(if $(filter LINUX,$(OS)),external/libgpg-error/libgpgerror-bundled-soname.patch.1) \ $(if $(filter LINUX,$(OS)),external/libgpg-error/libgpgerror-bundled-soname.patch.1) \
external/libgpg-error/clang-cl.patch \ external/libgpg-error/clang-cl.patch \
external/libgpg-error/undeclared-environ-macOS.patch \ external/libgpg-error/undeclared-environ-macOS.patch \

15
external/libgpg-error/w32-build-fixes-6.patch vendored Normal file
View file

@ -0,0 +1,15 @@
--- src/spawn-w32.c 2024-11-12 14:35:30.648259606 +0100
+++ src/spawn-w32.c 2024-11-12 14:35:56.972307401 +0100
@@ -1061,9 +1061,9 @@
/* Fixme: For unknown reasons AllowSetForegroundWindow returns
* an invalid argument error if we pass it the correct
* processID. As a workaround we use -1 (ASFW_ANY). */
- if (!AllowSetForegroundWindow (ASFW_ANY /*pi.dwProcessId*/))
- _gpgrt_log_info ("AllowSetForegroundWindow() failed: ec=%d\n",
- (int)GetLastError ());
+ //if (!AllowSetForegroundWindow (ASFW_ANY /*pi.dwProcessId*/))
+ // _gpgrt_log_info ("AllowSetForegroundWindow() failed: ec=%d\n",
+ // (int)GetLastError ());
}
/* Process has been created suspended; resume it now. */