diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-26 21:49:52 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-27 07:04:51 +0000 |
| commit | 3efe880c3bb4504b0ee7ff8f425d6a91e441aa4d (patch) | |
| tree | fa8fd11ec6f6c0e65ccf52afcda3f22aa0741857 /external | |
| parent | e73c4d5013d7a0bf7d72db1773d7125ab91cf269 (diff) | |
libxmlsec: mark part of xmlsec1-vc.patch.1 as upstreamed
Change-Id: I4a8365c98eef87274ae1809047fd4ea582102f0b
Reviewed-on: https://gerrit.libreoffice.org/27556
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxmlsec/UnpackedTarball_xmlsec.mk | 2 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-vc.patch.1 | 9 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-win32-fix-undeclared.patch.1 | 31 |
3 files changed, 33 insertions, 9 deletions
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk b/external/libxmlsec/UnpackedTarball_xmlsec.mk index 785ee3418929..9de7c2f3edb4 100644 --- a/external/libxmlsec/UnpackedTarball_xmlsec.mk +++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk @@ -13,6 +13,8 @@ xmlsec_patches += xmlsec1-nssdisablecallbacks.patch.1 xmlsec_patches += xmlsec1-nssmangleciphers.patch.1 xmlsec_patches += xmlsec1-noverify.patch.1 xmlsec_patches += xmlsec1-mingw-keymgr-mscrypto.patch.1 +# Upstreamed as <https://github.com/lsh123/xmlsec/pull/37>. +xmlsec_patches += xmlsec1-win32-fix-undeclared.patch.1 xmlsec_patches += xmlsec1-vc.patch.1 xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1 xmlsec_patches += xmlsec1-customkeymanage.patch.1 diff --git a/external/libxmlsec/xmlsec1-vc.patch.1 b/external/libxmlsec/xmlsec1-vc.patch.1 index 117a031c5570..c4f9307b3b29 100644 --- a/external/libxmlsec/xmlsec1-vc.patch.1 +++ b/external/libxmlsec/xmlsec1-vc.patch.1 @@ -22,15 +22,6 @@ index 978336e..a474592 100644 !if "$(UNICODE)" == "1" CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE" -@@ -334,7 +338,7 @@ CFLAGS = $(CFLAGS) /DXMLSEC_MSCRYPTO_NT4=1 - !else - !endif - --APP_CFLAGS = /D "XMLSEC_DEFAULT_CRYPTO=\"$(XMLSEC_DEFAULT_CRYPTO)\"" -+CFLAGS = $(CFLAGS) /D "XMLSEC_DEFAULT_CRYPTO=\"$(XMLSEC_DEFAULT_CRYPTO)\"" - !if "$(WITH_DL)" == "1" - CFLAGS = $(CFLAGS) /D "XMLSEC_DL_WIN32" - APP_CFLAGS = $(APP_CFLAGS) /D "XMLSEC_CRYPTO_DYNAMIC_LOADING" @@ -365,7 +369,11 @@ LIBS = !if "$(DEBUG)" == "1" LDFLAGS = $(LDFLAGS) /DEBUG diff --git a/external/libxmlsec/xmlsec1-win32-fix-undeclared.patch.1 b/external/libxmlsec/xmlsec1-win32-fix-undeclared.patch.1 new file mode 100644 index 000000000000..ed4b47e5f73d --- /dev/null +++ b/external/libxmlsec/xmlsec1-win32-fix-undeclared.patch.1 @@ -0,0 +1,31 @@ +From 9481001992e12300db1a264144569ee1a2c4e24e Mon Sep 17 00:00:00 2001 +From: Miklos Vajna <vmiklos@collabora.co.uk> +Date: Fri, 8 Jul 2016 09:56:59 +0200 +Subject: [PATCH] win32: fix undeclared XMLSEC_DEFAULT_CRYPTO + +The problem was that APP_CFLAGS is not used for src/xmlsec.c, but it now +uses the identifier. This wasn't a problem on Linux, where commit +29da6cbb8f161ad01ff69ee5f8f6ec5d9f3dfab5 (replace XMLSEC_CRYPTO define +with xmlSecGetDefaultCrypto() function, 2016-02-06) updated +src/Makefile.am to include XMLSEC_DEFAULT_CRYPTO in the generic +AM_CFLAGS. +--- + win32/Makefile.msvc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc +index e3d5262..8c887a1 100644 +--- a/win32/Makefile.msvc ++++ b/win32/Makefile.msvc +@@ -334,7 +334,7 @@ CFLAGS = $(CFLAGS) /DXMLSEC_MSCRYPTO_NT4=1 + !else + !endif + +-APP_CFLAGS = /D "XMLSEC_DEFAULT_CRYPTO=\"$(XMLSEC_DEFAULT_CRYPTO)\"" ++CFLAGS = $(CFLAGS) /D "XMLSEC_DEFAULT_CRYPTO=\"$(XMLSEC_DEFAULT_CRYPTO)\"" + !if "$(WITH_DL)" == "1" + CFLAGS = $(CFLAGS) /D "XMLSEC_DL_WIN32" + APP_CFLAGS = $(APP_CFLAGS) /D "XMLSEC_CRYPTO_DYNAMIC_LOADING" +-- +2.6.6 + |