Update libxml to 2.7.7.

In doing so, I recreated all the patches and organized them under
a patches/ subdirectory.

BUG=32197

Review URL: http://codereview.chromium.org/2951008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52725 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 83 insertions, 17 deletions

diff --git a/third_party/libxml/win32/Makefile.bcb b/third_party/libxml/win32/Makefile.bcb
index e706dc8..0bc4dbb 100644
--- a/third_party/libxml/win32/Makefile.bcb
+++ b/third_party/libxml/win32/Makefile.bcb
@@ -72,7 +72,7 @@ CFLAGS = $(CFLAGS) -DHAVE_ZLIB_H
 # The linker and its options.
 LD = ilink32.exe
 LDFLAGS = -q -U$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
-LDFLAGS = $(LDFLAGS) -L"$(BINDIR);$(LIBPREFIX);$(LIB);$(BCB)\lib\PSdk"
+LDFLAGS = $(LDFLAGS) -L"$(BINDIR);$(LIBPREFIX);$(LIB);$(BCB)\lib;$(BCB)\lib\PSdk"
 LIBS = import32.lib
 !if "$(WITH_THREADS)" != "no" && "$(DYNRUNTIME)" == "1"
 LIBS = $(LIBS) cw32mti.lib
@@ -84,7 +84,7 @@ LIBS = $(LIBS) cw32i.lib
 LIBS = $(LIBS) cw32.lib
 !endif
 !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
-LIBS = $(LIBS) wsock32.lib
+LIBS = $(LIBS) wsock32.lib ws2_32.lib
 !endif 
 !if "$(WITH_ICONV)" == "1"
 LIBS = $(LIBS) iconvomf.lib
diff --git a/third_party/libxml/win32/Makefile.msvc b/third_party/libxml/win32/Makefile.msvc
index e7947cc..253c46e 100644
--- a/third_party/libxml/win32/Makefile.msvc
+++ b/third_party/libxml/win32/Makefile.msvc
@@ -71,9 +71,9 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
 !if "$(WITH_ICONV)" == "1"
 LIBS = $(LIBS) iconv.lib
 !endif 
-+!if "$(WITH_ICU)" == "1"
-+LIBS = $(LIBS) icu.lib
-+!endif
+!if "$(WITH_ICU)" == "1"
+LIBS = $(LIBS) icu.lib
+!endif
 !if "$(WITH_ZLIB)" == "1"
 LIBS = $(LIBS) zdll.lib
 !endif
diff --git a/third_party/libxml/win32/configure.js b/third_party/libxml/win32/configure.js
index 342fd9d..75def3f 100644
--- a/third_party/libxml/win32/configure.js
+++ b/third_party/libxml/win32/configure.js
@@ -622,7 +622,7 @@ var new_makefile = ".\\Makefile";
 var f = fso.FileExists(new_makefile);
 if (f) {
        var t = fso.GetFile(new_makefile);
-       t.Attributes =0;
+       t.Attributes = 0;
 }
 fso.CopyFile(makefile, new_makefile, true);
 WScript.Echo("Created Makefile.");
diff --git a/third_party/libxml/win32/include/libxml/xmlversion.h b/third_party/libxml/win32/include/libxml/xmlversion.h
index 7b7da2c..debf613 100644
--- a/third_party/libxml/win32/include/libxml/xmlversion.h
+++ b/third_party/libxml/win32/include/libxml/xmlversion.h
@@ -29,21 +29,21 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *

  * the version string like "1.2.3"

  */

-#define LIBXML_DOTTED_VERSION "2.6.32"

+#define LIBXML_DOTTED_VERSION "2.7.7"

 

 /**

  * LIBXML_VERSION:

  *

  * the version number: 1.2.3 value is 10203

  */

-#define LIBXML_VERSION 20632

+#define LIBXML_VERSION 20707

 

 /**

  * LIBXML_VERSION_STRING:

  *

  * the version number string, 1.2.3 value is "10203"

  */

-#define LIBXML_VERSION_STRING "20632"

+#define LIBXML_VERSION_STRING "20707"

 

 /**

  * LIBXML_VERSION_EXTRA:

@@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * Macro to check that the libxml version in use is compatible with

  * the version the software has been compiled against

  */

-#define LIBXML_TEST_VERSION xmlCheckVersion(20632);

+#define LIBXML_TEST_VERSION xmlCheckVersion(20707);

 

 #ifndef VMS

 #if 0

@@ -165,7 +165,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *

  * Whether the FTP support is configured in

  */

-#if 0

+#if 1

 #define LIBXML_FTP_ENABLED

 #endif

 

@@ -174,7 +174,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *

  * Whether the HTTP support is configured in

  */

-#if 0

+#if 1

 #define LIBXML_HTTP_ENABLED

 #endif

 

@@ -391,22 +391,74 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #define LIBXML_ZLIB_ENABLED

 #endif

 

+#ifdef __GNUC__

+#ifdef HAVE_ANSIDECL_H

+#include <ansidecl.h>

+#endif

+

 /**

  * ATTRIBUTE_UNUSED:

  *

  * Macro used to signal to GCC unused function parameters

  */

-#ifdef __GNUC__

-#ifdef HAVE_ANSIDECL_H

