diff options
author | Ross Burton <ross.burton@intel.com> | 2013-05-23 15:47:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-17 16:45:33 +0100 |
commit | 7e9fd6c6152b08720ff26a87f0903af528b412c8 (patch) | |
tree | 10315ef20ffa515816af5b2585c42295224453bd /meta/recipes-gnome/gtk+/gtk+3 | |
parent | 03aa2ebd27b20e1337cd7d2c4da0c8c291eed8df (diff) | |
download | poky-7e9fd6c6152b08720ff26a87f0903af528b412c8.tar.gz |
gtk+3: respect x11 and wayland DISTRO_FEATURES
(From OE-Core rev: cdb7b25f0df633b5498988b3037a58edd361a869)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch b/meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch new file mode 100644 index 0000000000..df0921acbd --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | The Wayland backend was including X11 headers, which won't work in a no-X11 | ||
2 | distro. | ||
3 | |||
4 | Upstream-Status: Backport | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | From 875b1d07ded377b20acbf1a10cae847f56de05b4 Mon Sep 17 00:00:00 2001 | ||
8 | From: Matthias Clasen <mclasen@redhat.com> | ||
9 | Date: Thu, 23 May 2013 12:26:26 -0400 | ||
10 | Subject: [PATCH] Don't include X11 headers in wayland | ||
11 | |||
12 | The include of X11/keysyms.h in gdkdevice-wayland.c was just | ||
13 | a leftover. | ||
14 | --- | ||
15 | gdk/wayland/gdkdevice-wayland.c | 1 - | ||
16 | 1 file changed, 1 deletion(-) | ||
17 | |||
18 | diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c | ||
19 | index c258be3..cd4a695 100644 | ||
20 | --- a/gdk/wayland/gdkdevice-wayland.c | ||
21 | +++ b/gdk/wayland/gdkdevice-wayland.c | ||
22 | @@ -32,7 +32,6 @@ | ||
23 | #include "gdkdevicemanagerprivate.h" | ||
24 | |||
25 | #include <xkbcommon/xkbcommon.h> | ||
26 | -#include <X11/keysym.h> | ||
27 | |||
28 | #include <sys/time.h> | ||
29 | #include <sys/mman.h> | ||
30 | -- | ||
31 | 1.7.10.4 | ||
32 | |||