libxml2: update to 2.11.2.
Fix update-check. Enable legacy API so this should be ABI-stable.
This commit is contained in:
parent
61e0bfcea6
commit
2d9a3b44a7
3 changed files with 7 additions and 47 deletions
|
@ -1,37 +0,0 @@
|
|||
Description: work around libxml2 python3 handling of UTF-8 encoded messages
|
||||
Author: Jan Matejek
|
||||
Source: https://bugzilla.opensuse.org/show_bug.cgi?id=1065270
|
||||
|
||||
--- 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);
|
||||
}
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
# Template file for 'libxml2'
|
||||
pkgname=libxml2
|
||||
version=2.9.13
|
||||
revision=6
|
||||
version=2.11.2
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-threads --with-history --with-icu"
|
||||
configure_args="--with-threads --with-history --with-icu
|
||||
--with-legacy --with-ftp --with-xptr-locs"
|
||||
hostmakedepends="gettext pkg-config python3"
|
||||
makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel icu-devel
|
||||
python3-devel"
|
||||
|
@ -12,13 +13,12 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
|
|||
license="MIT"
|
||||
homepage="https://gitlab.gnome.org/GNOME/libxml2"
|
||||
distfiles="${GNOME_SITE}/libxml2/${version%.*}/libxml2-${version}.tar.xz"
|
||||
checksum=276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e
|
||||
checksum=ac11e8b66176d49514bd4fa17c3fbdb3414aef64518ff9db536862e4682e2a64
|
||||
python_version=3
|
||||
CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
|
||||
|
||||
post_install() {
|
||||
rm -f ${DESTDIR}/${py3_lib}/*.a
|
||||
vlicense COPYING
|
||||
vlicense Copyright
|
||||
}
|
||||
|
||||
libxml2-devel_package() {
|
||||
|
@ -27,15 +27,12 @@ libxml2-devel_package() {
|
|||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/bin/xml2-config
|
||||
vmove usr/lib/xml2Conf.sh
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove usr/lib/cmake
|
||||
vmove usr/share/aclocal
|
||||
vmove usr/share/gtk-doc
|
||||
vmove usr/share/doc
|
||||
vmove "usr/share/man/man1/xml2-config*"
|
||||
vmove usr/share/man/man3
|
||||
vmove "usr/lib/*.a"
|
||||
vmove "usr/lib/*.la"
|
||||
vmove "usr/lib/*.so"
|
||||
}
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
site='https://gitlab.gnome.org/GNOME/libxml2/-/tags'
|
||||
pattern='v\d+.[\d.]+\d'
|
||||
pattern='v\K\d+.[\d.]+\d'
|
||||
|
|
Loading…
Add table
Reference in a new issue