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>
This commit is contained in:
Ross Burton
2015-07-21 09:57:21 +01:00
committed by Richard Purdie
parent 271b9b6873
commit 061d6ecfcd
2 changed files with 29 additions and 0 deletions

View File

@@ -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

View File

@@ -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"