cairo 1.15.9-x86-mingw32 → 1.15.10-x86-mingw32

data/vendor/local/include/pngconf.h

@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.6.29, March 16, 2017
+ * libpng version 1.6.32, August 24, 2017
  *
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

data/vendor/local/include/pnglibconf.h

@@ -1,8 +1,8 @@
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.6.29, March 16, 2017 */
+/* libpng version 1.6.32, August 24, 2017 */
 
-/* Copyright (c) 1998-2016 Glenn Randers-Pehrson */
+/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */
 /* For conditions of distribution and use, see the disclaimer */
@@ -82,6 +82,7 @@
 #define PNG_READ_USER_TRANSFORM_SUPPORTED
 #define PNG_READ_bKGD_SUPPORTED
 #define PNG_READ_cHRM_SUPPORTED
+#define PNG_READ_eXIf_SUPPORTED
 #define PNG_READ_gAMA_SUPPORTED
 #define PNG_READ_hIST_SUPPORTED
 #define PNG_READ_iCCP_SUPPORTED
@@ -151,6 +152,7 @@
 #define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
 #define PNG_WRITE_bKGD_SUPPORTED
 #define PNG_WRITE_cHRM_SUPPORTED
+#define PNG_WRITE_eXIf_SUPPORTED
 #define PNG_WRITE_gAMA_SUPPORTED
 #define PNG_WRITE_hIST_SUPPORTED
 #define PNG_WRITE_iCCP_SUPPORTED
@@ -168,6 +170,7 @@
 #define PNG_WRITE_zTXt_SUPPORTED
 #define PNG_bKGD_SUPPORTED
 #define PNG_cHRM_SUPPORTED
+#define PNG_eXIf_SUPPORTED
 #define PNG_gAMA_SUPPORTED
 #define PNG_hIST_SUPPORTED
 #define PNG_iCCP_SUPPORTED

data/vendor/local/lib/cmake/libxml2/libxml2-config.cmake

@@ -18,8 +18,8 @@ get_filename_component(_libxml2_rootdir ${CMAKE_CURRENT_LIST_DIR}/../../../ ABSO
 
 set(LIBXML2_VERSION_MAJOR  2)
 set(LIBXML2_VERSION_MINOR  9)
-set(LIBXML2_VERSION_MICRO  4)
-set(LIBXML2_VERSION_STRING "2.9.4")
+set(LIBXML2_VERSION_MICRO  6)
+set(LIBXML2_VERSION_STRING "2.9.6")
 set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir})
 set(LIBXML2_INCLUDE_DIRS   ${_libxml2_rootdir}/include ${_libxml2_rootdir}/include/libxml2)
 set(LIBXML2_LIBRARY_DIR    ${_libxml2_rootdir}/lib)

data/vendor/local/lib/fontconfig.def

@@ -213,4 +213,4 @@ EXPORTS
 	FcWeightFromOpenType
 	FcWeightToOpenType
 LIBRARY libfontconfig-1.dll
-VERSION 10.2
+VERSION 10.4

data/vendor/local/lib/libcairo-gobject.la

@@ -23,8 +23,8 @@ dependency_libs=' -R/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/ho
 weak_library_names=''
 
 # Version information for libcairo-gobject.
-current=11506
-age=11504
+current=11510
+age=11508
 revision=0
 
 # Is this an already installed library?

data/vendor/local/lib/libcairo-script-interpreter.la

@@ -23,8 +23,8 @@ dependency_libs=' -L/home/vagrant/rcairo.win32/vendor/local/lib /home/vagrant/rc
 weak_library_names=''
 
 # Version information for libcairo-script-interpreter.
-current=11506
-age=11504
+current=11510
+age=11508
 revision=0
 
 # Is this an already installed library?

data/vendor/local/lib/libcairo.la

@@ -23,8 +23,8 @@ dependency_libs=' -L/home/vagrant/rcairo.win32/vendor/local/lib -lpthread /home/
 weak_library_names=''
 
 # Version information for libcairo.
-current=11506
-age=11504
+current=11510
+age=11508
 revision=0
 
 # Is this an already installed library?

data/vendor/local/lib/libfontconfig.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libfontconfig.
 current=10
 age=9
-revision=2
+revision=4
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libfreetype.la

@@ -23,8 +23,8 @@ dependency_libs=' -L/home/vagrant/rcairo.win32/vendor/local/lib /home/vagrant/rc
 weak_library_names=''
 
 # Version information for libfreetype.
