summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-23 15:47:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-17 16:45:33 +0100
commit7e9fd6c6152b08720ff26a87f0903af528b412c8 (patch)
tree10315ef20ffa515816af5b2585c42295224453bd /meta/recipes-gnome/gtk+
parent03aa2ebd27b20e1337cd7d2c4da0c8c291eed8df (diff)
downloadpoky-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+')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch32
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb15
2 files changed, 43 insertions, 4 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 @@
1The Wayland backend was including X11 headers, which won't work in a no-X11
2distro.
3
4Upstream-Status: Backport
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7From 875b1d07ded377b20acbf1a10cae847f56de05b4 Mon Sep 17 00:00:00 2001
8From: Matthias Clasen <mclasen@redhat.com>
9Date: Thu, 23 May 2013 12:26:26 -0400
10Subject: [PATCH] Don't include X11 headers in wayland
11
12The include of X11/keysyms.h in gdkdevice-wayland.c was just
13a leftover.
14---
15 gdk/wayland/gdkdevice-wayland.c | 1 -
16 1 file changed, 1 deletion(-)
17
18diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
19index 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--
311.7.10.4
32
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb b/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
index 9bd5b9d5f1..1e0fed2def 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
@@ -5,9 +5,8 @@ HOMEPAGE = "http://www.gtk.org"
5BUGTRACKER = "https://bugzilla.gnome.org/" 5BUGTRACKER = "https://bugzilla.gnome.org/"
6SECTION = "libs" 6SECTION = "libs"
7 7
8DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor \ 8DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf libgcrypt \
9 docbook-utils-native libxrandr libgcrypt \ 9 docbook-utils-native gdk-pixbuf-native"
10 libxdamage libxrender libxcomposite libxi cairo gdk-pixbuf gdk-pixbuf-native"
11 10
12LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" 11LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
13 12
@@ -18,7 +17,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
18 17
19MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 18MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
20 19
21SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz" 20SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
21 file://no-x11-in-wayland.patch"
22
22SRC_URI[md5sum] = "8e878e18fc385f2b813419dc7b40a968" 23SRC_URI[md5sum] = "8e878e18fc385f2b813419dc7b40a968"
23SRC_URI[sha256sum] = "1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297" 24SRC_URI[sha256sum] = "1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297"
24 25
@@ -46,6 +47,12 @@ EXTRA_OECONF += " \
46 --disable-introspection \ 47 --disable-introspection \
47" 48"
48 49
50PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
51 ${@base_contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}"
52
53PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes"
54PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon"
55
49do_install_append() { 56do_install_append() {
50 mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 57 mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0
51} 58}