external/xmlsec/UnpackedTarball_xmlsec.mk | 1 +
external/xmlsec/windows7.patch.1 | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
New commits:
commit 9b61c811e43991e61505d32776a59c03c00dc58a
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Sat Feb 13 18:08:36 2021 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Feb 15 10:18:19 2021 +0100
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 <vmik...@collabora.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
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 <alek...@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
+
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
