summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2020-01-01 18:27:19 +0200
committerMart Raudsepp <leio@gentoo.org>2020-01-01 18:28:19 +0200
commit3d060cd62d99a7b6f26b30a695701b4ccafcccea (patch)
tree8c3ba89e4fcba21ebd1b8be2309683128eda4a7a /dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch
parentsys-cluster/openmpi: Drop obsoloete blockers (diff)
downloadgentoo-3d060cd62d99a7b6f26b30a695701b4ccafcccea.tar.gz
gentoo-3d060cd62d99a7b6f26b30a695701b4ccafcccea.tar.bz2
gentoo-3d060cd62d99a7b6f26b30a695701b4ccafcccea.zip
dev-libs/libxml2: workaround py3 issues for itstool
Bug: https://bugs.gentoo.org/701020 Package-Manager: Portage-2.3.79, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch')
-rw-r--r--dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch b/dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch
new file mode 100644
index 000000000000..e87dcdedf88c
--- /dev/null
+++ b/dev-libs/libxml2/files/2.9.9-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);
+ }