summaryrefslogtreecommitdiff
path: root/external/libxmlsec/xmlsec1-vc.patch.1
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-07-13 19:14:48 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-07-14 07:01:15 +0000
commit742e632d8acbe5d0a036d748c062a6616acfdf4a (patch)
treee02400818c7b1a042f48d653aa9b81abcac88a5a /external/libxmlsec/xmlsec1-vc.patch.1
parentef5ffe57db1dbf504ede59cf74d695d9c0a7f97b (diff)
Upgrade libxmlsec to 1.2.22
No major changes for us, except that finally we bundle the latest upstream (but still heavily patch it). Change-Id: I6bcfcdf48ec5d25eb3f7b14c89838942b4a11b48 Reviewed-on: https://gerrit.libreoffice.org/27196 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external/libxmlsec/xmlsec1-vc.patch.1')
-rw-r--r--external/libxmlsec/xmlsec1-vc.patch.112
1 files changed, 6 insertions, 6 deletions
diff --git a/external/libxmlsec/xmlsec1-vc.patch.1 b/external/libxmlsec/xmlsec1-vc.patch.1
index 9e40c5de5be2..117a031c5570 100644
--- a/external/libxmlsec/xmlsec1-vc.patch.1
+++ b/external/libxmlsec/xmlsec1-vc.patch.1
@@ -4,14 +4,14 @@ Date: Fri, 4 Mar 2016 16:12:29 +0100
Subject: [PATCH] xmlsec1-vc.patch
---
- win32/Makefile.msvc | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
+ win32/Makefile.msvc | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index 30b9dfb..51c53a7 100644
+index 978336e..a474592 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
-@@ -309,6 +309,10 @@ CFLAGS = $(CFLAGS) /D PACKAGE=\"$(XMLSEC_NAME)\"
+@@ -311,6 +311,10 @@ CFLAGS = $(CFLAGS) /D PACKAGE=\"$(XMLSEC_NAME)\"
CFLAGS = $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H"
CFLAGS = $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H"
CFLAGS = $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H"
@@ -22,7 +22,7 @@ index 30b9dfb..51c53a7 100644
!if "$(UNICODE)" == "1"
CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE"
-@@ -332,7 +332,7 @@ CFLAGS = $(CFLAGS) /DXMLSEC_MSCRYPTO_NT4=1
+@@ -334,7 +338,7 @@ CFLAGS = $(CFLAGS) /DXMLSEC_MSCRYPTO_NT4=1
!else
!endif
@@ -31,7 +31,7 @@ index 30b9dfb..51c53a7 100644
!if "$(WITH_DL)" == "1"
CFLAGS = $(CFLAGS) /D "XMLSEC_DL_WIN32"
APP_CFLAGS = $(APP_CFLAGS) /D "XMLSEC_CRYPTO_DYNAMIC_LOADING"
-@@ -363,7 +367,11 @@ LIBS =
+@@ -365,7 +369,11 @@ LIBS =
!if "$(DEBUG)" == "1"
LDFLAGS = $(LDFLAGS) /DEBUG
!else