gdk-pixbuf-32: update cache to the new method

6 files changed, 10 insertions, 152 deletions

diff --git a/gdk-pixbuf-32/.footprint b/gdk-pixbuf-32/.footprint
index ae3404b2..7a0a0583 100644
--- a/gdk-pixbuf-32/.footprint
+++ b/gdk-pixbuf-32/.footprint
@@ -1,13 +1,9 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/gdk-pixbuf-csource-32
--rwxr-xr-x	root/root	usr/bin/gdk-pixbuf-pixdata-32
 -rwxr-xr-x	root/root	usr/bin/gdk-pixbuf-query-loaders-32
--rwxr-xr-x	root/root	usr/bin/gdk-pixbuf-register-32
 drwxr-xr-x	root/root	usr/lib32/
 drwxr-xr-x	root/root	usr/lib32/gdk-pixbuf-2.0/
 drwxr-xr-x	root/root	usr/lib32/gdk-pixbuf-2.0/2.10.0/
--rw-r--r--	root/root	usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache
 drwxr-xr-x	root/root	usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/
 -rwxr-xr-x	root/root	usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.la
 -rwxr-xr-x	root/root	usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so
@@ -52,3 +48,4 @@ lrwxrwxrwx	root/root	usr/lib32/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/gdk-pixbuf-2.0.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/gdk-pixbuf-xlib-2.0.pc
+drwxr-xr-x	root/root	usr/share/
diff --git a/gdk-pixbuf-32/.md5sum b/gdk-pixbuf-32/.md5sum
index 5246e17e..13b2780d 100644
--- a/gdk-pixbuf-32/.md5sum
+++ b/gdk-pixbuf-32/.md5sum
@@ -1,3 +1 @@
 04c04e5042acd85cff6c439aba1995f1  gdk-pixbuf-2.28.2.tar.xz
-d2ea173e043e15310eb902307adab94f  gdk-pixbuf-register.sh
-2bd98231544873dc87472dadb7d6e455  gdk-pixbuf.loaders-32
diff --git a/gdk-pixbuf-32/Pkgfile b/gdk-pixbuf-32/Pkgfile
index 1724bd9d..b20d3b1f 100644
--- a/gdk-pixbuf-32/Pkgfile
+++ b/gdk-pixbuf-32/Pkgfile
@@ -5,9 +5,8 @@
 
 name=gdk-pixbuf-32
 version=2.28.2
