[arch-commits] Commit in libxml2/repos/extra-x86_64 (4 files)

[Jan Steffens]

    Date: Thursday, March 8, 2018 @ 18:38:41
  Author: heftig
Revision: 318255

archrelease: copy trunk to extra-x86_64

Added:
  libxml2/repos/extra-x86_64/PKGBUILD
    (from rev 318254, libxml2/trunk/PKGBUILD)
  libxml2/repos/extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch
    (from rev 318254, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
Deleted:
  libxml2/repos/extra-x86_64/PKGBUILD
  libxml2/repos/extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch

----------------------------------------+
 PKGBUILD                               |  126 +++++++++++++++----------------
 libxml2-2.9.4-remove-pyverify_fd.patch |   24 ++---
 2 files changed, 73 insertions(+), 77 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-08 18:37:38 UTC (rev 318254)
+++ PKGBUILD	2018-03-08 18:38:41 UTC (rev 318255)
@@ -1,65 +0,0 @@
-# $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=2
-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/extra-x86_64/PKGBUILD (from rev 318254, libxml2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-03-08 18:38:41 UTC (rev 318255)
@@ -0,0 +1,61 @@
+# $Id$
+# 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.8
+pkgrel=1
+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=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')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
+}
+
+prepare() {
+  mkdir build-py{2,3}
+
+  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 {} +
+)
+
+build() {
+  _build 2
+  _build 3
+}
+
+check() {
+  cd build-py2
+  ln -s ../xmlconf
+  make check
+}
+
+package() {
+  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
+}

Deleted: libxml2-2.9.4-remove-pyverify_fd.patch
===================================================================
--- libxml2-2.9.4-remove-pyverify_fd.patch	2018-03-08 18:37:38 UTC (rev 318254)
+++ libxml2-2.9.4-remove-pyverify_fd.patch	2018-03-08 18:38:41 UTC (rev 318255)
@@ -1,12 +0,0 @@
-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
-      */

Copied: libxml2/repos/extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 318254, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
===================================================================
--- libxml2-2.9.4-remove-pyverify_fd.patch	                        (rev 0)
+++ libxml2-2.9.4-remove-pyverify_fd.patch	2018-03-08 18:38:41 UTC (rev 318255)
@@ -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
+      */