Upgrade to libxml 2.9.2 and libxslt 1.1.28

third_party/libxml/src/win32/Makefile.mingw

 # Makefile for libxml2, specific for Windows, GCC (mingw) and GNU make.
 #
 # Take a look at the beginning and modify the variables to suit your 
 # environment. Having done that, you can do a
 #
 # nmake [all]     to build the libxml and the accompanying utilities.
 # nmake clean     to remove all compiler output files and return to a
 #                 clean state.
 # nmake rebuild   to rebuild everything from scratch. This basically does
 #                 a 'nmake clean' and then a 'nmake all'.
@@ skipping 15 matching lines @@
 XML_A = $(XML_BASENAME).a
 
 # Place where we let the compiler put its output.
 BINDIR = bin.mingw
 XML_INTDIR = int.mingw
 XML_INTDIR_A = int.a.mingw
 UTILS_INTDIR = int.utils.mingw
 
 # The preprocessor and its options.
 CPP = gcc.exe -E
-CPPFLAGS += -I$(XML_SRCDIR)/include
+CPPFLAGS += -I$(XML_SRCDIR)/include -DNOLIBTOOL 
 ifeq ($(WITH_THREADS),1)
 CPPFLAGS += -D_REENTRANT
 endif
 
 # The compiler and its options.
 CC = gcc.exe
-CFLAGS += -DWIN32 -D_WINDOWS -D_MBCS
-CFLAGS += -I$(XML_SRCDIR) -I$(XML_SRCDIR)/include -I$(INCPREFIX)
+CFLAGS += -DWIN32 -D_WINDOWS -D_MBCS -DNOLIBTOOL 
+CFLAGS += -I$(XML_SRCDIR) -I$(XML_SRCDIR)/include -I$(INCPREFIX) $(INCLUDE)
 ifneq ($(WITH_THREADS),no)
 CFLAGS += -D_REENTRANT
 endif
 ifeq ($(WITH_THREADS),yes) 
 CFLAGS += -DHAVE_WIN32_THREADS -DHAVE_COMPILER_TLS
 endif
 ifeq ($(WITH_THREADS),ctls)
 CFLAGS += -DHAVE_WIN32_THREADS -DHAVE_COMPILER_TLS
 endif
 ifeq ($(WITH_THREADS),native)
 CFLAGS += -DHAVE_WIN32_THREADS
 endif
 ifeq ($(WITH_THREADS),posix)
 CFLAGS += -DHAVE_PTHREAD_H
 endif
 ifeq ($(WITH_ZLIB),1)
 CFLAGS += -DHAVE_ZLIB_H
 endif
+ifeq ($(WITH_LZMA),1)
+CFLAGS += -DHAVE_LZMA_H
+endif
 
 # The linker and its options.
 LD = gcc.exe
 LDFLAGS += -Wl,--major-image-version,$(LIBXML_MAJOR_VERSION)
 LDFLAGS += -Wl,--minor-image-version,$(LIBXML_MINOR_VERSION)
 LDFLAGS += -Wl,-L,$(BINDIR) -Wl,-L,$(LIBPREFIX)
-LIBS = 
+LIBS =
 ifeq ($(WITH_FTP),1)
 CFLAGS += -D_WINSOCKAPI_
-LIBS += -lwsock32
+LIBS += -lwsock32 -lws2_32
 endif 
 ifeq ($(WITH_HTTP),1)
 CFLAGS += -D_WINSOCKAPI_
-LIBS += -lwsock32
+LIBS += -lwsock32 -lws2_32
 endif 
 ifeq ($(WITH_ICONV),1)
 LIBS += -liconv
 endif 
 ifeq ($(WITH_ZLIB),1)
-LIBS += -lzdll
+# Could be named differently
+# LIBS += -lzdll
+LIBS += -lz
+endif
+ifeq ($(WITH_LZMA),1)
+LIBS += -llzma
 endif
 ifeq ($(WITH_THREADS),posix)
 LIBS += -lpthreadGC
 endif
 ifeq ($(WITH_MODULES),1)
 LIBS += -lkernel32
 endif
 
+LIBS += $(LIB)
+
 # The archiver and its options.
 AR = ar.exe
 ARFLAGS = -r
 
 # Optimisation and debug symbols.
 ifeq ($(DEBUG),1)
 CFLAGS += -D_DEBUG -g
 LDFLAGS += 
 else
 CFLAGS += -DNDEBUG -O2 
 LDFLAGS += 
 endif
 
 
 # Libxml object files.
