diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-04-21 20:18:30 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-24 22:41:51 +0100 |
commit | e726028424793093f22fd96f7eec791adf55f0ee (patch) | |
tree | 2456ff5783c0dc8ebc5974f76a5fd2c8eb560c2f | |
parent | 7899ea60ec0f39a465166eea196a5b554e5cd3f5 (diff) | |
download | openembedded-core-e726028424793093f22fd96f7eec791adf55f0ee.tar.gz openembedded-core-e726028424793093f22fd96f7eec791adf55f0ee.tar.bz2 openembedded-core-e726028424793093f22fd96f7eec791adf55f0ee.tar.xz openembedded-core-e726028424793093f22fd96f7eec791adf55f0ee.zip |
librsvg 2.32.1: fix postinst script
The symptom:
root@pandaboard-core:~# sh /var/lib/opkg/info/librsvg-2-gtk.postinst
g_module_open() failed for /home/root/--update-cache: /home/root/--update-cache.so: cannot open shared object file: No such file or directory
root@pandaboard-core:~#
the gdk-pixbuf-query-loaders app doesn't support arguments, only .so names, so remove --update-cache
Also being fixed:
* loader libdir
* redirect output to /etc/gtk-2.0/gdk-pixbuf.loaders
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb index ea9456dff..56c880042 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "x11/utils" DEPENDS = "gtk+ libcroco cairo libxml2 popt" -PR = "r0" +PR = "r2" inherit autotools pkgconfig gnome @@ -43,6 +43,12 @@ if [ "x$D" != "x" ]; then exit 1 fi -test -x ${bindir}/gdk-pixbuf-query-loaders && { GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache ; } +if [ -d ${libdir}/gtk-2.0/2.10.0/loaders ] ; then + export GDK_PIXBUF_MODULEDIR=${libdir}/gtk-2.0/2.10.0/loaders +else + export GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders +fi + +test -x ${bindir}/gdk-pixbuf-query-loaders && gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor } |