Date: Friday, April 28, 2023 @ 22:32:15
Author: heftig
Revision: 1449199
2.11.0-1
Modified:
lib32-libxml2/trunk/0001-Fix-python3-unicode-errors.patch
lib32-libxml2/trunk/0002-HACK-Don-t-run-fuzzing-tests.patch
lib32-libxml2/trunk/PKGBUILD
-----------------------------------------+
0001-Fix-python3-unicode-errors.patch | 6 +++---
0002-HACK-Don-t-run-fuzzing-tests.patch | 23 ++++++++---------------
PKGBUILD | 10 +++++-----
3 files changed, 16 insertions(+), 23 deletions(-)
Modified: 0001-Fix-python3-unicode-errors.patch
===================================================================
--- 0001-Fix-python3-unicode-errors.patch 2023-04-28 22:13:28 UTC (rev
1449198)
+++ 0001-Fix-python3-unicode-errors.patch 2023-04-28 22:32:15 UTC (rev
1449199)
@@ -13,10 +13,10 @@
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/python/libxml.c b/python/libxml.c
-index e071e824ca39..9d476f4fcd92 100644
+index fb14c7a60912..f72fd25862cd 100644
--- a/python/libxml.c
+++ b/python/libxml.c
-@@ -1621,28 +1621,37 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
const char *msg,
+@@ -1606,28 +1606,37 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
const char *msg,
PyObject *message;
PyObject *result;
char str[1000];
@@ -49,7 +49,7 @@
- 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);
Modified: 0002-HACK-Don-t-run-fuzzing-tests.patch
===================================================================
--- 0002-HACK-Don-t-run-fuzzing-tests.patch 2023-04-28 22:13:28 UTC (rev
1449198)
+++ 0002-HACK-Don-t-run-fuzzing-tests.patch 2023-04-28 22:32:15 UTC (rev
1449199)
@@ -5,25 +5,18 @@
They take way too long.
---
- Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index 316109b16148..3ef672fe911f 100644
+index a5627280f28b..cc1a85a32047 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -2,12 +2,12 @@
-
- ACLOCAL_AMFLAGS = -I m4
-
--SUBDIRS = include . doc example fuzz xstc
-+SUBDIRS = include . doc example xstc
- if WITH_PYTHON
+@@ -7,7 +7,6 @@ if WITH_PYTHON
SUBDIRS += python
endif
+ if WITH_GLOB
+-SUBDIRS += fuzz
+ endif
--DIST_SUBDIRS = include . doc example fuzz python xstc
-+DIST_SUBDIRS = include . doc example python xstc
-
- AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
-DSYSCONFDIR='"$(sysconfdir)"'
-
+ DIST_SUBDIRS = include . doc example fuzz python xstc
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-28 22:13:28 UTC (rev 1449198)
+++ PKGBUILD 2023-04-28 22:32:15 UTC (rev 1449199)
@@ -8,8 +8,8 @@
pkgname=(
lib32-libxml2
)
-pkgver=2.10.4
-pkgrel=3
+pkgver=2.11.0
+pkgrel=1
pkgdesc="XML C parser and toolkit (32-bit)"
url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home";
arch=(x86_64)
@@ -24,7 +24,7 @@
git
python
)
-_commit=223cb03a5d27b1b2393b266a8657443d046139d6 # tags/v2.10.4^0
+_commit=f296934ade688baab79caf1c62a82149ad78accf # tags/v2.11.0^0
source=(
"git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit";
0001-Fix-python3-unicode-errors.patch
@@ -32,8 +32,8 @@
https://www.w3.org/XML/Test/xmlts20130923.tar.gz
)
b2sums=('SKIP'
-
'ec5a0955906c5fdd4bc65248bdb46f315460f4b2208bf37c49f55ef7468585786bdf563aa3e9357370d4f1ff947a6d4467869eeb2ca6b77ca5e40ffa45213a13'
-
'ec247c8caad963307d8f487176fde518cfb087bbff3f10c2a5846b90a04c9909c2f0e6aaf8ded4784f46586eafb16df493caf1debc20ff10014f03b1f1f8241d'
+
'f2fa5084cef46ae33069bd76745e9f5bdfa8cb20714b861641b6028ea2457ed57eb5637afad1f6a313d23f79428cf56c16106b716294eb361fd1f3b04799e1d3'
+
'792f8f721c18369b19db851c04b81e0ad4e57c588e8bde2ae0e4afddb12765d18119a5b73de0ae232d24d5c009f1972e2658c60484db83e8b870f25e8bb063a5'
'63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be')
pkgver() {
