[arch-commits] Commit in libxml2/repos (3 files)

Jan de Groot jgc at archlinux.org
Thu Nov 9 21:47:25 UTC 2017


    Date: Thursday, November 9, 2017 @ 21:47:22
  Author: jgc
Revision: 309341

archrelease: copy trunk to testing-x86_64

Added:
  libxml2/repos/testing-x86_64/
  libxml2/repos/testing-x86_64/PKGBUILD
    (from rev 309340, libxml2/trunk/PKGBUILD)
  libxml2/repos/testing-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch
    (from rev 309340, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)

----------------------------------------+
 PKGBUILD                               |   65 +++++++++++++++++++++++++++++++
 libxml2-2.9.4-remove-pyverify_fd.patch |   12 +++++
 2 files changed, 77 insertions(+)

Copied: libxml2/repos/testing-x86_64/PKGBUILD (from rev 309340, libxml2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2017-11-09 21:47:22 UTC (rev 309341)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=libxml2
+pkgver=2.9.7+4+g72182550
+pkgrel=1
+pkgdesc="XML parsing library, version 2"
+arch=(i686 x86_64)
+license=('MIT')
+depends=('zlib' 'readline' 'ncurses' 'xz' 'icu')
+options=(!makeflags)
+makedepends=('python2' 'python' 'git')
+url="http://www.xmlsoft.org/"
+_commit=72182550926d31ad17357bd3ed69e49d7e69df02  # master~7
+source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
+        https://www.w3.org/XML/Test/xmlts20130923.tar.gz
+        libxml2-2.9.4-remove-pyverify_fd.patch)
+sha256sums=('SKIP'
+            '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f'
+            'c9cebff010bd99c5453847e87b9fa8fdd7f744f415bf680b3650877789460ca9')
+
+pkgver() {
+  cd $pkgname
+  git describe --long | sed -e 's/-rc/rc/' -e 's/-/+/g' -e 's/^v//'
+}
+
+prepare() {
+  mkdir build-py3
+  mkdir build-py2
+  mv xmlconf build-py2/
+  cd $pkgname
+
+  patch -Np1 -i ../libxml2-2.9.4-remove-pyverify_fd.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd build-py2
+  ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python2 --with-icu
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  make
+
+  cd ../build-py3
+  ../$pkgname/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
+  PYTHONHASHSEED=0 make
+}
+
+check() {
+  cd build-py2
+  make check
+}
+
+package() {
+  cd build-py2
+  find doc -type f -exec chmod 0644 {} \;
+
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+
+  cd ../build-py3/python
+  PYTHONHASHSEED=0 make DESTDIR="${pkgdir}" install
+}

Copied: libxml2/repos/testing-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 309340, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
===================================================================
--- testing-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch	                        (rev 0)
+++ testing-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch	2017-11-09 21:47:22 UTC (rev 309341)
@@ -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
+      */


More information about the arch-commits mailing list