diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-01-14 15:27:54 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-17 11:32:17 +0000 |
| commit | cbc8ead877203e95f9e46c874b30075ad6037a4d (patch) | |
| tree | e6c1952b4f2924cec4d7944c407c0c9511bc382c /meta | |
| parent | 243ccaceee9bab9c8f1021a1502c07e1055614e6 (diff) | |
| download | openembedded-core-cbc8ead877203e95f9e46c874b30075ad6037a4d.tar.gz openembedded-core-cbc8ead877203e95f9e46c874b30075ad6037a4d.tar.bz2 openembedded-core-cbc8ead877203e95f9e46c874b30075ad6037a4d.zip | |
librsvg: upgrade to 2.40.13
Updated gtk-option.patch.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/gtk-option.patch | 13 | ||||
| -rw-r--r-- | meta/recipes-gnome/librsvg/librsvg_2.40.13.bb (renamed from meta/recipes-gnome/librsvg/librsvg_2.40.11.bb) | 4 |
2 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch index e6af481ef4..6c23071cd3 100644 --- a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch +++ b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch @@ -1,4 +1,4 @@ -From 1c38d570b33f2b036d4fa47e929bb2b3264e38bd Mon Sep 17 00:00:00 2001 +From 4e0ce3f22d45033a108cbacca3e5ec6728bd44f3 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 11 Aug 2015 16:25:38 +0300 Subject: [PATCH] configure: add option to enable/disable use of GTK+ @@ -10,19 +10,16 @@ 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 <ross.burton@intel.com> - -Forward-ported to 2.40.10 - Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- configure.ac | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index bf77f3a..ca77de8 100644 +index e61a952..c3aae84 100644 --- a/configure.ac +++ b/configure.ac -@@ -128,17 +128,22 @@ AC_CHECK_FUNCS(strtok_r) +@@ -130,17 +130,22 @@ AC_CHECK_FUNCS(strtok_r) # GTK # =========================================================================== @@ -50,13 +47,13 @@ index bf77f3a..ca77de8 100644 dnl =========================================================================== dnl GDK-Pixbuf SVG loader -@@ -289,6 +294,6 @@ librsvg-$VERSION +@@ -298,6 +303,6 @@ librsvg-$VERSION Build introspectable bindings: ${found_introspection} Build Vala bindings: ${enable_vala} Build GdkPixbuf loader: ${enable_pixbuf_loader} - GTK+ $GTK3_REQUIRED or later: ${have_gtk_3} + GTK+ $GTK3_REQUIRED or later: ${with_gtk_3} - Build miscellaenous tools: ${build_misc_tools} + Build miscellaneous tools: ${build_misc_tools} " -- 2.1.4 diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.11.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.13.bb index d57c69d613..ed712432ff 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.40.11.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.40.13.bb @@ -14,8 +14,8 @@ inherit autotools pkgconfig gnomebase gtk-doc pixbufcache upstream-version-is-ev SRC_URI += "file://gtk-option.patch" -SRC_URI[archive.md5sum] = "6b9cd1a048210a8e95bdc04c85fe997f" -SRC_URI[archive.sha256sum] = "611ac0f544debd0c9bf1ef5509c990d218e83dd1d8c83297075c4b29796a2e02" +SRC_URI[archive.md5sum] = "ad03780e12c56e52474d8edf86976c73" +SRC_URI[archive.sha256sum] = "4d6ea93ec05f5dabe7262d711d246a0a99b2311e215360dd3dcabd6afe3b9804" CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" |