From 02f918a91f897837380bf688b41f873bf12dc246 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 10 May 2023 15:36:54 +0200 Subject: [PATCH 1/2] libxml2: update to 2.11.2. Fix update-check. Enable legacy API so this should be ABI-stable. --- srcpkgs/libxml2/patches/python3-utf8.patch | 37 ---------------------- srcpkgs/libxml2/template | 15 ++++----- srcpkgs/libxml2/update | 2 +- 3 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 srcpkgs/libxml2/patches/python3-utf8.patch diff --git a/srcpkgs/libxml2/patches/python3-utf8.patch b/srcpkgs/libxml2/patches/python3-utf8.patch deleted file mode 100644 index 947cb3180816..000000000000 --- a/srcpkgs/libxml2/patches/python3-utf8.patch +++ /dev/null @@ -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); - } - diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index d81e9a2c85f8..46bdabf9ff1a 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -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 " 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" } diff --git a/srcpkgs/libxml2/update b/srcpkgs/libxml2/update index 9922cafaf3db..6b99156a3769 100644 --- a/srcpkgs/libxml2/update +++ b/srcpkgs/libxml2/update @@ -1,2 +1,2 @@ site='https://gitlab.gnome.org/GNOME/libxml2/-/tags' -pattern='v\d+.[\d.]+\d' +pattern='v\K\d+.[\d.]+\d' From 98f4350cbd4d6f36dd5bce3cb7c294a3a8f5f5cd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 10 May 2023 15:37:46 +0200 Subject: [PATCH 2/2] libxslt: update to 1.1.38. Fix update-check. --- srcpkgs/libxslt/template | 8 +++----- srcpkgs/libxslt/update | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template index 33d2e9f9a260..a10fe3df6ec9 100644 --- a/srcpkgs/libxslt/template +++ b/srcpkgs/libxslt/template @@ -1,7 +1,7 @@ # Template file for 'libxslt' pkgname=libxslt -version=1.1.37 -revision=3 +version=1.1.38 +revision=1 build_style=gnu-configure configure_args="--disable-static --disable-dependency-tracking" hostmakedepends="docbook-xml docbook-xsl libtool pkg-config python3" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="MIT" homepage="https://gitlab.gnome.org/GNOME/libxslt" distfiles="${GNOME_SITE}/libxslt/${version%.*}/libxslt-${version}.tar.xz" -checksum=3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4 +checksum=1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1 python_version=3 CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver" CFLAGS+=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64" @@ -43,8 +43,6 @@ post_install() { # Remove $XBPS_CROSS_BASE in pkg-config vsed -i -e "s,-I${XBPS_CROSS_BASE}/usr/include,-I\${includedir}," \ $DESTDIR/usr/bin/xslt-config - vsed -i -e "s,$XBPS_CROSS_BASE,,g" \ - $DESTDIR/usr/lib/pkgconfig/libexslt.pc fi vlicense COPYING } diff --git a/srcpkgs/libxslt/update b/srcpkgs/libxslt/update index f85b09e1abd6..b778e97aacda 100644 --- a/srcpkgs/libxslt/update +++ b/srcpkgs/libxslt/update @@ -1,2 +1,2 @@ site='https://gitlab.gnome.org/GNOME/libxslt/-/tags' -pattern='v\d+.[\d.]+\d' +pattern='v\K\d+.[\d.]+\d'