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

Jan Steffens heftig at archlinux.org
Sat Mar 17 19:45:16 UTC 2018


    Date: Saturday, March 17, 2018 @ 19:45:16
  Author: heftig
Revision: 308978

2.36.11+70+g00e03a272-1

Added:
  lib32-gdk-pixbuf2/trunk/lib32-gdk-pixbuf2.install
    (from rev 308977, lib32-gdk-pixbuf2/trunk/gdk-pixbuf2.install)
Modified:
  lib32-gdk-pixbuf2/trunk/PKGBUILD
  lib32-gdk-pixbuf2/trunk/gdk-pixbuf-query-loaders-32.hook
Deleted:
  lib32-gdk-pixbuf2/trunk/gdk-pixbuf2.install

----------------------------------+
 PKGBUILD                         |   55 +++++++++++++++----------------------
 gdk-pixbuf-query-loaders-32.hook |    2 -
 gdk-pixbuf2.install              |    3 --
 lib32-gdk-pixbuf2.install        |    3 ++
 4 files changed, 27 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-17 19:41:52 UTC (rev 308977)
+++ PKGBUILD	2018-03-17 19:45:16 UTC (rev 308978)
@@ -2,24 +2,21 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
-_pkgbasename=gdk-pixbuf2
-pkgname=lib32-$_pkgbasename
-pkgver=2.36.6
+pkgname=lib32-gdk-pixbuf2
+pkgver=2.36.11+70+g00e03a272
 pkgrel=1
 pkgdesc="An image loading library (32-bit)"
-arch=('x86_64')
-url="http://www.gtk.org/"
-license=('LGPL2.1')
-depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg lib32-libx11
-         $_pkgbasename)
-makedepends=('gtk-doc' 'gobject-introspection' 'git')
-options=('!docs')
-install=gdk-pixbuf2.install
-_commit=d8ae54bc5e3e31d43acf410a6689be2d40567b03  # tags/2.36.6^0
+arch=(x86_64)
+url="https://wiki.gnome.org/Projects/GdkPixbuf"
+license=(LGPL2.1)
+depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg lib32-libx11 gdk-pixbuf2)
+makedepends=(gtk-doc gobject-introspection git docbook-xsl meson)
+install=lib32-gdk-pixbuf2.install
+_commit=00e03a2727b276ea32e2902dd9b41298ff1f9e96  # master
 source=("git+https://git.gnome.org/browse/gdk-pixbuf#commit=$_commit"
         gdk-pixbuf-query-loaders-32.hook)
 sha256sums=('SKIP'
-            'b9a1e5b0d18a4259b9b87ccb3f055402c89c85f7bddb5ed9d8b407de537f7d86')
+            '3fed95ad7075698313caba78c84b4f7eb9935cc5c8cc99412fc56d8d34ef700f')
 
 pkgver() {
   cd gdk-pixbuf
@@ -28,7 +25,6 @@
 
 prepare() {
   cd gdk-pixbuf
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
@@ -37,27 +33,22 @@
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
   export CFLAGS="-I/usr/include/libtiff32 $CFLAGS"
 
-  cd gdk-pixbuf
-  ./configure --prefix=/usr  --libdir=/usr/lib32 \
-    --without-libjasper \
-    --with-x11 \
-    --with-included-loaders=png
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  arch-meson gdk-pixbuf build --libdir=/usr/lib32
+  ninja -C build
 }
 
+check() {
+  cd build
+  # pixbuf-randomly-modified fails randomly
+  meson test -t 3 || :
+}
+
 package() {
-  cd gdk-pixbuf
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  cd "${pkgdir}"/usr/bin
-  mv gdk-pixbuf-query-loaders{,-32}
-  mv gdk-pixbuf-thumbnailer{,-32}
-  rm gdk-pixbuf-pixdata gdk-pixbuf-csource
-  install -Dm644 "${srcdir}/gdk-pixbuf-query-loaders-32.hook" -t "$pkgdir/usr/share/libalpm/hooks"
+  DESTDIR="$pkgdir" ninja -C build install
+  rm -rf "$pkgdir"/usr/{include,lib,share}
+  find "$pkgdir/usr/bin" -type f -not -name gdk-pixbuf-query-loaders -delete
+  mv "$pkgdir"/usr/bin/gdk-pixbuf-query-loaders{,-32}
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
 }
 
 # vim:set ts=2 sw=2 et:

Modified: gdk-pixbuf-query-loaders-32.hook
===================================================================
--- gdk-pixbuf-query-loaders-32.hook	2018-03-17 19:41:52 UTC (rev 308977)
+++ gdk-pixbuf-query-loaders-32.hook	2018-03-17 19:45:16 UTC (rev 308978)
@@ -6,6 +6,6 @@
 Target = usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/*.so
 
 [Action]
-Description = Probing GDK-Pixbuf loader lib32 modules...
+Description = Probing 32-bit GDK-Pixbuf loader modules...
 When = PostTransaction
 Exec = /usr/bin/gdk-pixbuf-query-loaders-32 --update-cache

Deleted: gdk-pixbuf2.install
===================================================================
--- gdk-pixbuf2.install	2018-03-17 19:41:52 UTC (rev 308977)
+++ gdk-pixbuf2.install	2018-03-17 19:45:16 UTC (rev 308978)
@@ -1,3 +0,0 @@
-pre_remove() {
-    rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}

Copied: lib32-gdk-pixbuf2/trunk/lib32-gdk-pixbuf2.install (from rev 308977, lib32-gdk-pixbuf2/trunk/gdk-pixbuf2.install)
===================================================================
--- lib32-gdk-pixbuf2.install	                        (rev 0)
+++ lib32-gdk-pixbuf2.install	2018-03-17 19:45:16 UTC (rev 308978)
@@ -0,0 +1,3 @@
+pre_remove() {
+    rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
+}



More information about the arch-commits mailing list