libxml2: Update to 2.11.4

libxml2-2.9.1-msys2.patch: fixed upstream
libxml2-2.9.8-python3-unicode-errors.patch: simple refresh
0001-fix-py-mod-ext.patch: new upstream regression
This commit is contained in:
Christoph Reiter
2023-06-21 11:24:16 +02:00
parent 47093519f3
commit 07dc4f7996
4 changed files with 27 additions and 24 deletions

View File

@@ -1,8 +1,6 @@
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
--- libxml2-2.11.4/python/libxml.c.orig 2023-04-11 14:19:21.000000000 +0200
+++ libxml2-2.11.4/python/libxml.c 2023-06-21 10:57:38.374264200 +0200
@@ -1606,6 +1606,7 @@
PyObject *message;
PyObject *result;
char str[1000];
@@ -10,7 +8,7 @@ Index: libxml2-2.9.5/python/libxml.c
#ifdef DEBUG_ERROR
printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
@@ -1622,12 +1623,20 @@
str[999] = 0;
va_end(ap);
@@ -26,7 +24,7 @@ Index: libxml2-2.9.5/python/libxml.c
- message = libxml_charPtrConstWrap(str);
+ message = libxml_charPtrConstWrap(ptr);
PyTuple_SetItem(list, 1, message);
result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
result = PyObject_CallObject(libxml_xmlPythonErrorFuncHandler, list);
+ /* Forget any errors caused in the error handler. */
+ PyErr_Clear();
Py_XDECREF(list);