diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-08-06 11:41:57 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-09 15:14:31 -0700 |
commit | 16b0c4d449a6aeabcb495a8707ff9cfd2a627529 (patch) | |
tree | e2d5d252f46d8225ab0a38071bf250b6b871f0ef /meta/recipes-gnome/gtk+/gtk+3 | |
parent | a9f4cecaaab584f1949eb0931609eb41e21e1a08 (diff) | |
download | openembedded-core-16b0c4d449a6aeabcb495a8707ff9cfd2a627529.tar.gz |
gtk+3: Upgrade 3.16.4 -> 3.16.6
Remove a backported patch.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch b/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch deleted file mode 100644 index 1d6f12b452..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 |