From 591125df172cd543384bc51945e5297ddb84cb49 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 7 Mar 2019 13:05:10 +0000
Subject: [PATCH] Resync with Fedora Rawhide libxml2 2.9.9-2. Use autosetup.

---
 .gitignore                                 |  1 +
 libxml2-2.9.8-python3-unicode-errors.patch | 34 ++++++++++++++++++++++
 libxml2-multilib.patch                     | 24 +++++++++++++++
 mingw-libxml2.spec                         | 17 +++++++----
 sources                                    |  2 +-
 5 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 libxml2-2.9.8-python3-unicode-errors.patch
 create mode 100644 libxml2-multilib.patch

diff --git a/.gitignore b/.gitignore
index 9af8829..f5ce246 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ libxml2-2.7.6.tar.gz
 /libxml2-2.9.1.tar.gz
 /libxml2-2.9.2.tar.gz
 /libxml2-2.9.3.tar.gz
+/libxml2-2.9.9.tar.gz
diff --git a/libxml2-2.9.8-python3-unicode-errors.patch b/libxml2-2.9.8-python3-unicode-errors.patch
new file mode 100644
index 0000000..e87dcde
--- /dev/null
+++ b/libxml2-2.9.8-python3-unicode-errors.patch
@@ -0,0 +1,34 @@
+Index: libxml2-2.9.5/python/libxml.c
+===================================================================
+--- libxml2-2.9.5.orig/python/libxml.c
++++ libxml2-2.9.5/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+     PyObject *message;
+     PyObject *result;
+     char str[1000];
++    unsigned char *ptr = (unsigned char *)str;
+ 
+ #ifdef DEBUG_ERROR
+     printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ 	    str[999] = 0;
+         va_end(ap);
+ 
++#if PY_MAJOR_VERSION >= 3
++        /* Ensure the error string doesn't start at UTF8 continuation. */
++        while (*ptr && (*ptr & 0xc0) == 0x80)
++            ptr++;
++#endif
++
+         list = PyTuple_New(2);
+         PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+         Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+-        message = libxml_charPtrConstWrap(str);
++        message = libxml_charPtrConstWrap(ptr);
+         PyTuple_SetItem(list, 1, message);
+         result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++        /* Forget any errors caused in the error handler. */
++        PyErr_Clear();
+         Py_XDECREF(list);
+         Py_XDECREF(result);
+     }
diff --git a/libxml2-multilib.patch b/libxml2-multilib.patch
new file mode 100644
index 0000000..138d38f
--- /dev/null
+++ b/libxml2-multilib.patch
@@ -0,0 +1,24 @@
+*** XML/xml2-config.in.orig	2006-06-06 16:35:56.000000000 +0200
+--- XML/xml2-config.in	2006-06-06 16:36:24.000000000 +0200
+***************
+*** 3,9 ****
+  prefix=@prefix@
+  exec_prefix=@exec_prefix@
+  includedir=@includedir@
+! libdir=@libdir@
+  
+  usage()
+  {
+--- 3,14 ----
+  prefix=@prefix@
+  exec_prefix=@exec_prefix@
+  includedir=@includedir@
+! if [ "`ldd /bin/sh | grep lib64`" = "" ]
+! then
+!     libdir=${exec_prefix}/lib
+! else
+!     libdir=${exec_prefix}/lib64
+! fi
+  
+  usage()
+  {
diff --git a/mingw-libxml2.spec b/mingw-libxml2.spec
index f358339..108501c 100644
--- a/mingw-libxml2.spec
+++ b/mingw-libxml2.spec
@@ -1,16 +1,20 @@
 %{?mingw_package_header}
 
 Name:           mingw-libxml2
-Version:        2.9.3
-Release:        6%{?dist}
+Version:        2.9.9
+Release:        2%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
 URL:            http://xmlsoft.org/
 Source0:        ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
+Patch0:         libxml2-multilib.patch
+# Patch from openSUSE.
+# See:  https://bugzilla.gnome.org/show_bug.cgi?id=789714
+Patch1:         libxml2-2.9.8-python3-unicode-errors.patch
 
 # MinGW-specific patches.
-Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
+#Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
 
 BuildArch:      noarch
 
@@ -68,8 +72,7 @@ Static version of the MinGW Windows XML processing library.
 
 
 %prep
-%setup -q -n libxml2-%{version}
-%patch1001 -p0
+%autosetup -p1 -n libxml2-%{version}
 
 
 %build
@@ -143,6 +146,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Thu Mar 07 2019 Richard W.M. Jones <rjones@redhat.com> - 2.9.9-2
+- Resync with Fedora Rawhide libxml2 2.9.9-2.
+- Use autosetup.
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 8ad103b..bd52436 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-daece17e045f1c107610e137ab50c179  libxml2-2.9.3.tar.gz
+SHA512 (libxml2-2.9.9.tar.gz) = cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810