Merge branch 'testing'

1 files changed, 24 insertions, 22 deletions

diff --git a/abs/extra/libsoup/PKGBUILD b/abs/extra/libsoup/PKGBUILD
index ee50628..ff6678a 100644
--- a/abs/extra/libsoup/PKGBUILD
+++ b/abs/extra/libsoup/PKGBUILD
@@ -1,36 +1,38 @@
-# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsoup
-pkgver=2.48.0
+pkgver=2.64.2
 pkgrel=1
-pkgdesc="GNOME HTTP Library"
-arch=(i686 x86_64)
+pkgdesc="HTTP client/server library for GNOME"
+url="https://wiki.gnome.org/Projects/libsoup"
+arch=(x86_64)
 license=(LGPL)
-url="http://www.gnome.org"
-depends=(glib2 libxml2 glib-networking sqlite)
-makedepends=(intltool gobject-introspection python2)
-checkdepends=(apache php php-apache)
-provides=("libsoup-gnome=$pkgver-$pkgrel")
-conflicts=(libsoup-gnome)
-replaces=(libsoup-gnome)
-options=('!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784')
+depends=(glib2 libxml2 glib-networking sqlite krb5 libpsl)
+makedepends=(gobject-introspection python vala git gtk-doc meson)
+checkdepends=(apache php-apache)
+_commit=b25faf59f1bb782e95be94f70a98a369846d1524  # tags/2.64.2^0
+source=("git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+}
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
+  arch-meson $pkgname build -D doc=true -D vapi=true
+  ninja -C build
 }
 
 check() {
-  cd $pkgname-$pkgver
-  make check
+  meson test -C build
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" meson install -C build
 }