[oe-commits] Ross Burton : librsvg: small cleanups
git at git.openembedded.org
git at git.openembedded.org
Tue May 28 13:28:37 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: a209b3858c6f0c45accf2b131b734d44230472ca
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a209b3858c6f0c45accf2b131b734d44230472ca
Author: Ross Burton <ross.burton at intel.com>
Date: Thu May 16 17:57:13 2013 +0100
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 at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
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 9c5f722..28d3756 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 \
More information about the Openembedded-commits
mailing list