Date: Friday, April 28, 2023 @ 22:32:39
Author: heftig
Revision: 475297
archrelease: copy trunk to staging-x86_64
Added:
libxml2/repos/staging-x86_64/0001-Fix-python3-unicode-errors.patch
(from rev 475296, libxml2/trunk/0001-Fix-python3-unicode-errors.patch)
libxml2/repos/staging-x86_64/0002-HACK-Don-t-run-fuzzing-tests.patch
(from rev 475296, libxml2/trunk/0002-HACK-Don-t-run-fuzzing-tests.patch)
libxml2/repos/staging-x86_64/PKGBUILD
(from rev 475296, libxml2/trunk/PKGBUILD)
Deleted:
libxml2/repos/staging-x86_64/0001-Fix-python3-unicode-errors.patch
libxml2/repos/staging-x86_64/0002-HACK-Don-t-run-fuzzing-tests.patch
libxml2/repos/staging-x86_64/PKGBUILD
-----------------------------------------+
0001-Fix-python3-unicode-errors.patch | 114 +++++++--------
0002-HACK-Don-t-run-fuzzing-tests.patch | 51 +++----
PKGBUILD | 216 +++++++++++++++---------------
3 files changed, 187 insertions(+), 194 deletions(-)
Deleted: 0001-Fix-python3-unicode-errors.patch
===================================================================
--- 0001-Fix-python3-unicode-errors.patch 2023-04-28 22:32:02 UTC (rev
475296)
+++ 0001-Fix-python3-unicode-errors.patch 2023-04-28 22:32:39 UTC (rev
475297)
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <[email protected]>
-Date: Tue, 11 Apr 2023 21:55:36 +0000
-Subject: [PATCH] Fix python3 unicode errors
-
-Patch taken from Fedora at
-https://src.fedoraproject.org/rpms/libxml2/raw/c1fa5c85e9d3a0b7340aaf34d2e5134cf47f5d66/f/libxml2-2.9.8-python3-unicode-errors.patch
-
-Works around https://bugzilla.gnome.org/show_bug.cgi?id=789714
-and https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
----
- python/libxml.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/python/libxml.c b/python/libxml.c
-index e071e824ca39..9d476f4fcd92 100644
---- a/python/libxml.c
-+++ b/python/libxml.c
-@@ -1621,28 +1621,37 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
const char *msg,
- 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);
- #endif
-
-
- if (libxml_xmlPythonErrorFuncHandler == NULL) {
- va_start(ap, msg);
- vfprintf(stderr, msg, ap);
- va_end(ap);
- } else {
- va_start(ap, msg);
- if (vsnprintf(str, 999, msg, ap) >= 998)
- 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);
- }
Copied: libxml2/repos/staging-x86_64/0001-Fix-python3-unicode-errors.patch
(from rev 475296, libxml2/trunk/0001-Fix-python3-unicode-errors.patch)
===================================================================
--- 0001-Fix-python3-unicode-errors.patch (rev 0)
+++ 0001-Fix-python3-unicode-errors.patch 2023-04-28 22:32:39 UTC (rev
475297)
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Tue, 11 Apr 2023 21:55:36 +0000
+Subject: [PATCH] Fix python3 unicode errors
+
+Patch taken from Fedora at
+https://src.fedoraproject.org/rpms/libxml2/raw/c1fa5c85e9d3a0b7340aaf34d2e5134cf47f5d66/f/libxml2-2.9.8-python3-unicode-errors.patch
+
+Works around https://bugzilla.gnome.org/show_bug.cgi?id=789714
+and https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
+---
+ python/libxml.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/python/libxml.c b/python/libxml.c
+index fb14c7a60912..f72fd25862cd 100644
+--- a/python/libxml.c
++++ b/python/libxml.c
+@@ -1606,28 +1606,37 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
const char *msg,
+ 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);
+ #endif
+
+
+ if (libxml_xmlPythonErrorFuncHandler == NULL) {
+ va_start(ap, msg);
+ vfprintf(stderr, msg, ap);
+ va_end(ap);
+ } else {
+ va_start(ap, msg);
+ if (vsnprintf(str, 999, msg, ap) >= 998)
+ 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 = PyObject_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++ /* Forget any errors caused in the error handler. */
++ PyErr_Clear();
+ Py_XDECREF(list);
+ Py_XDECREF(result);
+ }
Deleted: 0002-HACK-Don-t-run-fuzzing-tests.patch
===================================================================
--- 0002-HACK-Don-t-run-fuzzing-tests.patch 2023-04-28 22:32:02 UTC (rev
475296)
+++ 0002-HACK-Don-t-run-fuzzing-tests.patch 2023-04-28 22:32:39 UTC (rev
475297)
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <[email protected]>
-Date: Tue, 11 Apr 2023 21:59:24 +0000
-Subject: [PATCH] HACK: Don't run fuzzing tests
-
-They take way too long.
----
- Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 316109b16148..3ef672fe911f 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
- SUBDIRS += python
- 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)"'
-
Copied: libxml2/repos/staging-x86_64/0002-HACK-Don-t-run-fuzzing-tests.patch
(from rev 475296, libxml2/trunk/0002-HACK-Don-t-run-fuzzing-tests.patch)
===================================================================
--- 0002-HACK-Don-t-run-fuzzing-tests.patch (rev 0)
+++ 0002-HACK-Don-t-run-fuzzing-tests.patch 2023-04-28 22:32:39 UTC (rev
475297)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Tue, 11 Apr 2023 21:59:24 +0000
+Subject: [PATCH] HACK: Don't run fuzzing tests
+
+They take way too long.
+---
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a5627280f28b..cc1a85a32047 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,6 @@ if WITH_PYTHON
+ SUBDIRS += python
+ endif
+ if WITH_GLOB
+-SUBDIRS += fuzz
+ endif
+
+ DIST_SUBDIRS = include . doc example fuzz python xstc
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-28 22:32:02 UTC (rev 475296)
+++ PKGBUILD 2023-04-28 22:32:39 UTC (rev 475297)
@@ -1,108 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Jan de Groot <[email protected]>
-# Contributor: Tom Gundersen <[email protected]>
-# Contributor: John Proctor <[email protected]>
-
-pkgbase=libxml2
-pkgname=(
- libxml2
- libxml2-docs
-)
-pkgver=2.10.4
-pkgrel=3
-pkgdesc="XML C parser and toolkit"
-url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home";
-arch=(x86_64)
-license=(custom:MIT)
-depends=(
- icu
- ncurses
- readline
- xz
- zlib
-)
-makedepends=(
- git
- python
-)
-_commit=223cb03a5d27b1b2393b266a8657443d046139d6 # tags/v2.10.4^0
-source=(
- "git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit";
- 0001-Fix-python3-unicode-errors.patch
- 0002-HACK-Don-t-run-fuzzing-tests.patch
- https://www.w3.org/XML/Test/xmlts20130923.tar.gz
-)
-b2sums=('SKIP'
-
'ec5a0955906c5fdd4bc65248bdb46f315460f4b2208bf37c49f55ef7468585786bdf563aa3e9357370d4f1ff947a6d4467869eeb2ca6b77ca5e40ffa45213a13'
-
'ec247c8caad963307d8f487176fde518cfb087bbff3f10c2a5846b90a04c9909c2f0e6aaf8ded4784f46586eafb16df493caf1debc20ff10014f03b1f1f8241d'
-
'63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be')
-
-pkgver() {
- cd libxml2
- git describe --tags | sed 's/-rc/rc/;s/^v//;s/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd libxml2
-
- # Use xmlconf from conformance test suite
- ln -s ../xmlconf
-
- # https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
- git apply -3 ../0001-Fix-python3-unicode-errors.patch
-
- # Do not run fuzzing tests
- git apply -3 ../0002-HACK-Don-t-run-fuzzing-tests.patch
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- local configure_options=(
- --prefix=/usr
- --sysconfdir=/etc
- --localstatedir=/var
- --with-history
- --with-icu
- --with-python=/usr/bin/python
- --with-threads
- --disable-static
- )
-
- cd libxml2
-
- ./configure "${configure_options[@]}"
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-check() {
- cd libxml2
- make check
-}
-
-package_libxml2() {
- optdepends=('python: Python bindings')
- provides=(libxml2.so)
-
- cd libxml2
-
- make DESTDIR="$pkgdir" install
-
- mkdir -p ../doc/usr/share
- mv "$pkgdir"/usr/share/{doc,gtk-doc} -t ../doc/usr/share
-
- install -Dm644 Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-package_libxml2-docs() {
- pkgdesc+=" (documentation)"
- depends=()
-
- mv doc/* "$pkgdir"
-
- install -Dm644 libxml2/Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-# vim:set sw=2 sts=-1 et:
Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 475296,
libxml2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-28 22:32:39 UTC (rev 475297)
@@ -0,0 +1,108 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Jan de Groot <[email protected]>
+# Contributor: Tom Gundersen <[email protected]>
+# Contributor: John Proctor <[email protected]>
+
+pkgbase=libxml2
+pkgname=(
+ libxml2
+ libxml2-docs
+)
+pkgver=2.11.0
+pkgrel=1
+pkgdesc="XML C parser and toolkit"
+url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home";
+arch=(x86_64)
+license=(custom:MIT)
+depends=(
+ icu
+ ncurses
+ readline
+ xz
+ zlib
+)
+makedepends=(
+ git
+ python
+)
+_commit=f296934ade688baab79caf1c62a82149ad78accf # tags/v2.11.0^0
+source=(
+ "git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit";
+ 0001-Fix-python3-unicode-errors.patch
+ 0002-HACK-Don-t-run-fuzzing-tests.patch
+ https://www.w3.org/XML/Test/xmlts20130923.tar.gz
+)
+b2sums=('SKIP'
+
'f2fa5084cef46ae33069bd76745e9f5bdfa8cb20714b861641b6028ea2457ed57eb5637afad1f6a313d23f79428cf56c16106b716294eb361fd1f3b04799e1d3'
+
'792f8f721c18369b19db851c04b81e0ad4e57c588e8bde2ae0e4afddb12765d18119a5b73de0ae232d24d5c009f1972e2658c60484db83e8b870f25e8bb063a5'
+
'63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be')
+
+pkgver() {
+ cd libxml2
+ git describe --tags | sed 's/-rc/rc/;s/^v//;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd libxml2
+
+ # Use xmlconf from conformance test suite
+ ln -s ../xmlconf
+
+ # https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
+ git apply -3 ../0001-Fix-python3-unicode-errors.patch
+
+ # Do not run fuzzing tests
+ git apply -3 ../0002-HACK-Don-t-run-fuzzing-tests.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ local configure_options=(
+ --prefix=/usr
+ --sysconfdir=/etc
+ --localstatedir=/var
+ --with-history
+ --with-icu
+ --with-python=/usr/bin/python
+ --with-threads
+ --disable-static
+ )
+
+ cd libxml2
+
+ ./configure "${configure_options[@]}"
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd libxml2
+ make check
+}
+
+package_libxml2() {
+ optdepends=('python: Python bindings')
+ provides=(libxml2.so)
+
+ cd libxml2
+
+ make DESTDIR="$pkgdir" install
+
+ mkdir -p ../doc/usr/share
+ mv "$pkgdir"/usr/share/{doc,gtk-doc} -t ../doc/usr/share
+
+ install -Dm644 Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+package_libxml2-docs() {
+ pkgdesc+=" (documentation)"
+ depends=()
+
+ mv doc/* "$pkgdir"
+
+ install -Dm644 libxml2/Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim:set sw=2 sts=-1 et:
