summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-16 17:57:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 14:14:39 +0100
commitb6212cf2f1e1b0b6af5a8f064e75a027642f3802 (patch)
tree2c170387428c74d99fb6f1634b0e5ab6a4f06951 /meta/recipes-gnome
parentcf20613976cfc5555bc47cd6c3e3d1bf9b84a4e6 (diff)
downloadpoky-b6212cf2f1e1b0b6af5a8f064e75a027642f3802.tar.gz
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. (From OE-Core rev: a209b3858c6f0c45accf2b131b734d44230472ca) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.32.1.bb20
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"
14 14
15inherit autotools pkgconfig gnomebase gtk-doc pixbufcache 15inherit autotools pkgconfig gnomebase gtk-doc pixbufcache
16 16
17EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz" 17SRC_URI += "file://doc_Makefile.patch \
18 file://librsvg-CVE-2011-3146.patch \
19 "
20
21SRC_URI[archive.md5sum] = "4b00d0fee130c936644892c152f42db7"
22SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334"
23
24EXTRA_OECONF = "--without-svgz"
18 25
19PACKAGECONFIG ??= "croco gdkpixbuf" 26PACKAGECONFIG ??= "croco gdkpixbuf"
20 27
@@ -25,17 +32,6 @@ PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader"
25# GTK+ 2 theme engine 32# GTK+ 2 theme engine
26PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+" 33PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+"
27 34
28SRC_URI += "file://doc_Makefile.patch \
29 file://librsvg-CVE-2011-3146.patch \
30 "
31
32SRC_URI[archive.md5sum] = "4b00d0fee130c936644892c152f42db7"
33SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334"
34
35do_configure_prepend () {
36 export GDK_PIXBUF_QUERYLOADERS="${libdir}/gdk-pixbuf-2.0/2.10.0/loaders"
37}
38
39PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg" 35PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
40FILES_${PN} = "${libdir}/*.so.*" 36FILES_${PN} = "${libdir}/*.so.*"
41FILES_${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/*.a ${libdir}/gdk-pixbuf-2.0/*/*/*.a \ 37FILES_${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/*.a ${libdir}/gdk-pixbuf-2.0/*/*/*.a \