[arch-commits] Commit in lib32-gdk-pixbuf2/trunk (3 files)

[Levente Polyak]

    Date: Thursday, November 3, 2016 @ 16:07:59
  Author: anthraxx
Revision: 194587

updpkg: lib32-gdk-pixbuf 2.36.0+2+ga7c869a-1

Added:
  lib32-gdk-pixbuf2/trunk/gdk-pixbuf-query-loaders-32.hook
Modified:
  lib32-gdk-pixbuf2/trunk/PKGBUILD
  lib32-gdk-pixbuf2/trunk/gdk-pixbuf2.install

----------------------------------+
 PKGBUILD                         |   35 ++++++++++++++++++++++++-----------
 gdk-pixbuf-query-loaders-32.hook |   11 +++++++++++
 gdk-pixbuf2.install              |    8 --------
 3 files changed, 35 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-03 15:21:03 UTC (rev 194586)
+++ PKGBUILD	2016-11-03 16:07:59 UTC (rev 194587)
@@ -1,9 +1,10 @@
 # $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
 
 _pkgbasename=gdk-pixbuf2
 pkgname=lib32-$_pkgbasename
-pkgver=2.34.0
+pkgver=2.36.0+2+ga7c869a
 pkgrel=1
 pkgdesc="An image loading library (32-bit)"
 arch=('x86_64')
@@ -11,12 +12,25 @@
 license=('LGPL2.1')
 depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg lib32-libx11
          $_pkgbasename)
-makedepends=(gcc-multilib)
+makedepends=('gtk-doc' 'gobject-introspection' 'git')
 options=('!docs')
 install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-${pkgver}.tar.xz)
-sha256sums=('d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879')
+_commit=a7c869a8882336d9a720c2ca607173acbdfffb47
+source=("git://git.gnome.org/gdk-pixbuf#commit=$_commit"
+        gdk-pixbuf-query-loaders-32.hook)
+sha256sums=('SKIP'
+            'b9a1e5b0d18a4259b9b87ccb3f055402c89c85f7bddb5ed9d8b407de537f7d86')
 
+pkgver() {
+  cd gdk-pixbuf
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd gdk-pixbuf
+  NOCONFIGURE=1 ./autogen.sh
+}
+
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
@@ -23,8 +37,7 @@
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
   export CFLAGS="-I/usr/include/libtiff32 $CFLAGS"
 
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
-
+  cd gdk-pixbuf
   ./configure --prefix=/usr  --libdir=/usr/lib32 \
     --without-libjasper \
     --with-x11 \
@@ -34,16 +47,16 @@
 }
 
 package() {
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
+  cd gdk-pixbuf
+  make DESTDIR="$pkgdir" install
 
-  make DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/etc
   rm -rf "${pkgdir}"/usr/{include,share}
 
   cd "${pkgdir}"/usr/bin
   mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-32
-  rm gdk-pixbuf-pixdata
-  rm gdk-pixbuf-csource
+  rm gdk-pixbuf-pixdata gdk-pixbuf-csource
+  install -Dm644 "${srcdir}/gdk-pixbuf-query-loaders-32.hook" -t "$pkgdir/usr/share/libalpm/hooks"
 }
 
 # vim:set ts=2 sw=2 et:

Added: gdk-pixbuf-query-loaders-32.hook
===================================================================
--- gdk-pixbuf-query-loaders-32.hook	                        (rev 0)
+++ gdk-pixbuf-query-loaders-32.hook	2016-11-03 16:07:59 UTC (rev 194587)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/*.so
+
+[Action]
+Description = Probing GDK-Pixbuf loader lib32 modules...
+When = PostTransaction
+Exec = /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache

Modified: gdk-pixbuf2.install
===================================================================
--- gdk-pixbuf2.install	2016-11-03 15:21:03 UTC (rev 194586)
+++ gdk-pixbuf2.install	2016-11-03 16:07:59 UTC (rev 194587)
@@ -1,11 +1,3 @@
-post_install() {
-    usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
 pre_remove() {
     rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
 }