diff --git a/srcpkgs/libxml2-python/patches/python3-utf8.patch b/srcpkgs/libxml2-python/patches/python3-utf8.patch new file mode 100644 index 0000000000..46a834b6fa --- /dev/null +++ b/srcpkgs/libxml2-python/patches/python3-utf8.patch @@ -0,0 +1,37 @@ +Description: work around libxml2 python3 handling of UTF-8 encoded messages +Author: Jan Matejek +Source: https://bugzilla.opensuse.org/show_bug.cgi?id=1065270 + +--- python/libxml.c ++++ 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/srcpkgs/libxml2-python/template b/srcpkgs/libxml2-python/template index d75a8a2a93..61b0246087 100644 --- a/srcpkgs/libxml2-python/template +++ b/srcpkgs/libxml2-python/template @@ -1,7 +1,7 @@ # Template file for 'libxml2-python' pkgname=libxml2-python version=2.9.9 -revision=2 +revision=3 wrksrc="${pkgname%-python}-${version}" build_wrksrc=python build_style=python-module