From aa983d9117d2ddc0906aafdb7a9e584097475275 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 7 May 2014 17:05:31 +0100 Subject: librsvg: upgrade to 2.40.2 Also add Upstream-Status to gtk-option.patch Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../recipes-gnome/librsvg/librsvg/gtk-option.patch | 3 ++ meta/recipes-gnome/librsvg/librsvg_2.40.1.bb | 55 ---------------------- meta/recipes-gnome/librsvg/librsvg_2.40.2.bb | 55 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 55 deletions(-) delete mode 100644 meta/recipes-gnome/librsvg/librsvg_2.40.1.bb create mode 100644 meta/recipes-gnome/librsvg/librsvg_2.40.2.bb (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch index 9185041560..d44bdd3209 100644 --- a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch +++ b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch @@ -1,3 +1,6 @@ +Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693] +Signed-off-by: Ross Burton + From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 19 Nov 2013 16:00:29 +0000 diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.1.bb deleted file mode 100644 index 7b97df58be..0000000000 --- a/meta/recipes-gnome/librsvg/librsvg_2.40.1.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "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 = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango" -BBCLASSEXTEND = "native" - -inherit autotools pkgconfig gnomebase gtk-doc pixbufcache - -GNOME_COMPRESS_TYPE = "xz" - -SRC_URI += "file://gtk-option.patch \ - file://vapigen.m4" - -SRC_URI[archive.md5sum] = "a31eb5d66c3fe94d888a6b17a287ea42" -SRC_URI[archive.sha256sum] = "8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7" - -EXTRA_OECONF = "--disable-introspection --disable-vala" - -PACKAGECONFIG ??= "gdkpixbuf" -# The gdk-pixbuf loader -PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-pixbuf-native" -# GTK+ test application (rsvg-view) -PACKAGECONFIG[gtk] = "--with-gtk3,--without-gtk3,gtk+3" - -# The tarball doesn't ship with macros, so drop a vapigen in there so we don't -# need to build vala to configure. -do_configure_prepend() { - if test ! -e ${S}/m4/vapigen.m4; then - mkdir --parents ${S}/m4 - mv ${WORKDIR}/vapigen.m4 ${S}/m4/ - fi -} - -do_install_append() { - # Loadable modules don't need .a or .la on Linux - rm -f ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.a ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.la -} - -PACKAGES =+ "librsvg-gtk rsvg" -FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dbg += "${libdir}/gdk-pixbuf-2.0/*/loaders/.debug" -FILES_rsvg = "${bindir}/rsvg* \ - ${datadir}/pixmaps/svg-viewer.svg \ - ${datadir}/themes" -FILES_librsvg-gtk = "${libdir}/gdk-pixbuf-2.0/*/*/*.so" - -PIXBUF_PACKAGES = "librsvg-gtk" - -PIXBUFCACHE_SYSROOT_DEPS_append_class-native = " harfbuzz-native:do_populate_sysroot_setscene pango-native:do_populate_sysroot_setscene icu-native:do_populate_sysroot_setscene" diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.2.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.2.bb new file mode 100644 index 0000000000..34d8ca1bf8 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg_2.40.2.bb @@ -0,0 +1,55 @@ +SUMMARY = "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 = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango" +BBCLASSEXTEND = "native" + +inherit autotools pkgconfig gnomebase gtk-doc pixbufcache + +GNOME_COMPRESS_TYPE = "xz" + +SRC_URI += "file://gtk-option.patch \ + file://vapigen.m4" + +SRC_URI[archive.md5sum] = "acdecdb9f08f3bf662a68bf7dafb8b82" +SRC_URI[archive.sha256sum] = "48049b643294636df7de1a4b997414d699666f5dc44776945c218a257d2a291c" + +EXTRA_OECONF = "--disable-introspection --disable-vala" + +PACKAGECONFIG ??= "gdkpixbuf" +# The gdk-pixbuf loader +PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-pixbuf-native" +# GTK+ test application (rsvg-view) +PACKAGECONFIG[gtk] = "--with-gtk3,--without-gtk3,gtk+3" + +# The tarball doesn't ship with macros, so drop a vapigen in there so we don't +# need to build vala to configure. +do_configure_prepend() { + if test ! -e ${S}/m4/vapigen.m4; then + mkdir --parents ${S}/m4 + mv ${WORKDIR}/vapigen.m4 ${S}/m4/ + fi +} + +do_install_append() { + # Loadable modules don't need .a or .la on Linux + rm -f ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.a ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.la +} + +PACKAGES =+ "librsvg-gtk rsvg" +FILES_${PN} = "${libdir}/*.so.*" +FILES_${PN}-dbg += "${libdir}/gdk-pixbuf-2.0/*/loaders/.debug" +FILES_rsvg = "${bindir}/rsvg* \ + ${datadir}/pixmaps/svg-viewer.svg \ + ${datadir}/themes" +FILES_librsvg-gtk = "${libdir}/gdk-pixbuf-2.0/*/*/*.so" + +PIXBUF_PACKAGES = "librsvg-gtk" + +PIXBUFCACHE_SYSROOT_DEPS_append_class-native = " harfbuzz-native:do_populate_sysroot_setscene pango-native:do_populate_sysroot_setscene icu-native:do_populate_sysroot_setscene" -- cgit 1.2.3-korg