[arch-commits] Commit in libxml2/repos/staging-x86_64 (4 files)
Evangelos Foutras
foutrelis at gemini.archlinux.org
Wed Dec 1 21:36:52 UTC 2021
Date: Wednesday, December 1, 2021 @ 21:36:51
Author: foutrelis
Revision: 430179
archrelease: copy trunk to staging-x86_64
Added:
libxml2/repos/staging-x86_64/PKGBUILD
(from rev 430178, libxml2/trunk/PKGBUILD)
libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch
(from rev 430178, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)
Deleted:
libxml2/repos/staging-x86_64/PKGBUILD
libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch
--------------------------------------------+
PKGBUILD | 182 +++++++++++++--------------
libxml2-2.9.8-python3-unicode-errors.patch | 68 +++++-----
2 files changed, 125 insertions(+), 125 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-01 21:36:46 UTC (rev 430178)
+++ PKGBUILD 2021-12-01 21:36:51 UTC (rev 430179)
@@ -1,91 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: 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.12
-pkgrel=4
-pkgdesc='XML parsing library, version 2'
-url='http://www.xmlsoft.org/'
-arch=(x86_64)
-license=(MIT)
-depends=(zlib readline ncurses xz icu)
-makedepends=(python2 python git)
-_commit=b48e77cf4f6fa0792c5f4b639707a2b0675e461b # tags/v2.9.12^0
-source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
- libxml2-2.9.8-python3-unicode-errors.patch
- https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
-sha256sums=('SKIP'
- '37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
- '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
- mkdir build-py{2,3}
- cd $pkgname
-
- # Work around lxml API abuse
- git cherry-pick -n 85b1792e37b131e7a51af98a37f92472e8de5f3f
- # Fix regression in xmlNodeDumpOutputInternal
- git cherry-pick -n 13ad8736d294536da4cbcd70a96b0a2fbf47070c
- # Fix XPath recursion limit
- git cherry-pick -n 3e1aad4fe584747fd7d17cc7b2863a78e2d21a77
- # Fix whitespace when serializing empty HTML documents
- git cherry-pick -n 92d9ab4c28842a09ca2b76d3ff2f933e01b6cd6f
-
- # Take patches from https://src.fedoraproject.org/rpms/libxml2/tree/master
- local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
- done
-
- sed -e '/cd fuzz; /d' -e 's/fuzz //g' -i Makefile.am
- autoreconf -fiv
-}
-
-_build() (
- cd build-py$1
- ../$pkgname/configure \
- --prefix=/usr \
- --with-threads \
- --with-history \
- --with-python=/usr/bin/python$1 \
- --with-icu
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
- make
- find doc -type f -exec chmod 0644 {} +
-)
-
-build() {
- _build 2
- _build 3
-}
-
-check() {
- cd build-py3
- ln -s ../xmlconf
- make check
-}
-
-package() {
- make -C build-py2 DESTDIR="$pkgdir" install
- make -C build-py3/python DESTDIR="$pkgdir" install
- install -Dm 644 build-py2/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
-
- #Disabled for now, as I don't want to introduce file conflicts during a security update
- #python2 -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7"
- #python2 -O -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7"
- #python -m compileall -d /usr/lib/python3.10 "$pkgdir/usr/lib/python3.10"
- #python -O -m compileall -d /usr/lib/python3.10 "$pkgdir/usr/lib/python3.10"
-}
-
-# vim: ts=2 sw=2 et:
Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 430178, libxml2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-01 21:36:51 UTC (rev 430179)
@@ -0,0 +1,91 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: 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.12
+pkgrel=5
+pkgdesc='XML parsing library, version 2'
+url='http://www.xmlsoft.org/'
+arch=(x86_64)
+license=(MIT)
+depends=(zlib readline ncurses xz icu)
+makedepends=(python2 python git)
+_commit=b48e77cf4f6fa0792c5f4b639707a2b0675e461b # tags/v2.9.12^0
+source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
+ libxml2-2.9.8-python3-unicode-errors.patch
+ https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
+sha256sums=('SKIP'
+ '37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
+ '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+ mkdir build-py{2,3}
+ cd $pkgname
+
+ # Work around lxml API abuse
+ git cherry-pick -n 85b1792e37b131e7a51af98a37f92472e8de5f3f
+ # Fix regression in xmlNodeDumpOutputInternal
+ git cherry-pick -n 13ad8736d294536da4cbcd70a96b0a2fbf47070c
+ # Fix XPath recursion limit
+ git cherry-pick -n 3e1aad4fe584747fd7d17cc7b2863a78e2d21a77
+ # Fix whitespace when serializing empty HTML documents
+ git cherry-pick -n 92d9ab4c28842a09ca2b76d3ff2f933e01b6cd6f
+
+ # Take patches from https://src.fedoraproject.org/rpms/libxml2/tree/master
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
+
+ sed -e '/cd fuzz; /d' -e 's/fuzz //g' -i Makefile.am
+ autoreconf -fiv
+}
+
+_build() (
+ cd build-py$1
+ ../$pkgname/configure \
+ --prefix=/usr \
+ --with-threads \
+ --with-history \
+ --with-python=/usr/bin/python$1 \
+ --with-icu
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+ make
+ find doc -type f -exec chmod 0644 {} +
+)
+
+build() {
+ _build 2
+ _build 3
+}
+
+check() {
+ cd build-py3
+ ln -s ../xmlconf
+ make check
+}
+
+package() {
+ make -C build-py2 DESTDIR="$pkgdir" install
+ make -C build-py3/python DESTDIR="$pkgdir" install
+ install -Dm 644 build-py2/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
+
+ #Disabled for now, as I don't want to introduce file conflicts during a security update
+ #python2 -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7"
+ #python2 -O -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7"
+ #python -m compileall -d /usr/lib/python3.10 "$pkgdir/usr/lib/python3.10"
+ #python -O -m compileall -d /usr/lib/python3.10 "$pkgdir/usr/lib/python3.10"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: libxml2-2.9.8-python3-unicode-errors.patch
===================================================================
--- libxml2-2.9.8-python3-unicode-errors.patch 2021-12-01 21:36:46 UTC (rev 430178)
+++ libxml2-2.9.8-python3-unicode-errors.patch 2021-12-01 21:36:51 UTC (rev 430179)
@@ -1,34 +0,0 @@
-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
- 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);
- }
Copied: libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch (from rev 430178, 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 2021-12-01 21:36:51 UTC (rev 430179)
@@ -0,0 +1,34 @@
+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
+ 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);
+ }
More information about the arch-commits
mailing list