Patchwork [v2] librsvg 2.32.1: fix postinst script

login
register
mail settings
Submitter Koen Kooi
Date April 21, 2011, 6:18 p.m.
Message ID <1303409910-13329-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/2605/
State New, archived
Headers show

Comments

Koen Kooi - April 21, 2011, 6:18 p.m.
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>
---
 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
Saul Wold - April 25, 2011, 4:23 a.m.
On 04/21/2011 11:18 AM, Koen Kooi wrote:
> 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>
> ---
>   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 ea9456d..56c8800 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
>   }
Acutally it was this one that was pulled!!  Not the first version.

Sorry for the confusion

	Sau!

Patch

diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index ea9456d..56c8800 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
 }