summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-02-12 18:12:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-13 16:52:29 +0000
commit6e0a057f0cf55afdd385149d4aa73549d191d4db (patch)
treea78b77f9053c70d7358cf52746d81fa2114faaa0
parentc70d167451b2ef1e5bde7252329c9a7f21033a2f (diff)
downloadpoky-6e0a057f0cf55afdd385149d4aa73549d191d4db.tar.gz
librsvg: use the new pixbufcache class
Also, fix the GDK_PIXBUF_QUERYLOADERS path. [YOCTO #3582] (From OE-Core rev: 801ca93cbd3e8fd8ce08f72432b6d4c80ed51261) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.32.1.bb21
1 files changed, 4 insertions, 17 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 3621045b38..ff17cf75ed 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -11,9 +11,9 @@ DEPENDS = "gtk+ cairo libxml2"
11DEPENDS_class-native = "cairo-native pango-native gdk-pixbuf-native" 11DEPENDS_class-native = "cairo-native pango-native gdk-pixbuf-native"
12BBCLASSEXTEND = "native" 12BBCLASSEXTEND = "native"
13 13
14PR = "r11" 14PR = "r12"
15 15
16inherit autotools pkgconfig gnome gtk-doc 16inherit autotools pkgconfig gnome gtk-doc pixbufcache
17 17
18EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz" 18EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz"
19 19
@@ -31,7 +31,7 @@ SRC_URI[archive.md5sum] = "4b00d0fee130c936644892c152f42db7"
31SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334" 31SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334"
32 32
33do_configure_prepend () { 33do_configure_prepend () {
34 export GDK_PIXBUF_QUERYLOADERS="${libdir}/gtk-2.0/version/loaders" 34 export GDK_PIXBUF_QUERYLOADERS="${libdir}/gdk-pixbuf-2.0/2.10.0/loaders"
35} 35}
36 36
37PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg" 37PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
@@ -53,18 +53,5 @@ FILES_librsvg-gtk-dbg += "${libdir}/gdk-pixbuf-2.0/.debug \
53 ${libdir}/gtk-2.0/.debug \ 53 ${libdir}/gtk-2.0/.debug \
54 ${libdir}/gtk-2.0/*/*/.debug" 54 ${libdir}/gtk-2.0/*/*/.debug"
55 55
56pkg_postinst_librsvg-gtk() { 56PIXBUF_PACKAGES = "librsvg-gtk"
57if [ "x$D" != "x" ]; then
58 exit 1
59fi
60
61if [ -d ${libdir}/gtk-2.0/2.10.0/loaders ] ; then
62 export GDK_PIXBUF_MODULEDIR=${libdir}/gtk-2.0/2.10.0/loaders
63else
64 export GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders
65fi
66
67test -x ${bindir}/gdk-pixbuf-query-loaders && gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
68test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor
69}
70PARALLEL_MAKE = "" 57PARALLEL_MAKE = ""