-#include <ansidecl.h>

-#endif

+

 #ifndef ATTRIBUTE_UNUSED

 #define ATTRIBUTE_UNUSED __attribute__((unused))

 #endif

+

+/**

+ * LIBXML_ATTR_ALLOC_SIZE:

+ *

+ * Macro used to indicate to GCC this is an allocator function

+ */

+

+#ifndef LIBXML_ATTR_ALLOC_SIZE

+# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))

+#  define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))

+# else

+#  define LIBXML_ATTR_ALLOC_SIZE(x)

+# endif

 #else

-#define ATTRIBUTE_UNUSED

+# define LIBXML_ATTR_ALLOC_SIZE(x)

 #endif

 

+/**

+ * LIBXML_ATTR_FORMAT:

+ *

+ * Macro used to indicate to GCC the parameter are printf like

+ */

+

+#ifndef LIBXML_ATTR_FORMAT

+# if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))

+#  define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args)))

+# else

+#  define LIBXML_ATTR_FORMAT(fmt,args)

+# endif

+#else

+# define LIBXML_ATTR_FORMAT(fmt,args)

+#endif

+

+#else /* ! __GNUC__ */

+/**

+ * ATTRIBUTE_UNUSED:

+ *

+ * Macro used to signal to GCC unused function parameters

+ */

+#define ATTRIBUTE_UNUSED

+/**

+ * LIBXML_ATTR_ALLOC_SIZE:

+ *

+ * Macro used to indicate to GCC this is an allocator function

+ */

+#define LIBXML_ATTR_ALLOC_SIZE(x)

+/**

+ * LIBXML_ATTR_FORMAT:

+ *

+ * Macro used to indicate to GCC the parameter are printf like

+ */

+#define LIBXML_ATTR_FORMAT(fmt,args)

+#endif /* __GNUC__ */

+

 #ifdef __cplusplus

 }

 #endif /* __cplusplus */

diff --git a/third_party/libxml/win32/libxml2.def.src b/third_party/libxml/win32/libxml2.def.src
index db05ad4..ce3f24a 100644
--- a/third_party/libxml/win32/libxml2.def.src
+++ b/third_party/libxml/win32/libxml2.def.src
@@ -161,6 +161,7 @@ xmlStringComment DATA
 xmlStringText DATA
 xmlStringTextNoenc DATA
 xmlStructuredError DATA
+xmlStructuredErrorContext DATA
 #ifdef LIBXML_THREAD_ENABLED
 __xmlSubstituteEntitiesDefaultValue
 #else
@@ -660,6 +661,7 @@ xmlCheckHTTPInput
 xmlCheckLanguageID
 xmlCheckUTF8
 xmlCheckVersion
+xmlChildElementCount
 xmlCleanupCharEncodingHandlers
 xmlCleanupEncodingAliases
 xmlCleanupGlobals
@@ -854,6 +856,7 @@ xmlFileMatch
 xmlFileOpen
 xmlFileRead
 xmlFindCharEncodingHandler
+xmlFirstElementChild
 xmlFreeAttributeTable
 #ifdef LIBXML_AUTOMATA_ENABLED
 xmlFreeAutomata
@@ -1009,6 +1012,7 @@ xmlIsRef
 xmlIsXHTML
 #endif
 xmlKeepBlanksDefault
+xmlLastElementChild
 xmlLineNumbersDefault
 xmlLinkGetData
 xmlListAppend
@@ -1064,6 +1068,7 @@ xmlMallocLoc
 #endif
 xmlMemBlocks
 xmlMemDisplay
+xmlMemDisplayLast
 xmlMemFree
 xmlMemGet
 xmlMemMalloc
@@ -1226,6 +1231,7 @@ xmlNewDocText
 xmlNewDocTextLen
 xmlNewDtd
 xmlNewElementContent
+xmlNewEntity
 xmlNewEntityInputStream
 xmlNewGlobalNs
 xmlNewIOInputStream
@@ -1256,6 +1262,7 @@ xmlNewTextWriterPushParser
 xmlNewTextWriterTree
 xmlNewValidCtxt
 xmlNextChar
+xmlNextElementSibling
 xmlNoNetExternalEntityLoader
 xmlNodeAddContent
 xmlNodeAddContentLen
@@ -1390,6 +1397,7 @@ xmlPatterncompile
 xmlPedanticParserDefault
 xmlPopInput
 xmlPopInputCallbacks
+xmlPreviousElementSibling
 xmlPrintURI
 xmlPushInput
 xmlRMutexLock
@@ -1732,6 +1740,9 @@ xmlSchemaValPredefTypeNodeNoNorm
 xmlSchemaValidCtxtGetOptions
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaValidCtxtGetParserCtxt
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
 xmlSchemaValidateDoc
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
@@ -2620,6 +2631,9 @@ xmlXIncludeProcessTree
 xmlXIncludeProcessTreeFlags
 #endif
 #ifdef LIBXML_XINCLUDE_ENABLED
+xmlXIncludeProcessTreeFlagsData
+#endif
+#ifdef LIBXML_XINCLUDE_ENABLED
 xmlXIncludeSetFlags
 #endif
 #ifdef LIBXML_XPATH_ENABLED