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:44:34 +0100 |
| commit | cdb7b25f0df633b5498988b3037a58edd361a869 (patch) | |
| tree | b4df3352c7df66422ea193b787e711adc3607ac9 /meta/recipes-gnome/gtk+/gtk+3 | |
| parent | 0f761f528b07b0063da4a5a2d015e4acc8a4aa89 (diff) | |
| download | openembedded-core-contrib-cdb7b25f0df633b5498988b3037a58edd361a869.tar.gz | |
gtk+3: respect x11 and wayland DISTRO_FEATURES
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 @@ +The Wayland backend was including X11 headers, which won't work in a no-X11 +distro. + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 875b1d07ded377b20acbf1a10cae847f56de05b4 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Thu, 23 May 2013 12:26:26 -0400 +Subject: [PATCH] Don't include X11 headers in wayland + +The include of X11/keysyms.h in gdkdevice-wayland.c was just +a leftover. +--- + gdk/wayland/gdkdevice-wayland.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c +index c258be3..cd4a695 100644 +--- a/gdk/wayland/gdkdevice-wayland.c ++++ b/gdk/wayland/gdkdevice-wayland.c +@@ -32,7 +32,6 @@ + #include "gdkdevicemanagerprivate.h" + + #include <xkbcommon/xkbcommon.h> +-#include <X11/keysym.h> + + #include <sys/time.h> + #include <sys/mman.h> +-- +1.7.10.4 + |