From 883c1e97ec24f516d3eb7cb211daf7ac54050469 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 9 Aug 2012 10:30:30 +0800 Subject: gdk-pixbuf: fix the postinstall script failure when no icon is installed If gtk+ is added to core-image-minimal, postinstall script failed on boot: Running postinst /etc/rpm-postinsts/104... gtk-update-icon-cache: No theme index file. ERROR: postinst /etc/rpm-postinsts/104 failed. This patch fixed the postinstall script to check for the icon file first and not run the gtk-update-icon-cache if no icon is installed. [YOCTO #2905] (From OE-Core rev: 1d4fbe4761d3d97e3c4b6e894719ee41b21559b2) Signed-off-by: Jackie Huang Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb index 484fb12b30..159bdae1de 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb @@ -21,7 +21,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${ SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412" SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1" -PR = "r4" +PR = "r5" inherit autotools pkgconfig gettext @@ -62,7 +62,13 @@ fi GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache -test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor +if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then + for icondir in /usr/share/icons/*; do + if [ -d ${icondir} ]; then + gtk-update-icon-cache -q ${icondir} + fi + done +fi } PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*" -- cgit v1.2.3-54-g00ecf