summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-07-21 09:57:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-23 08:48:39 +0100
commit061d6ecfcdf42d890fec4ca709a88a909c35a757 (patch)
treeb06f5b154f29870a448d69c754d47b020018a9da
parent271b9b6873ce1e79587325b4dd35e4103d5a1258 (diff)
downloadpoky-061d6ecfcdf42d890fec4ca709a88a909c35a757.tar.gz
gtk+3: fix Wayland-only builds
When configured with just the Wayland backend (no X11), not enough Pango headers were included. (From OE-Core rev: 9d4a88d003fd1a4c8864d1470473ea7c90f5e6d7) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch28
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb1
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 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 802b006b3768ddc8c8cdf0af27428e7042c36509 Mon Sep 17 00:00:00 2001
5From: nick <oavc-fujie@yandex.com>
6Date: Mon, 29 Jun 2015 20:37:26 +0100
7Subject: settings: Include pangofc-fontmap.h header on Wayland
8
9In case the X11 backend is not enabled, we still need to include the
10pangofc-fontmap.h header file, as we use the Pango/FontConfig API in
11both the X11 and Wayland case.
12
13https://bugzilla.gnome.org/show_bug.cgi?id=751625
14
15diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
16index 327faf5..a40cb84 100644
17--- a/gtk/gtksettings.c
18+++ b/gtk/gtksettings.c
19@@ -41,6 +41,7 @@
20
21 #ifdef GDK_WINDOWING_WAYLAND
22 #include "wayland/gdkwayland.h"
23+#include <pango/pangofc-fontmap.h>
24 #endif
25
26 #ifdef GDK_WINDOWING_BROADWAY
27--
28cgit 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)}"
5SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ 5SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
6 file://hardcoded_libtool.patch \ 6 file://hardcoded_libtool.patch \
7 file://Dont-force-csd.patch \ 7 file://Dont-force-csd.patch \
8 file://wayland-pango.patch \
8 " 9 "
9 10
10SRC_URI[md5sum] = "c7497aaf6730524a127597b768a73bd7" 11SRC_URI[md5sum] = "c7497aaf6730524a127597b768a73bd7"