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/libxmlsec/UnpackedTarball_xmlsec.mk | |
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/libxmlsec/UnpackedTarball_xmlsec.mk')
-rw-r--r-- | external/libxmlsec/UnpackedTarball_xmlsec.mk | 2 |
1 files changed, 2 insertions, 0 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 |