[arch-commits] Commit in libxml2/trunk (2 files)

[Jan Steffens]

    Date: Monday, May 2, 2022 @ 17:23:45
  Author: heftig
Revision: 444416

2.9.14-1

Modified:
  libxml2/trunk/PKGBUILD
  libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch

--------------------------------------------+
 PKGBUILD                                   |   22 ++++++++++++----------
 libxml2-2.9.8-python3-unicode-errors.patch |   21 +++++++++++++++------
 2 files changed, 27 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-02 16:58:14 UTC (rev 444415)
+++ PKGBUILD	2022-05-02 17:23:45 UTC (rev 444416)
@@ -1,11 +1,12 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tom Gundersen <teg at jklm.no>
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=libxml2
-pkgver=2.9.13
-pkgrel=2
+pkgver=2.9.14
+pkgrel=1
 pkgdesc='XML parsing library, version 2'
 url='http://www.xmlsoft.org/'
 arch=(x86_64)
@@ -14,13 +15,14 @@
 makedepends=(python git)
 optdepends=('python: Python bindings')
 provides=(libxml2.so)
-_commit=a075d256fd9ff15590b86d981b75a50ead124fca  # tags/v2.9.13^0
+options=(debug)
+_commit=7846b0a677f8d3ce72486125fa281e92ac9970e8  # tags/v2.9.14^0
 source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
         libxml2-2.9.8-python3-unicode-errors.patch
         no-fuzz.diff
         https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
 sha256sums=('SKIP'
-            '37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
+            'd331748e504e69603dac9c57f7b110a98a4bd4cb87e63d0c1bbcd71ec3635383'
             '3fc010d8c42b93e6d6f1fca6b598a561e9d2c8780ff3ca0c76a31efabaea404f'
             '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
 
@@ -43,10 +45,10 @@
   # Do not run fuzzing tests
   git apply -3 ../no-fuzz.diff
 
-  autoreconf -fiv
+  NOCONFIGURE=1 ./autogen.sh
 }
 
-build() (
+build() {
   cd build
 
   ../libxml2/configure \
@@ -59,7 +61,7 @@
   make
 
   find doc -type f -exec chmod -c 0644 {} +
-)
+}
 
 check() {
   make -C build check
@@ -67,9 +69,9 @@
 
 package() {
   make -C build DESTDIR="$pkgdir" install
-  
+
   python -m compileall -d /usr/lib "$pkgdir/usr/lib"
-  python -O -m compileall -d /usr/lib "$pkgdir/usr/lib" 
+  python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
 
   install -Dm 644 build/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
 }

Modified: libxml2-2.9.8-python3-unicode-errors.patch
===================================================================
--- libxml2-2.9.8-python3-unicode-errors.patch	2022-05-02 16:58:14 UTC (rev 444415)
+++ libxml2-2.9.8-python3-unicode-errors.patch	2022-05-02 17:23:45 UTC (rev 444416)
@@ -1,8 +1,8 @@
-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
+diff --git i/python/libxml.c w/python/libxml.c
+index ef630254..65a51af0 100644
+--- i/python/libxml.c
++++ w/python/libxml.c
+@@ -1621,28 +1621,37 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg,
      PyObject *message;
      PyObject *result;
      char str[1000];
@@ -10,7 +10,16 @@
  
  #ifdef DEBUG_ERROR
      printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
-@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ #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);