11 files changed, 45 insertions, 63 deletions

diff --git a/textproc/libxml2/files/LICENSE.TRIO b/textproc/libxml2/files/LICENSE.TRIO
new file mode 100644
index 000000000000..0b8fd55609dd
--- /dev/null
+++ b/textproc/libxml2/files/LICENSE.TRIO
@@ -0,0 +1,12 @@
+(Following sentences are from trio.c of libxml2-2.9.4.tar.gz.)
+
+Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
+CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
diff --git a/textproc/libxml2/files/patch-Makefile.in b/textproc/libxml2/files/patch-Makefile.in
index 4a3057bdcc33..ad56138b9791 100644
--- a/textproc/libxml2/files/patch-Makefile.in
+++ b/textproc/libxml2/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in.orig	2014-10-17 20:26:52.547793054 +0200
-+++ Makefile.in	2014-10-17 20:27:34.868791352 +0200
-@@ -1234,7 +1234,7 @@
- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+--- Makefile.in.orig	2017-09-20 18:23:56 UTC
++++ Makefile.in
+@@ -1245,7 +1245,7 @@ distclean-compile:
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .c.lo:
 -@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -9,7 +9,7 @@
  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@@ -1712,7 +1712,7 @@
+@@ -1730,7 +1730,7 @@ distcleancheck: distclean
  check-am: all-am
  check: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) check-recursive
@@ -18,7 +18,7 @@
  		config.h
  install-binPROGRAMS: install-libLTLIBRARIES
  
-@@ -1780,7 +1780,7 @@
+@@ -1798,7 +1798,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/textproc/libxml2/files/patch-config.h.in b/textproc/libxml2/files/patch-config.h.in
index 419a2c5de8ab..326dbd57c71e 100644
--- a/textproc/libxml2/files/patch-config.h.in
+++ b/textproc/libxml2/files/patch-config.h.in
@@ -1,11 +1,11 @@
---- config.h.in.orig	2012-05-23 10:56:31.000000000 +0200
-+++ config.h.in	2012-07-23 09:34:22.000000000 +0200
+--- config.h.in.orig	2018-03-05 15:54:17 UTC
++++ config.h.in
 @@ -1,5 +1,8 @@
- /* config.h.in.  Generated from configure.in by autoheader.  */
+ /* config.h.in.  Generated from configure.ac by autoheader.  */
  
 +/* XXX */
 +#define HAVE_VFSCANF
 +
- /* Define to 1 if you have the <ansidecl.h> header file. */
- #undef HAVE_ANSIDECL_H
+ /* Type cast for the gethostbyname() argument */
+ #undef GETHOSTBYNAME_ARG_CAST
  
diff --git a/textproc/libxml2/files/patch-configure b/textproc/libxml2/files/patch-configure
index 4105c2da4bcf..595fd65c6659 100644
--- a/textproc/libxml2/files/patch-configure
+++ b/textproc/libxml2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2013-11-24 09:41:13.000000000 +0100
-+++ configure	2013-11-24 09:41:55.000000000 +0100
-@@ -14499,6 +14499,8 @@
+--- configure.orig	2016-05-23 08:00:35 UTC
++++ configure
+@@ -15639,6 +15639,8 @@ fi
  	       fi
  	   fi
         ;;
diff --git a/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in b/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in
index b0726512ce04..77dc8c19fd9c 100644
--- a/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in
+++ b/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in
@@ -1,6 +1,6 @@
---- libxml-2.0-uninstalled.pc.in.orig	2014-10-03 11:00:53.000000000 +0200
-+++ libxml-2.0-uninstalled.pc.in	2015-07-31 13:26:13.641069000 +0200
-@@ -8,5 +8,5 @@
+--- libxml-2.0-uninstalled.pc.in.orig	2016-02-09 10:17:32 UTC
++++ libxml-2.0-uninstalled.pc.in
+@@ -8,5 +8,5 @@ Name: libXML
  Version: @VERSION@
  Description: libXML library version2.
  Requires:
diff --git a/textproc/libxml2/files/patch-libxml-2.0.pc.in b/textproc/libxml2/files/patch-libxml-2.0.pc.in
index daaeeca0a1b7..1a4857175883 100644
--- a/textproc/libxml2/files/patch-libxml-2.0.pc.in
+++ b/textproc/libxml2/files/patch-libxml-2.0.pc.in
@@ -1,6 +1,6 @@
---- libxml-2.0.pc.in.orig	2014-10-03 11:00:53.000000000 +0200
-+++ libxml-2.0.pc.in	2015-07-31 13:26:13.647320000 +0200
-@@ -9,5 +9,5 @@
+--- libxml-2.0.pc.in.orig	2016-02-09 10:17:32 UTC
++++ libxml-2.0.pc.in
+@@ -9,5 +9,5 @@ Version: @VERSION@
  Description: libXML library version2.
  Requires:
  Libs: -L${libdir} -lxml2
diff --git a/textproc/libxml2/files/patch-python_Makefile.in b/textproc/libxml2/files/patch-python_Makefile.in
index 6477ed68842b..f7bbcc829147 100644
--- a/textproc/libxml2/files/patch-python_Makefile.in
+++ b/textproc/libxml2/files/patch-python_Makefile.in
@@ -1,6 +1,6 @@
---- python/Makefile.in.orig	2013-11-24 08:47:04.000000000 +0100
-+++ python/Makefile.in	2013-11-24 08:51:02.000000000 +0100
-@@ -415,7 +415,7 @@
+--- python/Makefile.in.orig	2017-09-20 18:23:56 UTC
++++ python/Makefile.in
+@@ -489,7 +489,7 @@ top_srcdir = @top_srcdir@
  
  # Makefile for libxml2 python library
  AUTOMAKE_OPTIONS = 1.4 foreign
@@ -9,7 +9,7 @@
  docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
  dist_docs_DATA = TODO
  EXTRA_DIST = \
-@@ -435,7 +435,7 @@
+@@ -509,7 +509,7 @@ EXTRA_DIST = \
  @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
  @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
  @WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
diff --git a/textproc/libxml2/files/patch-python_tests_Makefile.in b/textproc/libxml2/files/patch-python_tests_Makefile.in
index 405539d86ce6..a8fda96d86b2 100644
--- a/textproc/libxml2/files/patch-python_tests_Makefile.in
+++ b/textproc/libxml2/files/patch-python_tests_Makefile.in
@@ -1,7 +1,7 @@
---- python/tests/Makefile.in.orig	2008-05-23 22:41:49.000000000 -0500
-+++ python/tests/Makefile.in	2008-05-23 22:42:12.000000000 -0500
-@@ -270,7 +270,7 @@
- target_alias = @target_alias@
+--- python/tests/Makefile.in.orig	2017-09-20 18:23:56 UTC
++++ python/tests/Makefile.in
+@@ -385,7 +385,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
diff --git a/textproc/libxml2/files/patch-python_types.c b/textproc/libxml2/files/patch-python_types.c
deleted file mode 100644
index 3c7761dfa856..000000000000
--- a/textproc/libxml2/files/patch-python_types.c
+++ /dev/null
@@ -1,30 +0,0 @@
-From d910e99c322a0895955038c700471e9b1fd91fa6 Mon Sep 17 00:00:00 2001
-From: Patrick Welche <prlw1@cam.ac.uk>
-Date: Mon, 6 Nov 2017 16:20:25 +0000
-Subject: [PATCH] python: remove single use of _PyVerify_fd
-
-_PyVerify_fd disappeared from python with:
-
-  https://hg.python.org/cpython/rev/e88e2049b793
-
-https://bugzilla.gnome.org/show_bug.cgi?id=776815
----
- python/types.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/python/types.c b/python/types.c
-index f2376776..124af565 100644
---- python/types.c
-+++ python/types.c
-@@ -31,8 +31,6 @@ libxml_PyFileGet(PyObject *f) {
-     const char *mode;
- 
-     fd = PyObject_AsFileDescriptor(f);
--    if (!_PyVerify_fd(fd))
--        return(NULL);
-     /*
-      * Get the flags on the fd to understand how it was opened
-      */
--- 
-2.18.1
-
diff --git a/textproc/libxml2/files/patch-uri.c b/textproc/libxml2/files/patch-uri.c
index bad003e8c96a..03dbc8bbed99 100644
--- a/textproc/libxml2/files/patch-uri.c
+++ b/textproc/libxml2/files/patch-uri.c
@@ -12,9 +12,9 @@ bogus values when called with URIs that have rootless paths
 (e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be
 correct)
 
---- uri.c.orig	2014-10-03 13:28:06.000000000 +0200
-+++ uri.c	2014-10-20 14:22:57.677231158 +0200
-@@ -1198,6 +1198,8 @@
+--- uri.c.orig	2016-05-22 01:49:02 UTC
++++ uri.c
+@@ -1199,6 +1199,8 @@ xmlSaveUri(xmlURIPtr uri) {
                  if (temp == NULL) goto mem_error;
                  ret = temp;
  	    }
diff --git a/textproc/libxml2/files/patch-xml2Conf.sh.in b/textproc/libxml2/files/patch-xml2Conf.sh.in
index 25fe77058bdc..7d987c2af5ac 100644
--- a/textproc/libxml2/files/patch-xml2Conf.sh.in
+++ b/textproc/libxml2/files/patch-xml2Conf.sh.in
@@ -1,5 +1,5 @@
---- xml2Conf.sh.in	2001/05/19 19:57:43	1.1
-+++ xml2Conf.sh.in	2001/05/19 19:59:40
+--- xml2Conf.sh.in.orig	2009-07-30 15:24:35 UTC
++++ xml2Conf.sh.in
 @@ -1,6 +1,12 @@
  #
  # Configuration file for using the XML library in GNOME applications