diff options
| author | Aron Budea <aron.budea@collabora.com> | 2021-02-13 18:08:36 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-02-15 10:18:19 +0100 |
| commit | 9b61c811e43991e61505d32776a59c03c00dc58a (patch) | |
| tree | 395b35a0e135c36edfe57b636a40bcc7a1c97d31 /external | |
| parent | 3aad3955650edb543d74a4c1e3ebdb1f4d3940b7 (diff) | |
tdf#140234: Fix xmlsec on Windows 7
Apply 21bbcb04b62352331a15a0b8463ebb27a9b858bc from upstream
locally.
Change-Id: Icb1ca245ebb6453040fbce6da54d13086970b0e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110846
Tested-by: Miklos Vajna <vmiklos@collabora.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/xmlsec/UnpackedTarball_xmlsec.mk | 1 | ||||
| -rw-r--r-- | external/xmlsec/windows7.patch.1 | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk b/external/xmlsec/UnpackedTarball_xmlsec.mk index 3ad978cdb829..412359b6d3fa 100644 --- a/external/xmlsec/UnpackedTarball_xmlsec.mk +++ b/external/xmlsec/UnpackedTarball_xmlsec.mk @@ -8,6 +8,7 @@ # xmlsec_patches := +xmlsec_patches += windows7.patch.1 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec)) diff --git a/external/xmlsec/windows7.patch.1 b/external/xmlsec/windows7.patch.1 new file mode 100644 index 000000000000..ccefc96c1c01 --- /dev/null +++ b/external/xmlsec/windows7.patch.1 @@ -0,0 +1,25 @@ +From 21bbcb04b62352331a15a0b8463ebb27a9b858bc Mon Sep 17 00:00:00 2001 +From: Aleksey Sanin <aleksey@aleksey.com> +Date: Thu, 12 Nov 2020 11:17:01 -0800 +Subject: [PATCH] Fix DLL loading on windows + +--- + src/dl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dl.c b/src/dl.c +index e934fe4e..a511df43 100644 +--- a/src/dl.c ++++ b/src/dl.c +@@ -148,7 +148,7 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) { + #endif /* XMLSEC_DL_LIBLTDL */ + + #ifdef XMLSEC_DL_WIN32 +-#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) + lib->handle = LoadLibraryA((char*)lib->filename); + #else + LPWSTR wcLibFilename = xmlSecWin32ConvertUtf8ToUnicode(lib->filename); +-- +2.25.1 + |