summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/gtk-option.patch13
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.40.10.bb (renamed from meta/recipes-gnome/librsvg/librsvg_2.40.9.bb)4
2 files changed, 8 insertions, 9 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
index 3835015ce2..e6af481ef4 100644
--- a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
+++ b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
@@ -1,6 +1,6 @@
1From 85d4af4451283f388e1e101ee4710bb19854154d Mon Sep 17 00:00:00 2001 1From 1c38d570b33f2b036d4fa47e929bb2b3264e38bd Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 10 Apr 2015 16:49:43 +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+
5 5
6Distro packagers like predictability and automatically detected optional 6Distro packagers like predictability and automatically detected optional
@@ -11,8 +11,7 @@ Upstream-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 13
14 14Forward-ported to 2.40.10
15Forward-ported to 2.40.9
16 15
17Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 16Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
18--- 17---
@@ -20,7 +19,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
20 1 file changed, 11 insertions(+), 6 deletions(-) 19 1 file changed, 11 insertions(+), 6 deletions(-)
21 20
22diff --git a/configure.ac b/configure.ac 21diff --git a/configure.ac b/configure.ac
23index e86c052..16b0e34 100644 22index bf77f3a..ca77de8 100644
24--- a/configure.ac 23--- a/configure.ac
25+++ b/configure.ac 24+++ b/configure.ac
26@@ -128,17 +128,22 @@ AC_CHECK_FUNCS(strtok_r) 25@@ -128,17 +128,22 @@ AC_CHECK_FUNCS(strtok_r)
@@ -55,8 +54,8 @@ index e86c052..16b0e34 100644
55 Build introspectable bindings: ${found_introspection} 54 Build introspectable bindings: ${found_introspection}
56 Build Vala bindings: ${enable_vala} 55 Build Vala bindings: ${enable_vala}
57 Build GdkPixbuf loader: ${enable_pixbuf_loader} 56 Build GdkPixbuf loader: ${enable_pixbuf_loader}
58- GTK 3.0: ${have_gtk_3} 57- GTK+ $GTK3_REQUIRED or later: ${have_gtk_3}
59+ GTK 3.0: ${with_gtk3} 58+ GTK+ $GTK3_REQUIRED or later: ${with_gtk_3}
60 Build miscellaenous tools: ${build_misc_tools} 59 Build miscellaenous tools: ${build_misc_tools}
61 " 60 "
62-- 61--
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb
index 9a14f29ca2..0ac323e4ea 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.40.10.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] = "31df15e3beaa8fbbf538ca3c52b400d2" 19SRC_URI[archive.md5sum] = "fadebe2e799ab159169ee3198415ff85"
20SRC_URI[archive.sha256sum] = "13964c5d35357552b47d365c34215eee0a63bf0e6059b689f048648c6bf5f43a" 20SRC_URI[archive.sha256sum] = "965c807438ce90b204e930ff80c92eba1606a2f6fd5ccfd09335c99896dd3479"
21 21
22EXTRA_OECONF = "--disable-introspection --disable-vala" 22EXTRA_OECONF = "--disable-introspection --disable-vala"
23 23