Escaped non-ASCII characters from source files.
Building libxml2 with VC++ 2008 Express Edition on Windows platform where the locale is Japanese (or maybe Korean, Chinese or others) fails because some files generated by test tools in libxml2 contains non-ASCII characters. This issue is originally reported in OpenOffice.org community (issue 93433) and a patch is provided by tora, but it has not been applied yet. This modification is based on the patch and adapted to the current LibreOffice source.
This commit is contained in:
parent
2f44516d6c
commit
f64c2d5970
2 changed files with 34 additions and 1 deletions
32
libxml2/libxml2-latin.patch
Executable file
32
libxml2/libxml2-latin.patch
Executable file
|
@ -0,0 +1,32 @@
|
|||
--- misc/libxml2-2.7.6//runtest.c 2011-08-29 02:41:07.876872800 +0900
|
||||
+++ misc/build/libxml2-2.7.6/runtest.c 2011-08-29 02:47:09.068970800 +0900
|
||||
@@ -2728,7 +2728,7 @@
|
||||
"file:///path/to/a%20b.html",
|
||||
"/path/to/a b.html",
|
||||
"/path/to/a%20b.html",
|
||||
- "urip://example.com/résumé.html",
|
||||
+ "urip://example.com/r" "\xe9" "sum" "\xe9" ".html",
|
||||
"urip://example.com/test?a=1&b=2%263&c=4#foo",
|
||||
NULL
|
||||
};
|
||||
--- misc/libxml2-2.7.6//testapi.c 2011-08-29 02:41:28.088620300 +0900
|
||||
+++ misc/build/libxml2-2.7.6/testapi.c 2011-08-29 02:46:32.966174100 +0900
|
||||
@@ -291,7 +291,7 @@
|
||||
static xmlChar gen_xmlChar(int no, int nr ATTRIBUTE_UNUSED) {
|
||||
if (no == 0) return('a');
|
||||
if (no == 1) return(' ');
|
||||
- if (no == 2) return((xmlChar) 'ø');
|
||||
+ if (no == 2) return((xmlChar) '\xf8');
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -399,7 +399,7 @@
|
||||
static xmlChar *gen_const_xmlChar_ptr(int no, int nr ATTRIBUTE_UNUSED) {
|
||||
if (no == 0) return((xmlChar *) "foo");
|
||||
if (no == 1) return((xmlChar *) "<foo/>");
|
||||
- if (no == 2) return((xmlChar *) "nøne");
|
||||
+ if (no == 2) return((xmlChar *) "n" "\xf8" "ne");
|
||||
if (no == 3) return((xmlChar *) " 2ab ");
|
||||
return(NULL);
|
||||
}
|
||||
|
3
libxml2/makefile.mk
Normal file → Executable file
3
libxml2/makefile.mk
Normal file → Executable file
|
@ -53,7 +53,8 @@ PATCH_FILES=libxml2-configure.patch \
|
|||
libxml2-xpath.patch \
|
||||
libxml2-global-symbols.patch \
|
||||
libxml2-aix.patch \
|
||||
libxml2-vc10.patch
|
||||
libxml2-vc10.patch \
|
||||
libxml2-latin.patch
|
||||
|
||||
.IF "$(OS)" == "WNT"
|
||||
PATCH_FILES+= libxml2-long-path.patch
|
||||
|
|
Loading…
Reference in a new issue