-XML_OBJS = $(XML_INTDIR)/c14n.o\
+XML_OBJS = $(XML_INTDIR)/buf.o\
+        $(XML_INTDIR)/c14n.o\
         $(XML_INTDIR)/catalog.o\
         $(XML_INTDIR)/chvalid.o\
         $(XML_INTDIR)/debugXML.o\
         $(XML_INTDIR)/dict.o\
         $(XML_INTDIR)/DOCBparser.o\
         $(XML_INTDIR)/encoding.o\
         $(XML_INTDIR)/entities.o\
         $(XML_INTDIR)/error.o\
         $(XML_INTDIR)/globals.o\
         $(XML_INTDIR)/hash.o\
@@ skipping 26 matching lines @@
         $(XML_INTDIR)/xmlschemastypes.o\
         $(XML_INTDIR)/xmlunicode.o\
         $(XML_INTDIR)/xmlwriter.o\
         $(XML_INTDIR)/xpath.o\
         $(XML_INTDIR)/xpointer.o\
         $(XML_INTDIR)/xmlstring.o
 
 XML_SRCS = $(subst .o,.c,$(subst $(XML_INTDIR)/,$(XML_SRCDIR)/,$(XML_OBJS)))
 
 # Static libxml object files.
-XML_OBJS_A = $(XML_INTDIR_A)/c14n.o\
+XML_OBJS_A = $(XML_INTDIR_A)/buf.o\
+        $(XML_INTDIR_A)/c14n.o\
         $(XML_INTDIR_A)/catalog.o\
         $(XML_INTDIR_A)/chvalid.o\
         $(XML_INTDIR_A)/debugXML.o\
         $(XML_INTDIR_A)/dict.o\
         $(XML_INTDIR_A)/DOCBparser.o\
         $(XML_INTDIR_A)/encoding.o\
         $(XML_INTDIR_A)/entities.o\
         $(XML_INTDIR_A)/error.o\
         $(XML_INTDIR_A)/globals.o\
         $(XML_INTDIR_A)/hash.o\
@@ skipping 42 matching lines @@
         $(BINDIR)/testReader.exe\
         $(BINDIR)/testRegexp.exe\
         $(BINDIR)/testModule.exe\
         $(BINDIR)/testRelax.exe\
         $(BINDIR)/testSAX.exe\
         $(BINDIR)/testSchemas.exe\
         $(BINDIR)/testURI.exe\
         $(BINDIR)/testXPath.exe\
         $(BINDIR)/runtest.exe\
         $(BINDIR)/runsuite.exe\
-        $(BINDIR)/testapi.exe
+        $(BINDIR)/testapi.exe\
+        $(BINDIR)/testlimits.exe
 
 ifeq ($(WITH_THREADS),yes)
 UTILS += $(BINDIR)/testThreadsWin32.exe
 endif
 ifeq ($(WITH_THREADS),ctls) 
 UTILS += $(BINDIR)/testThreadsWin32.exe
 endif
 ifeq ($(WITH_THREADS),native)
 UTILS += $(BINDIR)/testThreadsWin32.exe
 endif
@@ skipping 16 matching lines @@
         cmd.exe /C "if exist $(BINDIR) rmdir /S /Q $(BINDIR)"
         cmd.exe /C "if exist depends.mingw del depends.mingw"
 
 distclean : clean
         cmd.exe /C "if exist config.* del config.*"
         cmd.exe /C "if exist Makefile del Makefile"
 
 rebuild : clean all
 
 install-libs : all
-        cmd.exe /C "if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml"
+        cmd.exe /C "if not exist $(INCPREFIX)\libxml2 mkdir $(INCPREFIX)\libxml2"
+        cmd.exe /C "if not exist $(INCPREFIX)\libxml2\libxml mkdir $(INCPREFIX)\libxml2\libxml"
         cmd.exe /C "if not exist $(BINPREFIX) mkdir $(BINPREFIX)"
         cmd.exe /C "if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)"
-        cmd.exe /C "copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml"
+        cmd.exe /C "copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml2\libxml"
         cmd.exe /C "copy $(BINDIR)\$(XML_SO) $(SOPREFIX)"
         cmd.exe /C "copy $(BINDIR)\$(XML_A) $(LIBPREFIX)"
         cmd.exe /C "copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)"
         cmd.exe /C "copy $(BINDIR)\xml*.exe $(BINPREFIX)"
 
 install : install-libs
         cmd.exe /C "copy $(BINDIR)\*.exe $(BINPREFIX)"
 
 install-dist : install-libs
         cmd.exe /C "copy $(BINDIR)\xml*.exe $(BINPREFIX)"
@@ skipping 64 matching lines @@
         $(CC) $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -c $< 
         $(LD) $(LDFLAGS) -o $@ $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -l$(XML_BASENAME) $(LIBS) 
 endif
 
 # Builds xmllint and friends. Uses the implicit rule for commands.
 $(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxml libxmla
 
 # Source dependencies
 #-include depends.mingw