From 530eda4f56777002ee9cdfe2fa5f573f6a7fa224 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 15 Oct 2007 10:53:00 +0000
Subject: librsvg: Explicitly disable libgsf, croco and gnome-vfs since they're
 not in DEPENDS (and remove old version)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2877 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/librsvg/librsvg_2.11.1.bb | 23 -----------------------
 meta/packages/librsvg/librsvg_2.18.2.bb |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 meta/packages/librsvg/librsvg_2.11.1.bb

(limited to 'meta')

diff --git a/meta/packages/librsvg/librsvg_2.11.1.bb b/meta/packages/librsvg/librsvg_2.11.1.bb
deleted file mode 100644
index 2e8fe6b104..0000000000
--- a/meta/packages/librsvg/librsvg_2.11.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Library for rendering SVG files"
-SECTION = "x11/utils"
-DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt"
-LICENSE = "LGPL"
-PR = "r3"
-
-inherit autotools pkgconfig gnome
-
-PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_rsvg = "${bindir}/rsvg ${bindir}/rsvg-view ${datadir}/pixmaps/svg-viewer.svg"
-FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
-FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.*a \
-			  ${libdir}/gtk-2.0/*/loaders/*.*a \
-			  ${libdir}/gtk-2.0/*/engines/*.*a"
-FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
-                          ${libdir}/gtk-2.0/*/*/.debug"
-
-EXTRA_OECONF = "--disable-mozilla-plugin --disable-gnome-vfs"
-
-do_stage() {
-       autotools_stage_all
-}
diff --git a/meta/packages/librsvg/librsvg_2.18.2.bb b/meta/packages/librsvg/librsvg_2.18.2.bb
index 1279606e14..1f220e23f1 100644
--- a/meta/packages/librsvg/librsvg_2.18.2.bb
+++ b/meta/packages/librsvg/librsvg_2.18.2.bb
@@ -3,7 +3,7 @@ SECTION = "x11/utils"
 DEPENDS = "gtk+ libcroco cairo libxml2 popt"
 LICENSE = "LGPL"
 
-EXTRA_OECONF = "--disable-mozilla-plugin"
+EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs"
 
 inherit autotools pkgconfig gnome
 
-- 
cgit v1.2.3