-current=19
-age=13
+current=21
+age=15
 revision=0
 
 # Is this an already installed library?

data/vendor/local/lib/libpng.la

@@ -23,8 +23,8 @@ dependency_libs=' -L/home/vagrant/rcairo.win32/vendor/local/lib -lz'
 weak_library_names=''
 
 # Version information for libpng16.
-current=45
-age=29
+current=48
+age=32
 revision=0
 
 # Is this an already installed library?

data/vendor/local/lib/libpng16.la

@@ -23,8 +23,8 @@ dependency_libs=' -L/home/vagrant/rcairo.win32/vendor/local/lib -lz'
 weak_library_names=''
 
 # Version information for libpng16.
-current=45
-age=29
+current=48
+age=32
 revision=0
 
 # Is this an already installed library?

data/vendor/local/lib/libxml2.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libxml2.
 current=11
 age=9
-revision=4
+revision=6
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/pkgconfig/cairo-fc.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-fc
 Description: Fontconfig font backend for cairo graphics library
-Version: 1.15.4
+Version: 1.15.8
 
 Requires: cairo fontconfig >= 2.2.95
 Libs:  

data/vendor/local/lib/pkgconfig/cairo-ft.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-ft
 Description: FreeType font backend for cairo graphics library
-Version: 1.15.4
+Version: 1.15.8
 
 Requires: cairo freetype2 >= 9.7.3 
 Libs:  

data/vendor/local/lib/pkgconfig/cairo-gobject.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-gobject
 Description: gobject functions for cairo graphics library
-Version: 1.15.4
+Version: 1.15.8
 
 Requires: cairo gobject-2.0 glib-2.0 >= 2.14
 Libs:  -L${libdir} -lcairo-gobject

data/vendor/local/lib/pkgconfig/cairo-pdf.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-pdf
 Description: PDF surface backend for cairo graphics library
-Version: 1.15.4
+Version: 1.15.8
 
 Requires: cairo 
 Libs: -lz 

data/vendor/local/lib/pkgconfig/cairo-png.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-png
 Description: PNG functions for cairo graphics library
-Version: 1.15.4
+Version: 1.15.8
 
 Requires: cairo libpng
 Libs:  

data/vendor/local/lib/pkgconfig/cairo-ps.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-ps
 Description: PostScript surface backend for cairo graphics library
-Version: 1.15.4
+Version: 1.15.8
 
 Requires: cairo 
 Libs: -lz 

data/vendor/local/lib/pkgconfig/cairo-script.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-script
 Description: script surface backend for cairo graphics library
-Version: 1.15.4
+Version: 1.15.8
 
 Requires: cairo 
 Libs: -lz 

data/vendor/local/lib/pkgconfig/cairo-svg.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-svg
 Description: SVG surface backend for cairo graphics library
-Version: 1.15.4
+Version: 1.15.8
 
 Requires: cairo 
 Libs:  

data/vendor/local/lib/pkgconfig/cairo-win32-font.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-win32-font
 Description: Microsoft Windows font backend for cairo graphics library
-Version: 1.15.4
+Version: 1.15.8
 
 Requires: cairo 
 Libs:  

data/vendor/local/lib/pkgconfig/cairo-win32.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-win32
 Description: Microsoft Windows surface backend for cairo graphics library
-Version: 1.15.4
+Version: 1.15.8
 
 Requires: cairo 
 Libs:  

data/vendor/local/lib/pkgconfig/cairo.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo
 Description: Multi-platform 2D graphics library
-Version: 1.15.4
+Version: 1.15.8
 
 Requires.private:  gobject-2.0 glib-2.0 >= 2.14      pixman-1 >= 0.30.0    fontconfig >= 2.2.95 freetype2 >= 9.7.3   libpng   
 Libs: -L${libdir} -lcairo

data/vendor/local/lib/pkgconfig/fontconfig.pc

@@ -10,9 +10,9 @@ cachedir=LOCAL_APPDATA_FONTCONFIG_CACHE
 
 Name: Fontconfig
 Description: Font configuration and customization library
-Version: 2.12.1
+Version: 2.12.4
 Requires:  freetype2
 Requires.private:  libxml-2.0
 Libs: -L${libdir} -lfontconfig
 Libs.private:  -L/home/vagrant/rcairo.win32/vendor/local/lib -lfreetype  -L/home/vagrant/rcairo.win32/vendor/local/lib -lxml2
