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

[Miklos Vajna]

 external/libxmlsec/UnpackedTarball_xmlsec.mk  |    1 -
 external/libxmlsec/xmlsec1-olderlibxml2.patch |   23 -----------------------
 2 files changed, 24 deletions(-)

New commits:
commit 6851e977f71075c2f43b967a52dc1d035a75b0f2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Feb 24 13:42:51 2016 +0100

    libxmlsec: remove no longer needed xmlsec1-olderlibxml2.patch
    
    I assume this was needed for the Linux baseline. CentOS 6 has libxml
    2.7.6, patch is needed for < 2.7.4. (CentOS 5 had 2.6.26, that is only
    used on libreoffice-5-0).
    
    Change-Id: Iae2edbf4f0d484944e399bd901d35a8260272700
    Reviewed-on: https://gerrit.libreoffice.org/22659
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index 18a9308..8492b7a 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,xmlsec,$(LIBXMLSEC_TARBALL),,libxml
 $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\
 	external/libxmlsec/xmlsec1-configure.patch \
 	external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch \
-	external/libxmlsec/xmlsec1-olderlibxml2.patch \
 	external/libxmlsec/xmlsec1-oldlibtool.patch \
 	external/libxmlsec/xmlsec1-nssdisablecallbacks.patch \
 	external/libxmlsec/xmlsec1-nssmangleciphers.patch \
diff --git a/external/libxmlsec/xmlsec1-olderlibxml2.patch b/external/libxmlsec/xmlsec1-olderlibxml2.patch
deleted file mode 100644
index f2bd85f..0000000
--- a/external/libxmlsec/xmlsec1-olderlibxml2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- misc/xmlsec1-1.2.14/src/c14n.c	2010-03-02 15:46:05.000000000 +0000
-+++ misc/build/xmlsec1-1.2.14/src/c14n.c	2010-03-02 15:50:35.000000000 +0000
-@@ -406,6 +406,20 @@
-     return(0);
- }
- 
-+#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20704
-+/*
-+ * xmlC14NMode:
-+ * 
-+ * Predefined values for C14N modes
-+ *
-+ */
-+typedef enum {
-+    XML_C14N_1_0            = 0,    /* Origianal C14N 1.0 spec */
-+    XML_C14N_EXCLUSIVE_1_0  = 1,    /* Exclusive C14N 1.0 spec */
-+    XML_C14N_1_1            = 2     /* C14N 1.1 spec */
-+} xmlC14NMode;
-+#endif
-+
- static int 
- xmlSecTransformC14NExecute(xmlSecTransformId id, xmlSecNodeSetPtr nodes, xmlChar** nsList, 
- 			   xmlOutputBufferPtr buf) {