[arch-commits] Commit in libxml2/repos/testing-x86_64 (6 files)

Jan Steffens heftig at gemini.archlinux.org
Tue Aug 30 17:57:36 UTC 2022


    Date: Tuesday, August 30, 2022 @ 17:57:36
  Author: heftig
Revision: 454784

archrelease: copy trunk to testing-x86_64

Added:
  libxml2/repos/testing-x86_64/PKGBUILD
    (from rev 454782, libxml2/trunk/PKGBUILD)
  libxml2/repos/testing-x86_64/libxml2-2.9.8-python3-unicode-errors.patch
    (from rev 454782, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)
  libxml2/repos/testing-x86_64/no-fuzz.diff
    (from rev 454782, libxml2/trunk/no-fuzz.diff)
Deleted:
  libxml2/repos/testing-x86_64/PKGBUILD
  libxml2/repos/testing-x86_64/libxml2-2.9.8-python3-unicode-errors.patch
  libxml2/repos/testing-x86_64/no-fuzz.diff

--------------------------------------------+
 PKGBUILD                                   |  193 ++++++++++++++-------------
 libxml2-2.9.8-python3-unicode-errors.patch |   86 ++++++------
 no-fuzz.diff                               |   38 ++---
 3 files changed, 163 insertions(+), 154 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-30 17:57:36 UTC (rev 454783)
+++ PKGBUILD	2022-08-30 17:57:36 UTC (rev 454784)
@@ -1,92 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgbase=libxml2
-pkgname=(libxml2 libxml2-docs)
-pkgver=2.10.2
-pkgrel=1
-pkgdesc="XML C parser and toolkit (32-bit)"
-url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
-arch=(x86_64)
-license=(custom:MIT)
-depends=(zlib xz icu readline ncurses)
-makedepends=(python git)
-options=(debug)
-_commit=21b24b51608d471bb9f7c4225e23d0db2acecc52  # tags/v2.10.2^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'
-            '3d07a50fc0963bda05fc5269dedc51f108260699e25e455bb31f6d80c2a9cada'
-            '3908e7a53b20109bdfde143238f36e22a154dbb7d363b634e54c0a18328f4656'
-            '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
-
-pkgver() {
-  cd libxml2
-  git describe --tags | sed 's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  cd libxml2
-
-  # Use xmlconf from conformance test suite
-  ln -s ../xmlconf
-
-  # https://src.fedoraproject.org/rpms/libxml2/tree/rawhide
-  git apply -3 ../libxml2-2.9.8-python3-unicode-errors.patch
-
-  # Do not run fuzzing tests
-  git apply -3 ../no-fuzz.diff
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd libxml2
-
-  ./configure \
-    --prefix=/usr \
-    --with-threads \
-    --with-history \
-    --with-python=/usr/bin/python \
-    --with-icu
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
-  make
-
-  find doc -type f -exec chmod -c 0644 {} +
-}
-
-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
-
-  python -m compileall -d /usr/lib "$pkgdir/usr/lib"
-  python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
-
-  install -Dm644 Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-package_libxml2-docs() {
-  pkgdesc+=" (documentation)"
-  depends=()
-
-  mv doc/* "$pkgdir"
-}
-
-# vim:set sw=2 sts=-1 et:

Copied: libxml2/repos/testing-x86_64/PKGBUILD (from rev 454782, libxml2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-08-30 17:57:36 UTC (rev 454784)
@@ -0,0 +1,101 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgbase=libxml2
+pkgname=(libxml2 libxml2-docs)
+pkgver=2.10.2
+pkgrel=2
+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
+)
+options=(debug)
+_commit=21b24b51608d471bb9f7c4225e23d0db2acecc52  # tags/v2.10.2^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'
+            '3d07a50fc0963bda05fc5269dedc51f108260699e25e455bb31f6d80c2a9cada'
+            '3908e7a53b20109bdfde143238f36e22a154dbb7d363b634e54c0a18328f4656'
+            '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+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://src.fedoraproject.org/rpms/libxml2/tree/rawhide
+  git apply -3 ../libxml2-2.9.8-python3-unicode-errors.patch
+
+  # Do not run fuzzing tests
+  git apply -3 ../no-fuzz.diff
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd libxml2
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --with-threads \
+    --with-history \
+    --with-python=/usr/bin/python \
+    --with-icu \
+    --disable-static
+  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:

Deleted: libxml2-2.9.8-python3-unicode-errors.patch
===================================================================
--- libxml2-2.9.8-python3-unicode-errors.patch	2022-08-30 17:57:36 UTC (rev 454783)
+++ libxml2-2.9.8-python3-unicode-errors.patch	2022-08-30 17:57:36 UTC (rev 454784)
@@ -1,43 +0,0 @@
-diff --git i/python/libxml.c w/python/libxml.c
-index e071e824..9d476f4f 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];
-+    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/testing-x86_64/libxml2-2.9.8-python3-unicode-errors.patch (from rev 454782, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)
===================================================================
--- libxml2-2.9.8-python3-unicode-errors.patch	                        (rev 0)
+++ libxml2-2.9.8-python3-unicode-errors.patch	2022-08-30 17:57:36 UTC (rev 454784)
@@ -0,0 +1,43 @@
+diff --git i/python/libxml.c w/python/libxml.c
+index e071e824..9d476f4f 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];
++    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);
+     }

Deleted: no-fuzz.diff
===================================================================
--- no-fuzz.diff	2022-08-30 17:57:36 UTC (rev 454783)
+++ no-fuzz.diff	2022-08-30 17:57:36 UTC (rev 454784)
@@ -1,19 +0,0 @@
-diff --git i/Makefile.am w/Makefile.am
-index 316109b1..3ef672fe 100644
---- i/Makefile.am
-+++ w/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/testing-x86_64/no-fuzz.diff (from rev 454782, libxml2/trunk/no-fuzz.diff)
===================================================================
--- no-fuzz.diff	                        (rev 0)
+++ no-fuzz.diff	2022-08-30 17:57:36 UTC (rev 454784)
@@ -0,0 +1,19 @@
+diff --git i/Makefile.am w/Makefile.am
+index 316109b1..3ef672fe 100644
+--- i/Makefile.am
++++ w/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)"'
+ 



More information about the arch-commits mailing list