external/libxmlsec/UnpackedTarball_xmlsec.mk | 2 +
external/libxmlsec/xmlsec1-vc.patch.1 | 39 ----------------------
external/libxmlsec/xmlsec1-vs2015.patch.1 | 46 +++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 39 deletions(-)
New commits:
commit f7aa4344e4fec0e8bb49d6ba210bc3a78b7e1365
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Apr 20 09:03:31 2016 +0200
libxmlsec: split the upstreamed part of xmlsec1-vc.patch.1 into a new patch
Change-Id: I1a6201a21cdf3a42475487a42cd80d11cd5e42b6
Reviewed-on: https://gerrit.libreoffice.org/24253
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk
b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index 81600b9..e19c67c 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -15,6 +15,8 @@ xmlsec_patches += xmlsec1-nssmangleciphers.patch.1
xmlsec_patches += xmlsec1-noverify.patch.1
xmlsec_patches += xmlsec1-mingw-keymgr-mscrypto.patch.1
xmlsec_patches += xmlsec1-vc.patch.1
+# Upstreamed as
<https://github.com/lsh123/xmlsec/commit/727f1d3f1fa9c23d6d356b233c6fa274b5dd7d71>.
+xmlsec_patches += xmlsec1-vs2015.patch.1
xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
xmlsec_patches += xmlsec1-customkeymanage.patch.1
# Upstreamed as
<https://github.com/lsh123/xmlsec/commit/7069e2b0ab49679008abedd6d223fb95538b0684>.
diff --git a/external/libxmlsec/xmlsec1-vc.patch.1
b/external/libxmlsec/xmlsec1-vc.patch.1
index bf35001..8c249e8 100644
--- a/external/libxmlsec/xmlsec1-vc.patch.1
+++ b/external/libxmlsec/xmlsec1-vc.patch.1
@@ -10,45 +10,6 @@ Subject: [PATCH] xmlsec1-vc.patch
win32/Makefile.msvc | 10 +++++++++-
4 files changed, 12 insertions(+), 4 deletions(-)
-diff --git a/apps/cmdline.c b/apps/cmdline.c
-index b9ecafb..4425eaf 100644
---- a/apps/cmdline.c
-+++ b/apps/cmdline.c
-@@ -7,7 +7,7 @@
- *
- * Copyright (C) 2002-2003 Aleksey Sanin <alek...@aleksey.com>
- */
--#if defined(_MSC_VER)
-+#if defined(_MSC_VER) && _MSC_VER < 1900
- #define snprintf _snprintf
- #endif
-
-diff --git a/apps/crypto.c b/apps/crypto.c
-index 49dd127..f46eeee 100644
---- a/apps/crypto.c
-+++ b/apps/crypto.c
-@@ -7,7 +7,7 @@
- *
- * Copyright (C) 2002-2003 Aleksey Sanin <alek...@aleksey.com>
- */
--#if defined(_MSC_VER)
-+#if defined(_MSC_VER) && _MSC_VER < 1900
- #define snprintf _snprintf
- #endif
-
-diff --git a/apps/xmlsec.c b/apps/xmlsec.c
-index d551b5a..0467c25 100644
---- a/apps/xmlsec.c
-+++ b/apps/xmlsec.c
-@@ -9,7 +9,7 @@
- #include <string.h>
- #include <time.h>
-
--#if defined(_MSC_VER)
-+#if defined(_MSC_VER) && _MSC_VER < 1900
- #define snprintf _snprintf
- #endif
-
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index d833497..065595b 100644
--- a/win32/Makefile.msvc
diff --git a/external/libxmlsec/xmlsec1-vs2015.patch.1
b/external/libxmlsec/xmlsec1-vs2015.patch.1
new file mode 100644
index 0000000..53eacc05
--- /dev/null
+++ b/external/libxmlsec/xmlsec1-vs2015.patch.1
@@ -0,0 +1,46 @@
+From 56448979392d78a6e1688f61ce7bc771f38a880b Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmik...@collabora.co.uk>
+Date: Fri, 4 Mar 2016 16:12:29 +0100
+Subject: [PATCH] xmlsec1-vs2015.patch
+
+---
+
+diff --git a/apps/cmdline.c b/apps/cmdline.c
+index b9ecafb..4425eaf 100644
+--- a/apps/cmdline.c
++++ b/apps/cmdline.c
+@@ -7,7 +7,7 @@
+ *
+ * Copyright (C) 2002-2003 Aleksey Sanin <alek...@aleksey.com>
+ */
+-#if defined(_MSC_VER)
++#if defined(_MSC_VER) && _MSC_VER < 1900
+ #define snprintf _snprintf
+ #endif
+
+diff --git a/apps/crypto.c b/apps/crypto.c
+index 49dd127..f46eeee 100644
+--- a/apps/crypto.c
++++ b/apps/crypto.c
+@@ -7,7 +7,7 @@
+ *
+ * Copyright (C) 2002-2003 Aleksey Sanin <alek...@aleksey.com>
+ */
+-#if defined(_MSC_VER)
++#if defined(_MSC_VER) && _MSC_VER < 1900
+ #define snprintf _snprintf
+ #endif
+
+diff --git a/apps/xmlsec.c b/apps/xmlsec.c
+index d551b5a..0467c25 100644
+--- a/apps/xmlsec.c
++++ b/apps/xmlsec.c
+@@ -9,7 +9,7 @@
+ #include <string.h>
+ #include <time.h>
+
+-#if defined(_MSC_VER)
++#if defined(_MSC_VER) && _MSC_VER < 1900
+ #define snprintf _snprintf
+ #endif
+
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
