diff options
Diffstat (limited to 'meta/recipes-gnome/librsvg/librsvg/gtk-option.patch')
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/gtk-option.patch | 13 |
1 files changed, 5 insertions, 8 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 @@ | |||
1 | From 1c38d570b33f2b036d4fa47e929bb2b3264e38bd Mon Sep 17 00:00:00 2001 | 1 | From 4e0ce3f22d45033a108cbacca3e5ec6728bd44f3 Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Tue, 11 Aug 2015 16:25:38 +0300 | 3 | Date: Tue, 11 Aug 2015 16:25:38 +0300 |
4 | Subject: [PATCH] configure: add option to enable/disable use of GTK+ | 4 | 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. | |||
10 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693] | 10 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693] |
11 | 11 | ||
12 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 12 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
13 | |||
14 | Forward-ported to 2.40.10 | ||
15 | |||
16 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 13 | Signed-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 | ||
21 | diff --git a/configure.ac b/configure.ac | 18 | diff --git a/configure.ac b/configure.ac |
22 | index bf77f3a..ca77de8 100644 | 19 | index 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 | -- |
62 | 2.1.4 | 59 | 2.1.4 |