From 6e81ae564ce4878e1e055db83917a8d841813ed7 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Fri, 31 Aug 2007 14:54:15 +0000
Subject: Upgrade librsvg to 2.18.2

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2612 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/conf/distro/poky.conf              |  2 +-
 meta/packages/librsvg/librsvg_2.18.0.bb | 27 ---------------------------
 meta/packages/librsvg/librsvg_2.18.2.bb | 27 +++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 meta/packages/librsvg/librsvg_2.18.0.bb
 create mode 100644 meta/packages/librsvg/librsvg_2.18.2.bb

(limited to 'meta')

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 4daeaee23..b229613f6 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -174,7 +174,7 @@ PREFERRED_VERSION_firefox ?= "1.0"
 PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
 PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 PREFERRED_VERSION_keylaunch ?= "2.0.7"
-PREFERRED_VERSION_librsvg ?= "2.18.0"
+PREFERRED_VERSION_librsvg ?= "2.18.2"
 PREFERRED_VERSION_libgsm ?= "1.0.10"
 PREFERRED_VERSION_libschedule ?= "0.15"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
diff --git a/meta/packages/librsvg/librsvg_2.18.0.bb b/meta/packages/librsvg/librsvg_2.18.0.bb
deleted file mode 100644
index 1279606e1..000000000
--- a/meta/packages/librsvg/librsvg_2.18.0.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Library for rendering SVG files"
-SECTION = "x11/utils"
-DEPENDS = "gtk+ libcroco cairo libxml2 popt"
-LICENSE = "LGPL"
-
-EXTRA_OECONF = "--disable-mozilla-plugin"
-
-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 \
-	      ${bindir}/rsvg-convert \
-	      ${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"
-
-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
new file mode 100644
index 000000000..1279606e1
--- /dev/null
+++ b/meta/packages/librsvg/librsvg_2.18.2.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Library for rendering SVG files"
+SECTION = "x11/utils"
+DEPENDS = "gtk+ libcroco cairo libxml2 popt"
+LICENSE = "LGPL"
+
+EXTRA_OECONF = "--disable-mozilla-plugin"
+
+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 \
+	      ${bindir}/rsvg-convert \
+	      ${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"
+
+do_stage() {
+	autotools_stage_all
+}
-- 
cgit v1.2.3