diff options
Diffstat (limited to 'abs/core/libxml2')
-rw-r--r-- | abs/core/libxml2/PKGBUILD | 64 | ||||
-rw-r--r-- | abs/core/libxml2/libxml2-2.9.4-remove-pyverify_fd.patch | 12 |
2 files changed, 52 insertions, 24 deletions
diff --git a/abs/core/libxml2/PKGBUILD b/abs/core/libxml2/PKGBUILD index fe3e82c..2ab74b4 100644 --- a/abs/core/libxml2/PKGBUILD +++ b/abs/core/libxml2/PKGBUILD @@ -1,45 +1,61 @@ # $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Tom Gundersen <teg@jklm.no> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxml2 -pkgver=2.9.3 +pkgver=2.9.8 pkgrel=1 pkgdesc="XML parsing library, version 2" -arch=(i686 x86_64) -license=('MIT') -depends=('zlib' 'readline' 'ncurses' 'xz') -makedepends=('python2') -optdepends=('python2: python bindings to libxml') url="http://www.xmlsoft.org/" -source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz - http://www.w3.org/XML/Test/xmlts20080827.tar.gz) -md5sums=('daece17e045f1c107610e137ab50c179' - 'ae3d1ebe000a3972afa104ca7f0e1b4a') +arch=(x86_64) +license=(MIT) +depends=(zlib readline ncurses xz icu) +makedepends=(python2 python git) +_commit=18890f471c420411aa3c989e104d090966ec9dbf # tags/v2.9.8^0 +source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit + https://www.w3.org/XML/Test/xmlts20130923.tar.gz) +sha256sums=('SKIP' + '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f') -prepare() { - cd ${pkgname}-${pkgver} - sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py - mv ../xmlconf . +pkgver() { + cd $pkgname + git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g' } -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python2 +prepare() { + mkdir build-py{2,3} - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + cd $pkgname + NOCONFIGURE=1 ./autogen.sh +} + +_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 + PYTHONHASHSEED=0 make + find doc -type f -exec chmod 0644 {} + +) - make +build() { + _build 2 + _build 3 } check() { - cd ${pkgname}-${pkgver} + cd build-py2 + ln -s ../xmlconf make check } package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + make -C build-py2 DESTDIR="$pkgdir" install + make -C build-py3/python DESTDIR="$pkgdir" install + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 build-py2/COPYING } diff --git a/abs/core/libxml2/libxml2-2.9.4-remove-pyverify_fd.patch b/abs/core/libxml2/libxml2-2.9.4-remove-pyverify_fd.patch new file mode 100644 index 0000000..d05d4cb --- /dev/null +++ b/abs/core/libxml2/libxml2-2.9.4-remove-pyverify_fd.patch @@ -0,0 +1,12 @@ +diff -Nur libxml2-2.9.4.orig/python/types.c libxml2-2.9.4/python/types.c +--- libxml2-2.9.4.orig/python/types.c 2016-02-09 03:17:33.000000000 -0700 ++++ libxml2-2.9.4/python/types.c 2016-12-21 12:34:06.755650986 -0700 +@@ -31,8 +31,6 @@ + const char *mode; + + fd = PyObject_AsFileDescriptor(f); +- if (!_PyVerify_fd(fd)) +- return(NULL); + /* + * Get the flags on the fd to understand how it was opened + */ |