diff options
| author | Jian Fang Zhang <zhangjf@apache.org> | 2012-05-31 01:12:18 +0000 |
|---|---|---|
| committer | Jian Fang Zhang <zhangjf@apache.org> | 2012-05-31 01:12:18 +0000 |
| commit | af5d53f0e1bf18595bdfe0f26021435467d5f7a2 (patch) | |
| tree | d29f675f171fb4ca29ca8cd69be51fc8e0de3ea9 /libxml2 | |
| parent | ad5fa95e8c849e196caa0fa22094b513e48b406f (diff) | |
Fix issue #93433: build breaks in libxml2 on Korean Windows due to special character
* /libmxl2/libxml2-testapi.patch : replaced '\248' encoded in ISO-8859-1 with '\xf8'
* /libmxl2/libxml2-runtest.patch : replaced 'e' encoded in ISO-8859-1 as in 'resume' with \xe9
Patch by: tora3@nichoume.com
Notes
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/libxml2-runtest.patch | 11 | ||||
| -rw-r--r-- | libxml2/libxml2-testapi.patch | 20 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 8 |
3 files changed, 36 insertions, 3 deletions
diff --git a/libxml2/libxml2-runtest.patch b/libxml2/libxml2-runtest.patch new file mode 100644 index 000000000000..660d169586ac --- /dev/null +++ b/libxml2/libxml2-runtest.patch @@ -0,0 +1,11 @@ +--- misc/libxml2-2.7.6/runtest.c 2009-09-24 23:32:00.000000000 +0800 ++++ misc/build/libxml2-2.7.6/runtest.c 2012-05-29 14:17:16.852600200 +0800 +@@ -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\xE9sum\xE9.html", /* i93433: replaced 'e' encoded in ISO-8859-1 as in 'resume' with \xe9 */ + "urip://example.com/test?a=1&b=2%263&c=4#foo", + NULL + }; diff --git a/libxml2/libxml2-testapi.patch b/libxml2/libxml2-testapi.patch new file mode 100644 index 000000000000..381a30faedcd --- /dev/null +++ b/libxml2/libxml2-testapi.patch @@ -0,0 +1,20 @@ +--- misc/libxml2-2.7.6/testapi.c 2009-09-24 23:32:00.000000000 +0800 ++++ misc/build/libxml2-2.7.6/testapi.c 2012-05-29 14:17:00.868020600 +0800 +@@ -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'); /* i93433: replaced 'ø' encoded in ISO-8859-1 with '\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\xF8ne"); /* i93433: replaced 'ø' encoded in ISO-8859-1 with '\xf8' */ + if (no == 3) return((xmlChar *) " 2ab "); + return(NULL); + } diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index f7bf7c6df27f..8d058c1284f1 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -31,9 +31,9 @@ TARGET=so_libxml2 .INCLUDE : settings.mk .IF "$(SYSTEM_LIBXML)" == "YES" -all: - @echo "An already available installation of libxml should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." +#all: +# @echo "An already available installation of libxml should exist on your system." +# @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -49,6 +49,8 @@ PATCH_FILES=libxml2-configure.patch \ libxml2-gnome599717.patch \ libxml2-xpath.patch \ libxml2-global-symbols.patch \ + libxml2-testapi.patch \ + libxml2-runtest.patch .IF "$(OS)" == "WNT" PATCH_FILES+= libxml2-long-path.patch |