-Cflags: -I${includedir}  -I/home/vagrant/rcairo.win32/vendor/local/include/freetype2 -I/home/vagrant/rcairo.win32/vendor/local/include -I/home/vagrant/rcairo.win32/vendor/local/include/libpng16  -I/home/vagrant/rcairo.win32/vendor/local/include/libxml2
+Cflags: -I${includedir}  -I/home/vagrant/rcairo.win32/vendor/local/include/freetype2 -I/home/vagrant/rcairo.win32/vendor/local/include/libpng16 -I/home/vagrant/rcairo.win32/vendor/local/include  -I/home/vagrant/rcairo.win32/vendor/local/include/libxml2

data/vendor/local/lib/pkgconfig/freetype2.pc

@@ -6,7 +6,7 @@ includedir=/home/vagrant/rcairo.win32/vendor/local/include
 Name: FreeType 2
 URL: http://freetype.org
 Description: A free, high-quality, and portable font engine.
-Version: 19.0.13
+Version: 21.0.15
 Requires:
 Requires.private: zlib, libpng
 Libs: -L${libdir} -lfreetype

data/vendor/local/lib/pkgconfig/libpng.pc

@@ -5,7 +5,8 @@ includedir=${prefix}/include/libpng16
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.6.29
+Version: 1.6.32
+Requires: zlib
 Libs: -L${libdir} -lpng16
 Libs.private: -lz 
 Cflags: -I${includedir}

data/vendor/local/lib/pkgconfig/libpng16.pc

@@ -5,7 +5,8 @@ includedir=${prefix}/include/libpng16
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.6.29
+Version: 1.6.32
+Requires: zlib
 Libs: -L${libdir} -lpng16
 Libs.private: -lz 
 Cflags: -I${includedir}

data/vendor/local/lib/pkgconfig/libxml-2.0.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 modules=1
 
 Name: libXML
-Version: 2.9.4
+Version: 2.9.6
 Description: libXML library version2.
 Requires:
 Libs: -L${libdir} -lxml2

data/vendor/local/lib/xml2Conf.sh

@@ -4,5 +4,5 @@
 XML2_LIBDIR="-L/home/vagrant/rcairo.win32/vendor/local/lib"
 XML2_LIBS="-lxml2 -L/home/vagrant/rcairo.win32/vendor/local/lib -lz      "
 XML2_INCLUDEDIR="-I/home/vagrant/rcairo.win32/vendor/local/include/libxml2"
-MODULE_VERSION="xml2-2.9.4"
+MODULE_VERSION="xml2-2.9.6"
 

data/vendor/local/share/aclocal/freetype2.m4

@@ -1,7 +1,7 @@
 # Configure paths for FreeType2
 # Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
 #
-# Copyright 2001-2016 by
+# Copyright 2001-2017 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

data/vendor/local/share/aclocal/libxml.m4

@@ -170,7 +170,7 @@ main()
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
         [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
+          echo "*** exact error that occurred. This usually means LIBXML was incorrectly installed"
           echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
           echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ])
           CPPFLAGS="$ac_save_CPPFLAGS"

data/vendor/local/share/doc/{libxml2-2.9.4 → libxml2-2.9.6}/examples/xmllint.c

@@ -2991,124 +2991,124 @@ static void showVersion(const char *name) {
     fprintf(stderr, "\n");
 }
 
