Date: Friday, August 26, 2022 @ 21:37:55 Author: heftig Revision: 454566
2.10.1-1 Modified: libxml2/trunk/PKGBUILD libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch libxml2/trunk/no-fuzz.diff --------------------------------------------+ PKGBUILD | 57 ++++++++++++++++----------- libxml2-2.9.8-python3-unicode-errors.patch | 2 no-fuzz.diff | 21 +++------ 3 files changed, 44 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-26 21:31:55 UTC (rev 454565) +++ PKGBUILD 2022-08-26 21:37:55 UTC (rev 454566) @@ -4,26 +4,25 @@ # Contributor: Tom Gundersen <[email protected]> # Contributor: John Proctor <[email protected]> -pkgname=libxml2 -pkgver=2.9.14 +pkgbase=libxml2 +pkgname=(libxml2 libxml2-docs) +pkgver=2.10.1 pkgrel=1 -pkgdesc='XML parsing library, version 2' -url='http://www.xmlsoft.org/' +pkgdesc="XML C parser and toolkit (32-bit)" +url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"; arch=(x86_64) -license=(MIT) -depends=(zlib readline ncurses xz icu) +license=(custom:MIT) +depends=(zlib xz icu readline ncurses) makedepends=(python git) -optdepends=('python: Python bindings') -provides=(libxml2.so) options=(debug) -_commit=7846b0a677f8d3ce72486125fa281e92ac9970e8 # tags/v2.9.14^0 +_commit=d85c4a01407b75eb4005256df106d121e766a1d8 # tags/v2.10.1^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' - 'd331748e504e69603dac9c57f7b110a98a4bd4cb87e63d0c1bbcd71ec3635383' - '3fc010d8c42b93e6d6f1fca6b598a561e9d2c8780ff3ca0c76a31efabaea404f' + '3d07a50fc0963bda05fc5269dedc51f108260699e25e455bb31f6d80c2a9cada' + 'b1e52aa01f0c2ef2804ba43ec63e6abec3e81e30d248a8abc5dd8a1534de1075' '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f') pkgver() { @@ -32,13 +31,11 @@ } prepare() { - mkdir build + cd libxml2 # Use xmlconf from conformance test suite - ln -s xmlconf build/xmlconf + ln -s ../xmlconf - cd libxml2 - # https://src.fedoraproject.org/rpms/libxml2/tree/rawhide git apply -3 ../libxml2-2.9.8-python3-unicode-errors.patch @@ -49,9 +46,9 @@ } build() { - cd build + cd libxml2 - ../libxml2/configure \ + ./configure \ --prefix=/usr \ --with-threads \ --with-history \ @@ -64,16 +61,32 @@ } check() { - make -C build check + cd libxml2 + make check } -package() { - make -C build DESTDIR="$pkgdir" install +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 -Dm 644 build/COPYING -t "$pkgdir/usr/share/licenses/$pkgname" + install -Dm644 Copyright -t "$pkgdir/usr/share/licenses/$pkgname" } -# vim:set sw=2 et: +package_libxml2-docs() { + pkgdesc+=" (documentation)" + depends=() + + mv doc/* "$pkgdir" +} + +# vim:set sw=2 sts=-1 et: Modified: libxml2-2.9.8-python3-unicode-errors.patch =================================================================== --- libxml2-2.9.8-python3-unicode-errors.patch 2022-08-26 21:31:55 UTC (rev 454565) +++ libxml2-2.9.8-python3-unicode-errors.patch 2022-08-26 21:37:55 UTC (rev 454566) @@ -1,5 +1,5 @@ diff --git i/python/libxml.c w/python/libxml.c -index ef630254..65a51af0 100644 +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, Modified: no-fuzz.diff =================================================================== --- no-fuzz.diff 2022-08-26 21:31:55 UTC (rev 454565) +++ no-fuzz.diff 2022-08-26 21:37:55 UTC (rev 454566) @@ -1,24 +1,19 @@ diff --git i/Makefile.am w/Makefile.am -index 7917b595..f0f4b695 100644 +index eaa9a7a7..97674845 100644 --- i/Makefile.am +++ w/Makefile.am -@@ -2,9 +2,9 @@ +@@ -2,12 +2,12 @@ ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = include . doc example fuzz xstc $(PYTHON_SUBDIR) -+SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR) +-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 + AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include -DSYSCONFDIR='"$(sysconfdir)"' -@@ -210,7 +210,6 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \ - $(CHECKER) ./runxmlconf$(EXEEXT) - @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \ - $(MAKE) tests ; fi) -- @cd fuzz; $(MAKE) tests - - check: all runtests -
