From 40421c1024497cb8729fbfb494c5852ee0dc6992 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Thu, 8 Jul 2010 14:32:32 +0800 Subject: [PATCH] librsvg: upgrade to the latest version 2.26.3 The latest stable releases of the package moved from http://svn.gnome.org/svn/librsvg/ to http://ftp.gnome.org/pub/GNOME/sources/librsvg/, so I removed the overrided SRC_URI and use gnome.bbclass's, and I also changed the recipe file's name, removed the explicit PV and removed the unnecessary S. Reset PR to "r0". Add LIC_FILES_CHKSUM info. Remove SRCREV_pn-librsvg in poky-default-revisions.inc and add PREFERRED_VERSION_librsvg in poky-fixed-revisions.inc. Signed-off-by: Dexuan Cui --- meta/conf/distro/include/poky-default-revisions.inc | 1 - meta/conf/distro/include/poky-fixed-revisions.inc | 2 ++ .../librsvg/{librsvg_svn.bb => librsvg_2.26.3.bb} | 12 +++++------- 3 files changed, 7 insertions(+), 8 deletions(-) rename meta/packages/librsvg/{librsvg_svn.bb => librsvg_2.26.3.bb} (87%) diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 16c8cdb937..d719b39db9 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc @@ -54,7 +54,6 @@ SRCREV_pn-libgsmd ??= "4335" SRCREV_pn-libmatchbox ??= "1531" SRCREV_pn-libowl ??= "408" SRCREV_pn-libowl-av ??= "398" -SRCREV_pn-librsvg ??= "1193" SRCREV_pn-libx11 ??= "d23aad31338e7d869d878d5aa1b6b91d20287005" SRCREV_pn-libx11-diet ??= "d23aad31338e7d869d878d5aa1b6b91d20287005" SRCREV_pn-libx11-native ??= "d23aad31338e7d869d878d5aa1b6b91d20287005" diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index 42f54ce299..669946916d 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -16,6 +16,8 @@ PREFERRED_VERSION_cairo ?= "1.8.10" PREFERRED_VERSION_pango ?= "1.28.0" PREFERRED_VERSION_gtk+ ?= "2.14.2" +PREFERRED_VERSION_librsvg ?= "2.26.3" + PREFERRED_VERSION_dbus ?= "1.2.4" PREFERRED_VERSION_dbus-native ?= "1.2.4" PREFERRED_VERSION_dbus-glib ?= "0.82" diff --git a/meta/packages/librsvg/librsvg_svn.bb b/meta/packages/librsvg/librsvg_2.26.3.bb similarity index 87% rename from meta/packages/librsvg/librsvg_svn.bb rename to meta/packages/librsvg/librsvg_2.26.3.bb index e14e117ef6..41e23b1d7d 100644 --- a/meta/packages/librsvg/librsvg_svn.bb +++ b/meta/packages/librsvg/librsvg_2.26.3.bb @@ -2,20 +2,18 @@ DESCRIPTION = "Library for rendering SVG files" HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/librsvg/" BUGTRACKER = "https://bugzilla.gnome.org/" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://rsvg.h;beginline=3;endline=24;md5=20b4113c4909bbf0d67e006778302bc6" + SECTION = "x11/utils" DEPENDS = "gtk+ libcroco cairo libxml2 popt" -LICENSE = "LGPLv2+" -PR = "r3" +PR = "r0" EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs" inherit autotools pkgconfig gnome -SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk" -PV = "2.22.3+svnr${SRCREV}" - -S = "${WORKDIR}/trunk" - do_configure_prepend () { echo "CLEANFILES=" > gtk-doc.make }