summaryrefslogtreecommitdiffstats
path: root/third_party/libxml/google.patch
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/libxml/google.patch')
-rw-r--r--third_party/libxml/google.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/third_party/libxml/google.patch b/third_party/libxml/google.patch
index 10fde21..5cd4e9b 100644
--- a/third_party/libxml/google.patch
+++ b/third_party/libxml/google.patch
@@ -1,3 +1,56 @@
+diff -ur libxml2-2.6.31.orig/configure libxml2-2.6.31/configure
+--- libxml2-2.6.31.orig/configure 2008-01-11 00:01:56.000000000 -0800
++++ libxml2-2.6.31/configure 2008-08-05 12:19:40.000000000 -0700
+@@ -952,6 +952,7 @@
+ TEST_XPATH
+ WITH_OUTPUT
+ WITH_ICONV
++WITH_ICU
+ WITH_ISO8859X
+ WITH_SCHEMATRON
+ TEST_SCHEMATRON
+@@ -28792,6 +28793,8 @@
+ fi
+
+
++WITH_ICU=1
++
+ WITH_ICONV=0
+ if test "$with_iconv" = "no" ; then
+ echo Disabling ICONV support
+@@ -29213,7 +29216,7 @@
+ ln -s Copyright COPYING
+
+ # keep on one line for cygwin c.f. #130896
+-ac_config_files="$ac_config_files libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/Makefile python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py"
++ac_config_files="$ac_config_files include/libxml/xmlversion.h xml2-config"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -30119,6 +30122,7 @@
+ TEST_XPATH!$TEST_XPATH$ac_delim
+ WITH_OUTPUT!$WITH_OUTPUT$ac_delim
+ WITH_ICONV!$WITH_ICONV$ac_delim
++WITH_ICU!$WITH_ICU$ac_delim
+ WITH_ISO8859X!$WITH_ISO8859X$ac_delim
+ WITH_SCHEMATRON!$WITH_SCHEMATRON$ac_delim
+ TEST_SCHEMATRON!$TEST_SCHEMATRON$ac_delim
+@@ -30130,7 +30134,7 @@
+ DEBUG_OBJ!$DEBUG_OBJ$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -30794,5 +30798,5 @@
+ fi
+
+
+-chmod +x xml2-config python/setup.py
++chmod +x xml2-config
+ echo Done configuring
diff -ur libxml2-2.6.31/encoding.c libxml/encoding.c
--- libxml2-2.6.31/encoding.c 2007-05-28 07:08:52.000000000 -0700
+++ libxml/encoding.c 2008-03-17 14:28:09.000000000 -0400