Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Unified Diff: third_party/libxml/patches/icu-win32

Issue 2951008: Update libxml to 2.7.7. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/libxml/patches/icu-win32
diff --git a/third_party/libxml/patches/icu-win32 b/third_party/libxml/patches/icu-win32
new file mode 100644
index 0000000000000000000000000000000000000000..1297bd2be67e5fe8e7d3754b6be97f4f4e96ee79
--- /dev/null
+++ b/third_party/libxml/patches/icu-win32
@@ -0,0 +1,70 @@
+Modifications to the Windows build to allow conditionally using ICU.
+
+Index: libxml/win32/Makefile.msvc
+===================================================================
+--- libxml.orig/win32/Makefile.msvc 2010-07-09 14:56:57.339103770 -0700
++++ libxml/win32/Makefile.msvc 2010-07-09 14:57:02.219529472 -0700
+@@ -71,6 +71,9 @@
+ !if "$(WITH_ICONV)" == "1"
+ LIBS = $(LIBS) iconv.lib
+ !endif
+++!if "$(WITH_ICU)" == "1"
+++LIBS = $(LIBS) icu.lib
+++!endif
+ !if "$(WITH_ZLIB)" == "1"
+ LIBS = $(LIBS) zdll.lib
+ !endif
+Index: libxml/win32/configure.js
+===================================================================
+--- libxml.orig/win32/configure.js 2010-07-09 14:57:14.109642331 -0700
++++ libxml/win32/configure.js 2010-07-09 14:57:34.249106740 -0700
+@@ -40,6 +40,7 @@
+ var withXptr = true;
+ var withXinclude = true;
+ var withIconv = true;
++var withIcu = false;
+ var withIso8859x = false;
+ var withZlib = false;
+ var withDebug = true;
+@@ -124,6 +125,7 @@
+ txt += " xptr: Enable XPointer support (" + (withXptr? "yes" : "no") + ")\n";
+ txt += " xinclude: Enable XInclude support (" + (withXinclude? "yes" : "no") + ")\n";
+ txt += " iconv: Enable iconv support (" + (withIconv? "yes" : "no") + ")\n";
++ txt += " icu: Enable icu support (" + (withIcu? "yes" : "no") + ")\n";
+ txt += " iso8859x: Enable ISO8859X support (" + (withIso8859x? "yes" : "no") + ")\n";
+ txt += " zlib: Enable zlib support (" + (withZlib? "yes" : "no") + ")\n";
+ txt += " xml_debug: Enable XML debbugging module (" + (withDebug? "yes" : "no") + ")\n";
+@@ -233,6 +235,7 @@
+ vf.WriteLine("WITH_XPTR=" + (withXptr? "1" : "0"));
+ vf.WriteLine("WITH_XINCLUDE=" + (withXinclude? "1" : "0"));
+ vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0"));
++ vf.WriteLine("WITH_ICU=" + (withIcu? "1" : "0"));
+ vf.WriteLine("WITH_ISO8859X=" + (withIso8859x? "1" : "0"));
+ vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0"));
+ vf.WriteLine("WITH_DEBUG=" + (withDebug? "1" : "0"));
+@@ -319,6 +322,8 @@
+ of.WriteLine(s.replace(/\@WITH_XINCLUDE\@/, withXinclude? "1" : "0"));
+ } else if (s.search(/\@WITH_ICONV\@/) != -1) {
+ of.WriteLine(s.replace(/\@WITH_ICONV\@/, withIconv? "1" : "0"));
++ } else if (s.search(/\@WITH_ICU\@/) != -1) {
++ of.WriteLine(s.replace(/\@WITH_ICU\@/, withIcu? "1" : "0"));
+ } else if (s.search(/\@WITH_ISO8859X\@/) != -1) {
+ of.WriteLine(s.replace(/\@WITH_ISO8859X\@/, withIso8859x? "1" : "0"));
+ } else if (s.search(/\@WITH_ZLIB\@/) != -1) {
+@@ -462,6 +467,8 @@
+ withXinclude = strToBool(arg.substring(opt.length + 1, arg.length));
+ else if (opt == "iconv")
+ withIconv = strToBool(arg.substring(opt.length + 1, arg.length));
++ else if (opt == "icu")
++ withIcu = strToBool(arg.substring(opt.length + 1, arg.length));
+ else if (opt == "iso8859x")
+ withIso8859x = strToBool(arg.substring(opt.length + 1, arg.length));
+ else if (opt == "zlib")
+@@ -646,6 +653,7 @@
+ txtOut += " XPointer support: " + boolToStr(withXptr) + "\n";
+ txtOut += " XInclude support: " + boolToStr(withXinclude) + "\n";
+ txtOut += " iconv support: " + boolToStr(withIconv) + "\n";
++txtOut += " icu support: " + boolToStr(withIcu) + "\n";
+ txtOut += " iso8859x support: " + boolToStr(withIso8859x) + "\n";
+ txtOut += " zlib support: " + boolToStr(withZlib) + "\n";
+ txtOut += " Debugging module: " + boolToStr(withDebug) + "\n";

Powered by Google App Engine
This is Rietveld 408576698