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

Markus Mohrhard markus.mohrhard at googlemail.com
Sat Aug 12 10:14:07 UTC 2017


 external/liborcus/UnpackedTarball_liborcus.mk            |    1 +
 external/liborcus/orcus_allow_missing_xml_header.patch.1 |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit d1195c097126c4986462857d01e27ee33352fbd1
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Aug 12 11:23:30 2017 +0200

    orcus: xml header is only mandatory in xml 1.1+
    
    Change-Id: I28aa8a2f340cb1a100dfa5d10d8d6e9b8dac2479
    Reviewed-on: https://gerrit.libreoffice.org/41080
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
index b37384e65d62..7bf65cbdcd41 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
 	external/liborcus/visibility.patch.0 \
 	external/liborcus/iOS.patch \
 	external/liborcus/nullptr-in-ostringstream.patch.1 \
+	external/liborcus/orcus_allow_missing_xml_header.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/orcus_allow_missing_xml_header.patch.1 b/external/liborcus/orcus_allow_missing_xml_header.patch.1
new file mode 100644
index 000000000000..2cfd498c7eae
--- /dev/null
+++ b/external/liborcus/orcus_allow_missing_xml_header.patch.1
@@ -0,0 +1,12 @@
+diff -ur liborcus.org/include/orcus/sax_parser.hpp liborcus/include/orcus/sax_parser.hpp
+--- liborcus.org/include/orcus/sax_parser.hpp	2017-08-12 09:44:21.379509116 +0200
++++ liborcus/include/orcus/sax_parser.hpp	2017-08-12 09:46:06.884259216 +0200
+@@ -20,7 +20,7 @@
+      * parsing regardless of whether or not the xml stream begins with a
+      * <?xml..?> declaration.
+      */
+-    static const bool strict_xml_declaration = true;
++    static const bool strict_xml_declaration = false;
+ };
+ 
+ /**


More information about the Libreoffice-commits mailing list