gdk-pixbuf2: update to 2.38.0

3 files changed, 47 insertions, 29 deletions

diff --git a/abs/core/gdk-pixbuf2/PKGBUILD b/abs/core/gdk-pixbuf2/PKGBUILD
index ad535fc..d15d040 100644
--- a/abs/core/gdk-pixbuf2/PKGBUILD
+++ b/abs/core/gdk-pixbuf2/PKGBUILD
@@ -1,33 +1,48 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gdk-pixbuf2
-pkgver=2.31.1
-pkgrel=2
+pkgver=2.38.0
+pkgrel=1
 pkgdesc="An image loading library"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('LGPL2.1')
-depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper')
-makedepends=('gtk-doc' 'gobject-introspection')
+arch=(x86_64)
+url="https://wiki.gnome.org/Projects/GdkPixbuf"
+license=(LGPL2.1)
+depends=(glib2 libpng libtiff libjpeg libx11 jasper shared-mime-info)
+makedepends=(gtk-doc gobject-introspection git docbook-xsl meson)
 install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver:0:4}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('25a75e3c61dac11e6ff6416ad846951ccafac6486b1c6a1bfb0b213b99db52cd')
+_commit=0b1eab312e77701c20b07fb8e38119009f8b34c3  # tags/2.38.0^0
+source=("git+https://gitlab.gnome.org/GNOME/gdk-pixbuf.git#commit=$_commit"
+        gdk-pixbuf-query-loaders.hook)
+sha256sums=('SKIP'
+            '963afcfacde9fd36031d93c8aa4c94a669ab1dbe9ba0d2cf17599b7d358e54c2')
+
+pkgver() {
+  cd gdk-pixbuf
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd gdk-pixbuf
+}
 
 build() {
-  cd gdk-pixbuf-$pkgver
+  arch-meson gdk-pixbuf build \
+    -D jasper=true \
+    -D docs=true \
+    -D installed_tests=false
+  ninja -C build
+}
 
-  ./configure --prefix=/usr \
-    --with-x11 \
-    --with-libjasper \
-    --with-included-loaders=png
-  make
+check() {
+  cd build
+  # pixbuf-randomly-modified fails randomly
+  meson test -t 3 || :
 }
 
 package() {
-  cd gdk-pixbuf-$pkgver
-
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" meson install -C build
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/abs/core/gdk-pixbuf2/gdk-pixbuf-query-loaders.hook b/abs/core/gdk-pixbuf2/gdk-pixbuf-query-loaders.hook
new file mode 100644
index 0000000..3f6a3e4
--- /dev/null
+++ b/abs/core/gdk-pixbuf2/gdk-pixbuf-query-loaders.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so
+
+[Action]
+Description = Probing GDK-Pixbuf loader modules...
+When = PostTransaction
+Exec = /usr/bin/gdk-pixbuf-query-loaders --update-cache
diff --git a/abs/core/gdk-pixbuf2/gdk-pixbuf2.install b/abs/core/gdk-pixbuf2/gdk-pixbuf2.install
index f04c096..83fa07c 100644
--- a/abs/core/gdk-pixbuf2/gdk-pixbuf2.install
+++ b/abs/core/gdk-pixbuf2/gdk-pixbuf2.install
@@ -1,11 +1,3 @@
-post_install() {
-   gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
 pre_remove() {
-    rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
+    rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 }