diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-05-16 17:57:13 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-24 14:06:59 +0100 |
| commit | a209b3858c6f0c45accf2b131b734d44230472ca (patch) | |
| tree | e0548666497edd15b9a4c65d0146f4ea87fe81b4 /meta/recipes-gnome/librsvg | |
| parent | dc1fbdd925d4dde294c4b63466e67084ce1ace89 (diff) | |
| download | openembedded-core-a209b3858c6f0c45accf2b131b734d44230472ca.tar.gz openembedded-core-a209b3858c6f0c45accf2b131b734d44230472ca.tar.bz2 openembedded-core-a209b3858c6f0c45accf2b131b734d44230472ca.zip | |
librsvg: small cleanups
Re-order fields to a more logical order.
Remove the unrecognised --disable-mozilla-plugin option.
Remove the unrequired setting of GDK_PIXBUF_QUERYLOADERS, it's found
automatically.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-gnome/librsvg')
| -rw-r--r-- | meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb index 9c5f722101..28d3756320 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb @@ -14,7 +14,14 @@ PR = "r12" inherit autotools pkgconfig gnomebase gtk-doc pixbufcache -EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz" +SRC_URI += "file://doc_Makefile.patch \ + file://librsvg-CVE-2011-3146.patch \ + " + +SRC_URI[archive.md5sum] = "4b00d0fee130c936644892c152f42db7" +SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334" + +EXTRA_OECONF = "--without-svgz" PACKAGECONFIG ??= "croco gdkpixbuf" @@ -25,17 +32,6 @@ PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader" # GTK+ 2 theme engine PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+" -SRC_URI += "file://doc_Makefile.patch \ - file://librsvg-CVE-2011-3146.patch \ - " - -SRC_URI[archive.md5sum] = "4b00d0fee130c936644892c152f42db7" -SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334" - -do_configure_prepend () { - export GDK_PIXBUF_QUERYLOADERS="${libdir}/gdk-pixbuf-2.0/2.10.0/loaders" -} - PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg" FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/*.a ${libdir}/gdk-pixbuf-2.0/*/*/*.a \ |