4 files changed, 19 insertions, 5 deletions

diff --git a/meta/packages/gtk+/gtk+.inc b/meta/packages/gtk+/gtk+.inc
index b0a4a81450..bddc98072e 100644
--- a/meta/packages/gtk+/gtk+.inc
+++ b/meta/packages/gtk+/gtk+.inc
@@ -59,3 +59,13 @@ if [ "x$D" != "x" ]; then
 fi
 
 }
+
+postinst_pixbufloader() {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+
+test -x /usr/bin/gtk-update-icon-cache && gtk-update-icon-cache  -q /usr/share/icons/hicolor
+}
diff --git a/meta/packages/gtk+/gtk+_2.10.14.bb b/meta/packages/gtk+/gtk+_2.10.14.bb
index a9e39ab98b..5fdcce31c7 100644
--- a/meta/packages/gtk+/gtk+_2.10.14.bb
+++ b/meta/packages/gtk+/gtk+_2.10.14.bb
@@ -1,7 +1,7 @@
 require gtk+.inc
 
 DEPENDS += "cairo"
-PR = "r17"
+PR = "r18"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1" 
@@ -38,13 +38,14 @@ python populate_packages_prepend () {
         import os.path
 
         prologue = bb.data.getVar("postinst_prologue", d, 1)
+        postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1)
 
         gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
         loaders_root = os.path.join(gtk_libdir, 'loaders')
         immodules_root = os.path.join(gtk_libdir, 'immodules')
         printmodules_root = os.path.join(gtk_libdir, 'printbackends');
 
-        do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+        do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
         do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
         do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
 
diff --git a/meta/packages/gtk+/gtk+_2.12.1.bb b/meta/packages/gtk+/gtk+_2.12.1.bb
index 1ad92c8272..a9facbb61a 100644
--- a/meta/packages/gtk+/gtk+_2.12.1.bb
+++ b/meta/packages/gtk+/gtk+_2.12.1.bb
@@ -1,6 +1,7 @@
 require gtk+.inc
 
 DEPENDS += "cairo"
+PR = "r1"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1" 
@@ -32,13 +33,14 @@ python populate_packages_prepend () {
         import os.path
 
         prologue = bb.data.getVar("postinst_prologue", d, 1)
+        postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1)
 
         gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
         loaders_root = os.path.join(gtk_libdir, 'loaders')
         immodules_root = os.path.join(gtk_libdir, 'immodules')
         printmodules_root = os.path.join(gtk_libdir, 'printbackends');
 
-        do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+        do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
         do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
         do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
 
diff --git a/meta/packages/gtk+/gtk+_2.6.10.bb b/meta/packages/gtk+/gtk+_2.6.10.bb
index de22bbae75..6196a55cf9 100644
--- a/meta/packages/gtk+/gtk+_2.6.10.bb
+++ b/meta/packages/gtk+/gtk+_2.6.10.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
            file://no-demos.patch;patch=1 \
@@ -40,12 +40,13 @@ python populate_packages_prepend () {
         import os.path
 
         prologue = bb.data.getVar("postinst_prologue", d, 1)
+        postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1)
 
         gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
         loaders_root = os.path.join(gtk_libdir, 'loaders')
         immodules_root = os.path.join(gtk_libdir, 'immodules')
 
-        do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+        do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
         do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
 
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):