From 25b4cac50ba05a8faeb3b2013253103b98e5f533 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 10 Apr 2015 16:54:40 +0300 Subject: librsvg: Upgrade 0.40.6 -> 0.40.9 * modify gtk-option patch so it's for configure.ac and not configure.in Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- .../recipes-gnome/librsvg/librsvg/gtk-option.patch | 32 +++++++------- meta/recipes-gnome/librsvg/librsvg_2.40.6.bb | 49 ---------------------- meta/recipes-gnome/librsvg/librsvg_2.40.9.bb | 49 ++++++++++++++++++++++ 3 files changed, 66 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-gnome/librsvg/librsvg_2.40.6.bb create mode 100644 meta/recipes-gnome/librsvg/librsvg_2.40.9.bb diff --git a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch index d44bdd3209..3835015ce2 100644 --- a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch +++ b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch @@ -1,27 +1,29 @@ -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 +From 85d4af4451283f388e1e101ee4710bb19854154d Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Fri, 10 Apr 2015 16:49:43 +0300 Subject: [PATCH] configure: add option to enable/disable use of GTK+ Distro packagers like predictability and automatically detected optional dependencies are not predicable. Add a --with-gtk3 option (default to "auto") for forcibly controlling whether GTK+ will be used or not. +Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693] + Signed-off-by: Ross Burton -https://bugzilla.gnome.org/show_bug.cgi?id=712693 + +Forward-ported to 2.40.9 + +Signed-off-by: Jussi Kukkonen --- - configure.in | 17 +++++++++++------ + configure.ac | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) -diff --git a/configure.in b/configure.in -index f7a89dc..1498f72 100644 ---- a/configure.in -+++ b/configure.in -@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r) +diff --git a/configure.ac b/configure.ac +index e86c052..16b0e34 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -128,17 +128,22 @@ AC_CHECK_FUNCS(strtok_r) # GTK # =========================================================================== @@ -49,7 +51,7 @@ index f7a89dc..1498f72 100644 dnl =========================================================================== dnl GDK-Pixbuf SVG loader -@@ -305,6 +310,6 @@ librsvg-$VERSION +@@ -289,6 +294,6 @@ librsvg-$VERSION Build introspectable bindings: ${found_introspection} Build Vala bindings: ${enable_vala} Build GdkPixbuf loader: ${enable_pixbuf_loader} @@ -58,5 +60,5 @@ index f7a89dc..1498f72 100644 Build miscellaenous tools: ${build_misc_tools} " -- -1.7.10.4 +2.1.4 diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.6.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.6.bb deleted file mode 100644 index 483d30980f..0000000000 --- a/meta/recipes-gnome/librsvg/librsvg_2.40.6.bb +++ /dev/null @@ -1,49 +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" - -SRC_URI[archive.md5sum] = "259fd160b47ec11f3c27d7e18e507c99" -SRC_URI[archive.sha256sum] = "8af349f241677b04b7a1ea6b9b33a6343e781bcccc8a09d00208a47342584f06" - -EXTRA_OECONF = "--disable-introspection --disable-vala" - -# The older ld (2.22) on the host (Centos 6.5) doesn't have the -# -Bsymbolic-functions option, we can disable it for native. -EXTRA_OECONF_append_class-native = " --enable-Bsymbolic=auto" - -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" - -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.9.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb new file mode 100644 index 0000000000..9a14f29ca2 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb @@ -0,0 +1,49 @@ +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" + +SRC_URI[archive.md5sum] = "31df15e3beaa8fbbf538ca3c52b400d2" +SRC_URI[archive.sha256sum] = "13964c5d35357552b47d365c34215eee0a63bf0e6059b689f048648c6bf5f43a" + +EXTRA_OECONF = "--disable-introspection --disable-vala" + +# The older ld (2.22) on the host (Centos 6.5) doesn't have the +# -Bsymbolic-functions option, we can disable it for native. +EXTRA_OECONF_append_class-native = " --enable-Bsymbolic=auto" + +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" + +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 v1.2.3