summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-01-14 15:27:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-18 11:47:04 +0000
commit86f3f25b9eee75c7c48bb0dc9f372fd15f869d83 (patch)
tree3f60bcd0b221a30d5fc5aa994c38d5e5440a825e /meta/recipes-gnome
parent72dd806610e64605525eb912ae7bbc94449b8d5c (diff)
downloadpoky-86f3f25b9eee75c7c48bb0dc9f372fd15f869d83.tar.gz
librsvg: upgrade to 2.40.13
Updated gtk-option.patch. (From OE-Core rev: cbc8ead877203e95f9e46c874b30075ad6037a4d) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/gtk-option.patch13
-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 @@
1From 1c38d570b33f2b036d4fa47e929bb2b3264e38bd Mon Sep 17 00:00:00 2001 1From 4e0ce3f22d45033a108cbacca3e5ec6728bd44f3 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 11 Aug 2015 16:25:38 +0300 3Date: Tue, 11 Aug 2015 16:25:38 +0300
4Subject: [PATCH] configure: add option to enable/disable use of GTK+ 4Subject: [PATCH] configure: add option to enable/disable use of GTK+
@@ -10,19 +10,16 @@ for forcibly controlling whether GTK+ will be used or not.
10Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693] 10Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693]
11 11
12Signed-off-by: Ross Burton <ross.burton@intel.com> 12Signed-off-by: Ross Burton <ross.burton@intel.com>
13
14Forward-ported to 2.40.10
15
16Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
17--- 14---
18 configure.ac | 17 +++++++++++------ 15 configure.ac | 17 +++++++++++------
19 1 file changed, 11 insertions(+), 6 deletions(-) 16 1 file changed, 11 insertions(+), 6 deletions(-)
20 17
21diff --git a/configure.ac b/configure.ac 18diff --git a/configure.ac b/configure.ac
22index bf77f3a..ca77de8 100644 19index e61a952..c3aae84 100644
23--- a/configure.ac 20--- a/configure.ac
24+++ b/configure.ac 21+++ b/configure.ac
25@@ -128,17 +128,22 @@ AC_CHECK_FUNCS(strtok_r) 22@@ -130,17 +130,22 @@ AC_CHECK_FUNCS(strtok_r)
26 # GTK 23 # GTK
27 # =========================================================================== 24 # ===========================================================================
28 25
@@ -50,13 +47,13 @@ index bf77f3a..ca77de8 100644
50 47
51 dnl =========================================================================== 48 dnl ===========================================================================
52 dnl GDK-Pixbuf SVG loader 49 dnl GDK-Pixbuf SVG loader
53@@ -289,6 +294,6 @@ librsvg-$VERSION 50@@ -298,6 +303,6 @@ librsvg-$VERSION
54 Build introspectable bindings: ${found_introspection} 51 Build introspectable bindings: ${found_introspection}
55 Build Vala bindings: ${enable_vala} 52 Build Vala bindings: ${enable_vala}
56 Build GdkPixbuf loader: ${enable_pixbuf_loader} 53 Build GdkPixbuf loader: ${enable_pixbuf_loader}
57- GTK+ $GTK3_REQUIRED or later: ${have_gtk_3} 54- GTK+ $GTK3_REQUIRED or later: ${have_gtk_3}
58+ GTK+ $GTK3_REQUIRED or later: ${with_gtk_3} 55+ GTK+ $GTK3_REQUIRED or later: ${with_gtk_3}
59 Build miscellaenous tools: ${build_misc_tools} 56 Build miscellaneous tools: ${build_misc_tools}
60 " 57 "
61-- 58--
622.1.4 592.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
14 14
15SRC_URI += "file://gtk-option.patch" 15SRC_URI += "file://gtk-option.patch"
16 16
17SRC_URI[archive.md5sum] = "6b9cd1a048210a8e95bdc04c85fe997f" 17SRC_URI[archive.md5sum] = "ad03780e12c56e52474d8edf86976c73"
18SRC_URI[archive.sha256sum] = "611ac0f544debd0c9bf1ef5509c990d218e83dd1d8c83297075c4b29796a2e02" 18SRC_URI[archive.sha256sum] = "4d6ea93ec05f5dabe7262d711d246a0a99b2311e215360dd3dcabd6afe3b9804"
19 19
20CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" 20CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders"
21 21