From 9f7cd2c69e7de171c9c9877b655e9da7b3c2cad6 Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Fri, 29 Dec 2023 15:03:51 +0100 Subject: dev-libs/libxml2: remove unused patch Signed-off-by: Michael Mair-Keimberger Closes: https://github.com/gentoo/gentoo/pull/34538 Signed-off-by: Conrad Kostecki --- .../libxml2-2.10.3-python3-unicode-errors.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 dev-libs/libxml2/files/libxml2-2.10.3-python3-unicode-errors.patch diff --git a/dev-libs/libxml2/files/libxml2-2.10.3-python3-unicode-errors.patch b/dev-libs/libxml2/files/libxml2-2.10.3-python3-unicode-errors.patch deleted file mode 100644 index 525e1fe36c0b..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.10.3-python3-unicode-errors.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/745162 -https://gitlab.gnome.org/GNOME/libxml2/-/issues/64 - ---- a/python/libxml.c -+++ b/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); - } -- cgit v1.2.3-65-gdbad