-static void usage(const char *name) {
-    printf("Usage : %s [options] XMLfiles ...\n", name);
+static void usage(FILE *f, const char *name) {
+    fprintf(f, "Usage : %s [options] XMLfiles ...\n", name);
 #ifdef LIBXML_OUTPUT_ENABLED
-    printf("\tParse the XML files and output the result of the parsing\n");
+    fprintf(f, "\tParse the XML files and output the result of the parsing\n");
 #else
-    printf("\tParse the XML files\n");
+    fprintf(f, "\tParse the XML files\n");
 #endif /* LIBXML_OUTPUT_ENABLED */
-    printf("\t--version : display the version of the XML library used\n");
+    fprintf(f, "\t--version : display the version of the XML library used\n");
 #ifdef LIBXML_DEBUG_ENABLED
-    printf("\t--debug : dump a debug tree of the in-memory document\n");
-    printf("\t--shell : run a navigating shell\n");
-    printf("\t--debugent : debug the entities defined in the document\n");
+    fprintf(f, "\t--debug : dump a debug tree of the in-memory document\n");
+    fprintf(f, "\t--shell : run a navigating shell\n");
+    fprintf(f, "\t--debugent : debug the entities defined in the document\n");
 #else
 #ifdef LIBXML_READER_ENABLED
-    printf("\t--debug : dump the nodes content when using --stream\n");
+    fprintf(f, "\t--debug : dump the nodes content when using --stream\n");
 #endif /* LIBXML_READER_ENABLED */
 #endif
 #ifdef LIBXML_TREE_ENABLED
-    printf("\t--copy : used to test the internal copy implementation\n");
+    fprintf(f, "\t--copy : used to test the internal copy implementation\n");
 #endif /* LIBXML_TREE_ENABLED */
-    printf("\t--recover : output what was parsable on broken XML documents\n");
-    printf("\t--huge : remove any internal arbitrary parser limits\n");
-    printf("\t--noent : substitute entity references by their value\n");
-    printf("\t--noenc : ignore any encoding specified inside the document\n");
-    printf("\t--noout : don't output the result tree\n");
-    printf("\t--path 'paths': provide a set of paths for resources\n");
-    printf("\t--load-trace : print trace of all external entities loaded\n");
-    printf("\t--nonet : refuse to fetch DTDs or entities over network\n");
-    printf("\t--nocompact : do not generate compact text nodes\n");
-    printf("\t--htmlout : output results as HTML\n");
-    printf("\t--nowrap : do not put HTML doc wrapper\n");
+    fprintf(f, "\t--recover : output what was parsable on broken XML documents\n");
+    fprintf(f, "\t--huge : remove any internal arbitrary parser limits\n");
+    fprintf(f, "\t--noent : substitute entity references by their value\n");
+    fprintf(f, "\t--noenc : ignore any encoding specified inside the document\n");
+    fprintf(f, "\t--noout : don't output the result tree\n");
+    fprintf(f, "\t--path 'paths': provide a set of paths for resources\n");
+    fprintf(f, "\t--load-trace : print trace of all external entities loaded\n");
+    fprintf(f, "\t--nonet : refuse to fetch DTDs or entities over network\n");
+    fprintf(f, "\t--nocompact : do not generate compact text nodes\n");
+    fprintf(f, "\t--htmlout : output results as HTML\n");
+    fprintf(f, "\t--nowrap : do not put HTML doc wrapper\n");
 #ifdef LIBXML_VALID_ENABLED
-    printf("\t--valid : validate the document in addition to std well-formed check\n");
-    printf("\t--postvalid : do a posteriori validation, i.e after parsing\n");
-    printf("\t--dtdvalid URL : do a posteriori validation against a given DTD\n");
-    printf("\t--dtdvalidfpi FPI : same but name the DTD with a Public Identifier\n");
+    fprintf(f, "\t--valid : validate the document in addition to std well-formed check\n");
+    fprintf(f, "\t--postvalid : do a posteriori validation, i.e after parsing\n");
+    fprintf(f, "\t--dtdvalid URL : do a posteriori validation against a given DTD\n");
+    fprintf(f, "\t--dtdvalidfpi FPI : same but name the DTD with a Public Identifier\n");
 #endif /* LIBXML_VALID_ENABLED */
-    printf("\t--timing : print some timings\n");
-    printf("\t--output file or -o file: save to a given file\n");
-    printf("\t--repeat : repeat 100 times, for timing or profiling\n");
-    printf("\t--insert : ad-hoc test for valid insertions\n");
+    fprintf(f, "\t--timing : print some timings\n");
+    fprintf(f, "\t--output file or -o file: save to a given file\n");
+    fprintf(f, "\t--repeat : repeat 100 times, for timing or profiling\n");
+    fprintf(f, "\t--insert : ad-hoc test for valid insertions\n");
 #ifdef LIBXML_OUTPUT_ENABLED
 #ifdef HAVE_ZLIB_H
-    printf("\t--compress : turn on gzip compression of output\n");
+    fprintf(f, "\t--compress : turn on gzip compression of output\n");
 #endif
 #endif /* LIBXML_OUTPUT_ENABLED */
 #ifdef LIBXML_HTML_ENABLED
-    printf("\t--html : use the HTML parser\n");
-    printf("\t--xmlout : force to use the XML serializer when using --html\n");
-    printf("\t--nodefdtd : do not default HTML doctype\n");
+    fprintf(f, "\t--html : use the HTML parser\n");
+    fprintf(f, "\t--xmlout : force to use the XML serializer when using --html\n");
+    fprintf(f, "\t--nodefdtd : do not default HTML doctype\n");
 #endif
 #ifdef LIBXML_PUSH_ENABLED
-    printf("\t--push : use the push mode of the parser\n");
-    printf("\t--pushsmall : use the push mode of the parser using tiny increments\n");
+    fprintf(f, "\t--push : use the push mode of the parser\n");
+    fprintf(f, "\t--pushsmall : use the push mode of the parser using tiny increments\n");
 #endif /* LIBXML_PUSH_ENABLED */
 #ifdef HAVE_MMAP
-    printf("\t--memory : parse from memory\n");
+    fprintf(f, "\t--memory : parse from memory\n");
 #endif
-    printf("\t--maxmem nbbytes : limits memory allocation to nbbytes bytes\n");
-    printf("\t--nowarning : do not emit warnings from parser/validator\n");
-    printf("\t--noblanks : drop (ignorable?) blanks spaces\n");
-    printf("\t--nocdata : replace cdata section with text nodes\n");
+    fprintf(f, "\t--maxmem nbbytes : limits memory allocation to nbbytes bytes\n");
+    fprintf(f, "\t--nowarning : do not emit warnings from parser/validator\n");
+    fprintf(f, "\t--noblanks : drop (ignorable?) blanks spaces\n");
+    fprintf(f, "\t--nocdata : replace cdata section with text nodes\n");
 #ifdef LIBXML_OUTPUT_ENABLED
-    printf("\t--format : reformat/reindent the output\n");
-    printf("\t--encode encoding : output in the given encoding\n");
-    printf("\t--dropdtd : remove the DOCTYPE of the input docs\n");
-    printf("\t--pretty STYLE : pretty-print in a particular style\n");
-    printf("\t                 0 Do not pretty print\n");
-    printf("\t                 1 Format the XML content, as --format\n");
-    printf("\t                 2 Add whitespace inside tags, preserving content\n");
+    fprintf(f, "\t--format : reformat/reindent the output\n");
+    fprintf(f, "\t--encode encoding : output in the given encoding\n");
+    fprintf(f, "\t--dropdtd : remove the DOCTYPE of the input docs\n");
+    fprintf(f, "\t--pretty STYLE : pretty-print in a particular style\n");
+    fprintf(f, "\t                 0 Do not pretty print\n");
+    fprintf(f, "\t                 1 Format the XML content, as --format\n");
+    fprintf(f, "\t                 2 Add whitespace inside tags, preserving content\n");
 #endif /* LIBXML_OUTPUT_ENABLED */
-    printf("\t--c14n : save in W3C canonical format v1.0 (with comments)\n");
-    printf("\t--c14n11 : save in W3C canonical format v1.1 (with comments)\n");
-    printf("\t--exc-c14n : save in W3C exclusive canonical format (with comments)\n");
+    fprintf(f, "\t--c14n : save in W3C canonical format v1.0 (with comments)\n");
+    fprintf(f, "\t--c14n11 : save in W3C canonical format v1.1 (with comments)\n");
+    fprintf(f, "\t--exc-c14n : save in W3C exclusive canonical format (with comments)\n");
 #ifdef LIBXML_C14N_ENABLED
 #endif /* LIBXML_C14N_ENABLED */
-    printf("\t--nsclean : remove redundant namespace declarations\n");
-    printf("\t--testIO : test user I/O support\n");
+    fprintf(f, "\t--nsclean : remove redundant namespace declarations\n");
+    fprintf(f, "\t--testIO : test user I/O support\n");
 #ifdef LIBXML_CATALOG_ENABLED
-    printf("\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n");
-    printf("\t             otherwise XML Catalogs starting from \n");
-    printf("\t         %s are activated by default\n", XML_XML_DEFAULT_CATALOG);
-    printf("\t--nocatalogs: deactivate all catalogs\n");
+    fprintf(f, "\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n");
+    fprintf(f, "\t             otherwise XML Catalogs starting from \n");
+    fprintf(f, "\t         %s are activated by default\n", XML_XML_DEFAULT_CATALOG);
+    fprintf(f, "\t--nocatalogs: deactivate all catalogs\n");
 #endif
-    printf("\t--auto : generate a small doc on the fly\n");
+    fprintf(f, "\t--auto : generate a small doc on the fly\n");
 #ifdef LIBXML_XINCLUDE_ENABLED
-    printf("\t--xinclude : do XInclude processing\n");
-    printf("\t--noxincludenode : same but do not generate XInclude nodes\n");
-    printf("\t--nofixup-base-uris : do not fixup xml:base uris\n");
+    fprintf(f, "\t--xinclude : do XInclude processing\n");
+    fprintf(f, "\t--noxincludenode : same but do not generate XInclude nodes\n");
+    fprintf(f, "\t--nofixup-base-uris : do not fixup xml:base uris\n");
 #endif
-    printf("\t--loaddtd : fetch external DTD\n");
-    printf("\t--dtdattr : loaddtd + populate the tree with inherited attributes \n");
+    fprintf(f, "\t--loaddtd : fetch external DTD\n");
+    fprintf(f, "\t--dtdattr : loaddtd + populate the tree with inherited attributes \n");
 #ifdef LIBXML_READER_ENABLED
-    printf("\t--stream : use the streaming interface to process very large files\n");
-    printf("\t--walker : create a reader and walk though the resulting doc\n");
+    fprintf(f, "\t--stream : use the streaming interface to process very large files\n");
+    fprintf(f, "\t--walker : create a reader and walk though the resulting doc\n");
 #endif /* LIBXML_READER_ENABLED */
 #ifdef LIBXML_PATTERN_ENABLED
-    printf("\t--pattern pattern_value : test the pattern support\n");
+    fprintf(f, "\t--pattern pattern_value : test the pattern support\n");
 #endif
-    printf("\t--chkregister : verify the node registration code\n");
+    fprintf(f, "\t--chkregister : verify the node registration code\n");
 #ifdef LIBXML_SCHEMAS_ENABLED
-    printf("\t--relaxng schema : do RelaxNG validation against the schema\n");
-    printf("\t--schema schema : do validation against the WXS schema\n");
+    fprintf(f, "\t--relaxng schema : do RelaxNG validation against the schema\n");
+    fprintf(f, "\t--schema schema : do validation against the WXS schema\n");
 #endif
 #ifdef LIBXML_SCHEMATRON_ENABLED
-    printf("\t--schematron schema : do validation against a schematron\n");
+    fprintf(f, "\t--schematron schema : do validation against a schematron\n");
 #endif
 #ifdef LIBXML_SAX1_ENABLED
-    printf("\t--sax1: use the old SAX1 interfaces for processing\n");
+    fprintf(f, "\t--sax1: use the old SAX1 interfaces for processing\n");
 #endif
-    printf("\t--sax: do not build a tree but work just at the SAX level\n");
-    printf("\t--oldxml10: use XML-1.0 parsing rules before the 5th edition\n");
+    fprintf(f, "\t--sax: do not build a tree but work just at the SAX level\n");
+    fprintf(f, "\t--oldxml10: use XML-1.0 parsing rules before the 5th edition\n");
 #ifdef LIBXML_XPATH_ENABLED
-    printf("\t--xpath expr: evaluate the XPath expression, imply --noout\n");
+    fprintf(f, "\t--xpath expr: evaluate the XPath expression, imply --noout\n");
 #endif
 
-    printf("\nLibxml project home page: http://xmlsoft.org/\n");
-    printf("To report bugs or get some help check: http://xmlsoft.org/bugs.html\n");
+    fprintf(f, "\nLibxml project home page: http://xmlsoft.org/\n");
+    fprintf(f, "To report bugs or get some help check: http://xmlsoft.org/bugs.html\n");
 }
 
 static void registerNode(xmlNodePtr node)
@@ -3138,7 +3138,7 @@ main(int argc, char **argv) {
     const char* indent;
 
     if (argc <= 1) {
-	usage(argv[0]);
+	usage(stderr, argv[0]);
 	return(1);
     }
     LIBXML_TEST_VERSION
@@ -3490,7 +3490,7 @@ main(int argc, char **argv) {
 	    options |= XML_PARSE_OLD10;
 	} else {
 	    fprintf(stderr, "Unknown option %s\n", argv[i]);
-	    usage(argv[0]);
+	    usage(stderr, argv[0]);
 	    return(1);
 	}
     }
@@ -3784,7 +3784,7 @@ main(int argc, char **argv) {
 	xmlGenericError(xmlGenericErrorContext, "</body></html>\n");
     }
     if ((files == 0) && (!generate) && (version == 0)) {
-	usage(argv[0]);
+	usage(stderr, argv[0]);
     }
 #ifdef LIBXML_SCHEMATRON_ENABLED
     if (wxschematron != NULL)