diff options
Diffstat (limited to 'meta/recipes-gnome/librsvg/librsvg/gtk-option.patch')
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/gtk-option.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch new file mode 100644 index 0000000000..d44bdd3209 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Tue, 19 Nov 2013 16:00:29 +0000 | ||
7 | Subject: [PATCH] configure: add option to enable/disable use of GTK+ | ||
8 | |||
9 | Distro packagers like predictability and automatically detected optional | ||
10 | dependencies are not predicable. Add a --with-gtk3 option (default to "auto") | ||
11 | for forcibly controlling whether GTK+ will be used or not. | ||
12 | |||
13 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
14 | |||
15 | https://bugzilla.gnome.org/show_bug.cgi?id=712693 | ||
16 | --- | ||
17 | configure.in | 17 +++++++++++------ | ||
18 | 1 file changed, 11 insertions(+), 6 deletions(-) | ||
19 | |||
20 | diff --git a/configure.in b/configure.in | ||
21 | index f7a89dc..1498f72 100644 | ||
22 | --- a/configure.in | ||
23 | +++ b/configure.in | ||
24 | @@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r) | ||
25 | # GTK | ||
26 | # =========================================================================== | ||
27 | |||
28 | -PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no]) | ||
29 | - | ||
30 | GTK3_BINARY_VERSION= | ||
31 | |||
32 | -if test "$have_gtk_3" = "yes"; then | ||
33 | - GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" | ||
34 | +AC_MSG_CHECKING([whether to use GTK+ 3]) | ||
35 | +AC_ARG_WITH([gtk3], | ||
36 | + [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])], | ||
37 | + [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])]) | ||
38 | +AC_MSG_RESULT([$with_gtk3]) | ||
39 | + | ||
40 | +if test "$with_gtk3" = "yes"; then | ||
41 | + PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED]) | ||
42 | + GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" | ||
43 | fi | ||
44 | |||
45 | AC_SUBST([GTK3_BINARY_VERSION]) | ||
46 | |||
47 | -AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"]) | ||
48 | +AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"]) | ||
49 | |||
50 | dnl =========================================================================== | ||
51 | dnl GDK-Pixbuf SVG loader | ||
52 | @@ -305,6 +310,6 @@ librsvg-$VERSION | ||
53 | Build introspectable bindings: ${found_introspection} | ||
54 | Build Vala bindings: ${enable_vala} | ||
55 | Build GdkPixbuf loader: ${enable_pixbuf_loader} | ||
56 | - GTK 3.0: ${have_gtk_3} | ||
57 | + GTK 3.0: ${with_gtk3} | ||
58 | Build miscellaenous tools: ${build_misc_tools} | ||
59 | " | ||
60 | -- | ||
61 | 1.7.10.4 | ||
62 | |||