[arch-commits] Commit in lib32-libxml2/trunk (PKGBUILD)

[Levente Polyak]

    Date: Wednesday, January 23, 2019 @ 00:21:41
  Author: anthraxx
Revision: 427068

upgpkg: lib32-libxml2 2.9.9-1

Modified:
  lib32-libxml2/trunk/PKGBUILD

----------+
 PKGBUILD |   42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-22 23:56:49 UTC (rev 427067)
+++ PKGBUILD	2019-01-23 00:21:41 UTC (rev 427068)
@@ -1,28 +1,28 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: John Proctor <jproctor at prium.net>
 
 _pkgbasename=libxml2
 pkgname=lib32-$_pkgbasename
-pkgver=2.9.8
-pkgrel=5
-pkgdesc="XML parsing library, version 2 (32-bit)"
+pkgver=2.9.9
+pkgrel=1
+pkgdesc='XML parsing library, version 2 (32-bit)'
+url="http://www.xmlsoft.org/"
 arch=(x86_64)
-license=('custom')
-depends=(lib32-zlib lib32-readline lib32-ncurses lib32-icu libxml2)
-makedepends=(gcc-multilib git)
-url="http://www.xmlsoft.org/"
-_commit=18890f471c420411aa3c989e104d090966ec9dbf # tags/v2.9.8^0
-source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit)
-md5sums=('SKIP')
+license=(MIT)
+depends=(lib32-zlib lib32-readline lib32-ncurses lib32-xz lib32-icu libxml2)
+makedepends=(git)
+_commit=f8a8c1f59db355b46962577e7b74f1a1e8149dc6  # tags/v2.9.9^0
+source=("git+https://git.gnome.org/browse/libxml2#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${_pkgbasename}"
-  git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
+  cd ${_pkgbasename}
+  git describe --always --tags | sed 's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd "${srcdir}/${_pkgbasename}"
-  git cherry-pick -n 2240fbf5912054af025fb6e01e26375100275e74
+  cd ${_pkgbasename}
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -31,16 +31,20 @@
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd "${srcdir}/${_pkgbasename}"
+  cd ${_pkgbasename}
 
-  ./configure --prefix=/usr --with-threads --with-history --with-icu --libdir=/usr/lib32 --without-lzma
+  ./configure \
+    --prefix=/usr \
+    --with-threads \
+    --with-history \
+    --with-icu \
+    --libdir=/usr/lib32
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
-
   make
 }
 
 package() {
-  cd "${srcdir}/${_pkgbasename}"
+  cd ${_pkgbasename}
   make DESTDIR="${pkgdir}" install
 
   rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/usr/lib32/xml2Conf.sh"
@@ -47,3 +51,5 @@
   mkdir -p "$pkgdir/usr/share/licenses"
   ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
 }
+
+# vim: ts=2 sw=2 et: