summaryrefslogtreecommitdiff
path: root/external/libxmlsec/xmlsec1-vc.patch.1
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-09-14 15:11:33 +0200
committerMichael Stahl <mstahl@redhat.com>2017-09-15 11:04:14 +0200
commit6cdf761c7a9e167cde85d4e8e6f356c99a259f68 (patch)
treeb214c14cb5ffa5d3f60d383322c3916e26de00dc /external/libxmlsec/xmlsec1-vc.patch.1
parent84b0f0631574832c5939cc63456fd1322e67339f (diff)
consistent naming of externals: libxmlsec -> xmlsec
Change-Id: I9774dbec91b397d291d8f7f9bf96bbb75fc2baad Reviewed-on: https://gerrit.libreoffice.org/42298 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/libxmlsec/xmlsec1-vc.patch.1')
-rw-r--r--external/libxmlsec/xmlsec1-vc.patch.129
1 files changed, 0 insertions, 29 deletions
diff --git a/external/libxmlsec/xmlsec1-vc.patch.1 b/external/libxmlsec/xmlsec1-vc.patch.1
deleted file mode 100644
index f84371abb8eb..000000000000
--- a/external/libxmlsec/xmlsec1-vc.patch.1
+++ /dev/null
@@ -1,29 +0,0 @@
-From 223ae3881bedb8070774271ab4300a447f94f845 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.co.uk>
-Date: Fri, 4 Mar 2016 16:12:29 +0100
-Subject: [PATCH] xmlsec1-vc.patch
-
-Conflicts:
- win32/Makefile.msvc
----
- win32/Makefile.msvc | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index 8156caa7..ef1909ce 100644
---- a/win32/Makefile.msvc
-+++ b/win32/Makefile.msvc
-@@ -311,6 +311,10 @@ 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"
- CFLAGS = $(CFLAGS) /D "XMLSEC_NO_GOST" /D "XMLSEC_NO_GOST2012"
-+CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
-+!if "$(MSVC_USE_DEBUG_RUNTIME)" != ""
-+CFLAGS = $(CFLAGS) /MDd
-+!endif
-
- !if "$(UNICODE)" == "1"
- CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE"
---
-2.12.0
-