summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2012-08-09 10:30:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 14:26:39 +0100
commit883c1e97ec24f516d3eb7cb211daf7ac54050469 (patch)
tree775a29ec2e6bdfa14ba848ffb687bbf7486884f2 /meta
parent07faf2078d505f7734388c114953ca71e0242899 (diff)
downloadpoky-883c1e97ec24f516d3eb7cb211daf7ac54050469.tar.gz
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 <jackie.huang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb10
1 files 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-${
21SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412" 21SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
22SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1" 22SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
23 23
24PR = "r4" 24PR = "r5"
25 25
26inherit autotools pkgconfig gettext 26inherit autotools pkgconfig gettext
27 27
@@ -62,7 +62,13 @@ fi
62 62
63GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache 63GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache
64 64
65test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor 65if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
66 for icondir in /usr/share/icons/*; do
67 if [ -d ${icondir} ]; then
68 gtk-update-icon-cache -q ${icondir}
69 fi
70 done
71fi
66} 72}
67 73
68PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*" 74PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*"