diff options
| author | Ross Burton <ross.burton@intel.com> | 2015-07-21 09:57:21 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-22 23:25:00 +0100 |
| commit | 9d4a88d003fd1a4c8864d1470473ea7c90f5e6d7 (patch) | |
| tree | cfe5f1d8bccccacedbdac136f847f4653c582923 /meta | |
| parent | f5b03208c0ae0f47dddec6e39712fb0f1d041ebc (diff) | |
| download | openembedded-core-9d4a88d003fd1a4c8864d1470473ea7c90f5e6d7.tar.gz openembedded-core-9d4a88d003fd1a4c8864d1470473ea7c90f5e6d7.tar.bz2 openembedded-core-9d4a88d003fd1a4c8864d1470473ea7c90f5e6d7.zip | |
gtk+3: fix Wayland-only builds
When configured with just the Wayland backend (no X11), not enough
Pango headers were included.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch b/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch new file mode 100644 index 0000000000..1d6f12b452 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch @@ -0,0 +1,28 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 802b006b3768ddc8c8cdf0af27428e7042c36509 Mon Sep 17 00:00:00 2001 +From: nick <oavc-fujie@yandex.com> +Date: Mon, 29 Jun 2015 20:37:26 +0100 +Subject: settings: Include pangofc-fontmap.h header on Wayland + +In case the X11 backend is not enabled, we still need to include the +pangofc-fontmap.h header file, as we use the Pango/FontConfig API in +both the X11 and Wayland case. + +https://bugzilla.gnome.org/show_bug.cgi?id=751625 + +diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c +index 327faf5..a40cb84 100644 +--- a/gtk/gtksettings.c ++++ b/gtk/gtksettings.c +@@ -41,6 +41,7 @@ + + #ifdef GDK_WINDOWING_WAYLAND + #include "wayland/gdkwayland.h" ++#include <pango/pangofc-fontmap.h> + #endif + + #ifdef GDK_WINDOWING_BROADWAY +-- +cgit v0.10.2 diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb b/meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb index 3a45afcc10..4bb6b0c959 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb @@ -5,6 +5,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ file://hardcoded_libtool.patch \ file://Dont-force-csd.patch \ + file://wayland-pango.patch \ " SRC_URI[md5sum] = "c7497aaf6730524a127597b768a73bd7" |