From f11bcc10aedaf96e3f7cf7b0fd295fb45f9a568d Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 5 Jan 2011 20:18:45 +0800 Subject: librsvg: upgrade from 2.32.0 to 2.32.1 Signed-off-by: Dexuan Cui --- .../librsvg/librsvg-2.32.0/doc_Makefile.patch | 17 -------- .../librsvg/librsvg-2.32.1/doc_Makefile.patch | 17 ++++++++ meta/recipes-gnome/librsvg/librsvg_2.32.0.bb | 47 --------------------- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 48 ++++++++++++++++++++++ 4 files changed, 65 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-gnome/librsvg/librsvg-2.32.0/doc_Makefile.patch create mode 100644 meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch delete mode 100644 meta/recipes-gnome/librsvg/librsvg_2.32.0.bb create mode 100644 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb (limited to 'meta/recipes-gnome/librsvg') diff --git a/meta/recipes-gnome/librsvg/librsvg-2.32.0/doc_Makefile.patch b/meta/recipes-gnome/librsvg/librsvg-2.32.0/doc_Makefile.patch deleted file mode 100644 index 217573bd27..0000000000 --- a/meta/recipes-gnome/librsvg/librsvg-2.32.0/doc_Makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ -Automake complains about using += before setting with = - -Signed-off-by: Saul Wold - -Index: librsvg-2.32.0/doc/Makefile.am -=================================================================== ---- librsvg-2.32.0.orig/doc/Makefile.am 2010-11-24 13:13:28.000000000 -0800 -+++ librsvg-2.32.0/doc/Makefile.am 2010-11-24 13:13:46.161312119 -0800 -@@ -133,7 +133,7 @@ - - # Other files to distribute - # e.g. EXTRA_DIST += version.xml.in --EXTRA_DIST += \ -+EXTRA_DIST = \ - version.xml.in - - # Files not to distribute diff --git a/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch b/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch new file mode 100644 index 0000000000..217573bd27 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch @@ -0,0 +1,17 @@ +Automake complains about using += before setting with = + +Signed-off-by: Saul Wold + +Index: librsvg-2.32.0/doc/Makefile.am +=================================================================== +--- librsvg-2.32.0.orig/doc/Makefile.am 2010-11-24 13:13:28.000000000 -0800 ++++ librsvg-2.32.0/doc/Makefile.am 2010-11-24 13:13:46.161312119 -0800 +@@ -133,7 +133,7 @@ + + # Other files to distribute + # e.g. EXTRA_DIST += version.xml.in +-EXTRA_DIST += \ ++EXTRA_DIST = \ + version.xml.in + + # Files not to distribute diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.0.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.0.bb deleted file mode 100644 index 35cf5a4fc9..0000000000 --- a/meta/recipes-gnome/librsvg/librsvg_2.32.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -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 = "r2" - -inherit autotools pkgconfig gnome - -EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs" - -SRC_URI += "file://doc_Makefile.patch" - -SRC_URI[archive.md5sum] = "b015a9bd80143ec876af489d882dc28b" -SRC_URI[archive.sha256sum] = "e0f6f936dab583de317cc0c36a48f80bdb9c93775225ee84140c7e5e3f841068" - -do_configure_prepend () { - export GDK_PIXBUF_QUERYLOADERS="${libdir}/gtk-2.0/version/loaders" - 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/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb new file mode 100644 index 0000000000..0281d8e324 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb @@ -0,0 +1,48 @@ +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" + +inherit autotools pkgconfig gnome + +EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs" + +SRC_URI += "file://doc_Makefile.patch" + +SRC_URI[archive.md5sum] = "4b00d0fee130c936644892c152f42db7" +SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334" + +do_configure_prepend () { + export GDK_PIXBUF_QUERYLOADERS="${libdir}/gtk-2.0/version/loaders" + 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-54-g00ecf