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

[Markus Mohrhard]

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

New commits:
commit 18b3edcfbd9c47efc6b29feb6a77a5a89bc9cd25
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Aug 12 11:26:45 2017 +0200

    orcus: underscores are allowed as starting character in xml names
    
    Change-Id: Ib379831bb0725d97bc79681af7a2052ccd553c79
    Reviewed-on: https://gerrit.libreoffice.org/41081
    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 7bf65cbdcd41..9a3359f1bf79 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
 	external/liborcus/iOS.patch \
 	external/liborcus/nullptr-in-ostringstream.patch.1 \
 	external/liborcus/orcus_allow_missing_xml_header.patch.1 \
+	external/liborcus/orcus_allow_underscore_in_names.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/orcus_allow_underscore_in_names.patch.1 b/external/liborcus/orcus_allow_underscore_in_names.patch.1
new file mode 100644
index 000000000000..b5acc5a0938b
--- /dev/null
+++ b/external/liborcus/orcus_allow_underscore_in_names.patch.1
@@ -0,0 +1,12 @@
+diff -ur liborcus.org/src/parser/sax_parser_base.cpp liborcus/src/parser/sax_parser_base.cpp
+--- liborcus.org/src/parser/sax_parser_base.cpp	2017-08-12 10:39:49.963174114 +0200
++++ liborcus/src/parser/sax_parser_base.cpp	2017-08-12 10:41:32.026899749 +0200
+@@ -334,7 +334,7 @@
+ {
+     const char* p0 = mp_char;
+     char c = cur_char();
+-    if (!is_alpha(c))
++    if (!is_alpha(c) && c != '_')
+     {
+         ::std::ostringstream os;
+         os << "name must begin with an alphabet, but got this instead '" << c << "'";