From 40421c1024497cb8729fbfb494c5852ee0dc6992 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Thu, 8 Jul 2010 14:32:32 +0800 Subject: 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 --- .../conf/distro/include/poky-default-revisions.inc | 1 - meta/conf/distro/include/poky-fixed-revisions.inc | 2 + meta/packages/librsvg/librsvg_2.26.3.bb | 41 +++++++++++++++++++++ meta/packages/librsvg/librsvg_svn.bb | 43 ---------------------- 4 files changed, 43 insertions(+), 44 deletions(-) create mode 100644 meta/packages/librsvg/librsvg_2.26.3.bb delete mode 100644 meta/packages/librsvg/librsvg_svn.bb diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 16c8cdb93..d719b39db 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 42f54ce29..669946916 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_2.26.3.bb b/meta/packages/librsvg/librsvg_2.26.3.bb new file mode 100644 index 000000000..41e23b1d7 --- /dev/null +++ b/meta/packages/librsvg/librsvg_2.26.3.bb @@ -0,0 +1,41 @@ +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" +PR = "r0" + +EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs" + +inherit autotools pkgconfig gnome + +do_configure_prepend () { + echo "CLEANFILES=" > gtk-doc.make +} + +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" + +pkg_postinst_librsvg-gtk() { +if [ "x$D" != "x" ]; then + exit 1 +fi + +test -x ${bindir}/gdk-pixbuf-query-loaders && { gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders ; } +test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor +} diff --git a/meta/packages/librsvg/librsvg_svn.bb b/meta/packages/librsvg/librsvg_svn.bb deleted file mode 100644 index e14e117ef..000000000 --- a/meta/packages/librsvg/librsvg_svn.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "Library for rendering SVG files" -HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/librsvg/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -SECTION = "x11/utils" -DEPENDS = "gtk+ libcroco cairo libxml2 popt" -LICENSE = "LGPLv2+" -PR = "r3" - -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 -} - -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" - -pkg_postinst_librsvg-gtk() { -if [ "x$D" != "x" ]; then - exit 1 -fi - -test -x ${bindir}/gdk-pixbuf-query-loaders && { gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders ; } -test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor -} -- cgit v1.2.3