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

[Levente Polyak]

    Date: Wednesday, January 23, 2019 @ 00:12:31
  Author: anthraxx
Revision: 344595

archrelease: copy trunk to extra-x86_64

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

----------------------------------------+
 PKGBUILD                               |  124 +++++++++++++++----------------
 libxml2-2.9.4-remove-pyverify_fd.patch |   12 ---
 2 files changed, 62 insertions(+), 74 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-23 00:12:20 UTC (rev 344594)
+++ PKGBUILD	2019-01-23 00:12:31 UTC (rev 344595)
@@ -1,62 +0,0 @@
-# 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=8
-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
-  git cherry-pick -n 2240fbf5912054af025fb6e01e26375100275e74
-
-  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
-}

Copied: libxml2/repos/extra-x86_64/PKGBUILD (from rev 344594, libxml2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-01-23 00:12:31 UTC (rev 344595)
@@ -0,0 +1,62 @@
+# 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.9
+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=f8a8c1f59db355b46962577e7b74f1a1e8149dc6  # tags/v2.9.9^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 --always --tags | sed 's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;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 -Dm 644 build-py2/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: libxml2-2.9.4-remove-pyverify_fd.patch
===================================================================
--- libxml2-2.9.4-remove-pyverify_fd.patch	2019-01-23 00:12:20 UTC (rev 344594)
+++ libxml2-2.9.4-remove-pyverify_fd.patch	2019-01-23 00:12:31 UTC (rev 344595)
@@ -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
-      */