-release=1
-source=(http://download.gnome.org/sources/gdk-pixbuf/${version%.*}/gdk-pixbuf-$version.tar.xz \
-        gdk-pixbuf.loaders-32 gdk-pixbuf-register.sh)
+release=2
+source=(http://download.gnome.org/sources/gdk-pixbuf/${version%.*}/gdk-pixbuf-$version.tar.xz)
 
 build() {
 	cd gdk-pixbuf-$version
@@ -16,7 +15,6 @@ build() {
 		--prefix=/usr \
 		--mandir=/usr/man \
 		--libdir=/usr/lib32 \
-		--program-suffix=-32 \
 		--without-libjasper \
 		--disable-nls \
 		--with-x11
@@ -24,13 +22,7 @@ build() {
 	make
 	make DESTDIR=$PKG install
 
-	install -m 0644 $SRC/gdk-pixbuf.loaders-32 \
-		$PKG/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache
-
-	install -m 0755 $SRC/gdk-pixbuf-register.sh \
-		$PKG/usr/bin/gdk-pixbuf-register-32
-
-	rm -r $PKG/usr/share/gtk-doc
-	rmdir $PKG/usr/share
-	rm -r $PKG/usr/{include,man}
+	mv $PKG/usr/bin/gdk-pixbuf-query-loaders $PKG/usr/bin/gdk-pixbuf-query-loaders-32
+	rm $PKG/usr/bin/{gdk-pixbuf-pixdata,gdk-pixbuf-csource}
+	rm -r $PKG/usr/{include,man} $PKG/usr/share/gtk-doc
 }
diff --git a/gdk-pixbuf-32/gdk-pixbuf-register.sh b/gdk-pixbuf-32/gdk-pixbuf-register.sh
deleted file mode 100644
index 2e1d36cb..00000000
--- a/gdk-pixbuf-32/gdk-pixbuf-register.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# /usr/bin/gtk-register: register gdk-pixbuf loaders
-#
-
-/usr/bin/gdk-pixbuf-query-loaders-32 > /usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache
-
-# End of file
diff --git a/gdk-pixbuf-32/gdk-pixbuf.loaders-32 b/gdk-pixbuf-32/gdk-pixbuf.loaders-32
deleted file mode 100644
index 4272a5a6..00000000
--- a/gdk-pixbuf-32/gdk-pixbuf.loaders-32
+++ /dev/null
@@ -1,125 +0,0 @@
-# GdkPixbuf Image Loader Modules file
-# Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders from gdk-pixbuf-2.28.2
-#
-# LoaderDir = /usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders
-#
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so"
-"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so"
-"pnm" 4 "gdk-pixbuf" "The PNM/PBM/PGM/PPM image format family" "LGPL"
-"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
-"pnm" "pbm" "pgm" "ppm" ""
-"P1" "" 100
-"P2" "" 100
-"P3" "" 100
-"P4" "" 100
-"P5" "" 100
-"P6" "" 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so"
-"gif" 4 "gdk-pixbuf" "The GIF image format" "LGPL"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so"
-"ani" 4 "gdk-pixbuf" "The ANI image format" "LGPL"
-"application/x-navi-animation" ""
-"ani" ""
-"RIFF    ACON" "    xxxx    " 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so"
-"tga" 4 "gdk-pixbuf" "The Targa image format" "LGPL"
-"image/x-tga" ""
-"tga" "targa" ""
-" \001\001" "x  " 100
-" \001\t" "x  " 100
-"  \002" "xz " 99
-"  \003" "xz " 100
-"  \n" "xz " 100
-"  \v" "xz " 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
-"jpeg" 5 "gdk-pixbuf" "The JPEG image format" "LGPL"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.so"
-"ras" 4 "gdk-pixbuf" "The Sun raster image format" "LGPL"
-"image/x-cmu-raster" "image/x-sun-raster" ""
-"ras" ""
-"Y\246j\225" "" 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so"
-"icns" 4 "gdk-pixbuf" "The ICNS image format" "GPL"
-"image/x-icns" ""
-"icns" ""
-"icns" "" 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so"
-"ico" 5 "gdk-pixbuf" "The ICO image format" "LGPL"
-"image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
-"ico" "cur" ""
-"  \001   " "zz znz" 100
-"  \002   " "zz znz" 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.so"
-"pcx" 4 "gdk-pixbuf" "The PCX image format" "LGPL"
-"image/x-pcx" ""
-"pcx" ""
-"\n \001" "" 100
-"\n\002\001" "" 100
-"\n\003\001" "" 100
-"\n\004\001" "" 100
-"\n\005\001" "" 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
-"tiff" 5 "gdk-pixbuf" "The TIFF image format" "LGPL"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" "  z " 100
-"II* " "   z" 100
-"II* \020   CR\002 " "   z zzz   z" 0
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
-"bmp" 5 "gdk-pixbuf" "The BMP image format" "LGPL"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so"
-"qtif" 4 "gdk-pixbuf" "The QTIF image format" "LGPL"
-"image/x-quicktime" "image/qtif" ""
-"qtif" "qif" ""
-"abcdidsc" "xxxx    " 100
-"abcdidat" "xxxx    " 100
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.so"
-"wbmp" 4 "gdk-pixbuf" "The WBMP image format" "LGPL"
-"image/vnd.wap.wbmp" ""
-"wbmp" ""
-"  " "zz" 1
-" `" "z " 1
-" @" "z " 1
-"  " "z " 1
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so"
-"xbm" 4 "gdk-pixbuf" "The XBM image format" "LGPL"
-"image/x-xbitmap" ""
-"xbm" ""
-"#define " "" 100
-"/*" "" 50
-
-"/usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
-"xpm" 4 "gdk-pixbuf" "The XPM image format" "LGPL"
-"image/x-xpixmap" ""
-"xpm" ""
-"/* XPM */" "" 100
-
-
diff --git a/gdk-pixbuf-32/post-install b/gdk-pixbuf-32/post-install
new file mode 100755
index 00000000..8a92fb6d
--- /dev/null
+++ b/gdk-pixbuf-32/post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
+