summaryrefslogtreecommitdiff
path: root/external/liborcus
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-08-12 11:26:45 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-08-12 17:37:31 +0200
commit18b3edcfbd9c47efc6b29feb6a77a5a89bc9cd25 (patch)
tree2261db326d9a93f9e5fbe320a842ecefac4397f8 /external/liborcus
parentdfac13b483ba38ce6f61cd0a1e5757c6a08ab296 (diff)
orcus: underscores are allowed as starting character in xml names
Change-Id: Ib379831bb0725d97bc79681af7a2052ccd553c79 Reviewed-on: https://gerrit.libreoffice.org/41081 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'external/liborcus')
-rw-r--r--external/liborcus/UnpackedTarball_liborcus.mk1
-rw-r--r--external/liborcus/orcus_allow_underscore_in_names.patch.112
2 files changed, 13 insertions, 0 deletions
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 << "'";