[Libreoffice-commits] core.git: external/xmlsec

[Libreoffice Gerrit user]

 external/xmlsec/UnpackedTarball_xmlsec.mk |    1 
 external/xmlsec/xmlsec1-configure.patch.1 |   31 ------------------------------
 2 files changed, 32 deletions(-)

New commits:
commit 10d497f9cc03e55c0e7119449e119606c40c563e
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Nov 14 21:04:44 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Nov 15 09:06:47 2018 +0100

    libxmlsec: drop last not needed patch
    
    This was patching the nmake build system for nss purposes, but we use
    nss on Linux/macOS only, and there we use the autotools build system, so
    this patch had no effect at the end.
    
    Change-Id: I0f0c3e0d045818ad3e456dd49017ae328ef6e053
    Reviewed-on: https://gerrit.libreoffice.org/63385
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk b/external/xmlsec/UnpackedTarball_xmlsec.mk
index 12d32a05bb1a..e4d092bef019 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -8,7 +8,6 @@
 #
 
 xmlsec_patches :=
-xmlsec_patches += xmlsec1-configure.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 
diff --git a/external/xmlsec/xmlsec1-configure.patch.1 b/external/xmlsec/xmlsec1-configure.patch.1
deleted file mode 100644
index 84d48ad023e6..000000000000
--- a/external/xmlsec/xmlsec1-configure.patch.1
+++ /dev/null
@@ -1,31 +0,0 @@
-From d986998536465ad4244f5b2936bf704485f8906c Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos at collabora.co.uk>
-Date: Fri, 4 Mar 2016 16:06:19 +0100
-Subject: [PATCH] xmlsec1-configure.patch
-
-Conflicts:
-	Makefile.am
-	Makefile.in
-	configure.ac
-	win32/Makefile.msvc
----
- configure.ac        | 35 ++++++++++++++++++++++++++++++-----
- win32/Makefile.msvc |  2 +-
- 2 files changed, 31 insertions(+), 6 deletions(-)
-
-diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index 0689f11b..e7cd5c38 100644
---- a/win32/Makefile.msvc
-+++ b/win32/Makefile.msvc
-@@ -451,7 +451,7 @@ XMLSEC_OPENSSL_SOLIBS   = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32
- XMLSEC_OPENSSL_ALIBS    = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib crypt32.lib advapi32.lib
- !endif
- 
--XMLSEC_NSS_SOLIBS       = smime3.lib ssl3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
-+XMLSEC_NSS_SOLIBS       = smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib gdi32.lib
- XMLSEC_NSS_ALIBS        = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
- 
- XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
--- 
-2.16.3
-