summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-04-10 16:54:40 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-27 14:59:47 +0100
commitb4b46c0d1444208bca7635692f41261b122084f9 (patch)
treeac7bf82d2758e7fd56c25e7b2b245af6fca1bf48 /meta/recipes-gnome
parent0247a1e5c6f9555362ee47f83256b96369041fc1 (diff)
downloadpoky-b4b46c0d1444208bca7635692f41261b122084f9.tar.gz
librsvg: Upgrade 0.40.6 -> 0.40.9
* modify gtk-option patch so it's for configure.ac and not configure.in (From OE-Core rev: 25b4cac50ba05a8faeb3b2013253103b98e5f533) 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.patch32
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.40.9.bb (renamed from meta/recipes-gnome/librsvg/librsvg_2.40.6.bb)4
2 files changed, 19 insertions, 17 deletions
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 @@
1Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693] 1From 85d4af4451283f388e1e101ee4710bb19854154d Mon Sep 17 00:00:00 2001
2Signed-off-by: Ross Burton <ross.burton@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3 3Date: Fri, 10 Apr 2015 16:49:43 +0300
4From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 19 Nov 2013 16:00:29 +0000
7Subject: [PATCH] configure: add option to enable/disable use of GTK+ 4Subject: [PATCH] configure: add option to enable/disable use of GTK+
8 5
9Distro packagers like predictability and automatically detected optional 6Distro packagers like predictability and automatically detected optional
10dependencies are not predicable. Add a --with-gtk3 option (default to "auto") 7dependencies are not predicable. Add a --with-gtk3 option (default to "auto")
11for forcibly controlling whether GTK+ will be used or not. 8for forcibly controlling whether GTK+ will be used or not.
12 9
10Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693]
11
13Signed-off-by: Ross Burton <ross.burton@intel.com> 12Signed-off-by: Ross Burton <ross.burton@intel.com>
14 13
15https://bugzilla.gnome.org/show_bug.cgi?id=712693 14
15Forward-ported to 2.40.9
16
17Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16--- 18---
17 configure.in | 17 +++++++++++------ 19 configure.ac | 17 +++++++++++------
18 1 file changed, 11 insertions(+), 6 deletions(-) 20 1 file changed, 11 insertions(+), 6 deletions(-)
19 21
20diff --git a/configure.in b/configure.in 22diff --git a/configure.ac b/configure.ac
21index f7a89dc..1498f72 100644 23index e86c052..16b0e34 100644
22--- a/configure.in 24--- a/configure.ac
23+++ b/configure.in 25+++ b/configure.ac
24@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r) 26@@ -128,17 +128,22 @@ AC_CHECK_FUNCS(strtok_r)
25 # GTK 27 # GTK
26 # =========================================================================== 28 # ===========================================================================
27 29
@@ -49,7 +51,7 @@ index f7a89dc..1498f72 100644
49 51
50 dnl =========================================================================== 52 dnl ===========================================================================
51 dnl GDK-Pixbuf SVG loader 53 dnl GDK-Pixbuf SVG loader
52@@ -305,6 +310,6 @@ librsvg-$VERSION 54@@ -289,6 +294,6 @@ librsvg-$VERSION
53 Build introspectable bindings: ${found_introspection} 55 Build introspectable bindings: ${found_introspection}
54 Build Vala bindings: ${enable_vala} 56 Build Vala bindings: ${enable_vala}
55 Build GdkPixbuf loader: ${enable_pixbuf_loader} 57 Build GdkPixbuf loader: ${enable_pixbuf_loader}
@@ -58,5 +60,5 @@ index f7a89dc..1498f72 100644
58 Build miscellaenous tools: ${build_misc_tools} 60 Build miscellaenous tools: ${build_misc_tools}
59 " 61 "
60-- 62--
611.7.10.4 632.1.4
62 64
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.6.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb
index 483d30980f..9a14f29ca2 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.40.6.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb
@@ -16,8 +16,8 @@ GNOME_COMPRESS_TYPE = "xz"
16 16
17SRC_URI += "file://gtk-option.patch" 17SRC_URI += "file://gtk-option.patch"
18 18
19SRC_URI[archive.md5sum] = "259fd160b47ec11f3c27d7e18e507c99" 19SRC_URI[archive.md5sum] = "31df15e3beaa8fbbf538ca3c52b400d2"
20SRC_URI[archive.sha256sum] = "8af349f241677b04b7a1ea6b9b33a6343e781bcccc8a09d00208a47342584f06" 20SRC_URI[archive.sha256sum] = "13964c5d35357552b47d365c34215eee0a63bf0e6059b689f048648c6bf5f43a"
21 21
22EXTRA_OECONF = "--disable-introspection --disable-vala" 22EXTRA_OECONF = "--disable-introspection --disable-vala"
23 23