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-10 12:40:24 -0700 |
commit | 3205b863b68d052c84e4359b6b78e7274199a555 (patch) | |
tree | ad82040f48fd6a3dab99a9fe7f147d25ef73c59c /meta/recipes-gnome/gtk+/gtk+3 | |
parent | f41818ccd5f31e9246ed511145b5dbf6f0e664ac (diff) | |
download | poky-3205b863b68d052c84e4359b6b78e7274199a555.tar.gz |
gtk+3: Upgrade 3.16.4 -> 3.16.6
Remove a backported patch.
(From OE-Core rev: 16b0c4d449a6aeabcb495a8707ff9cfd2a627529)
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 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 802b006b3768ddc8c8cdf0af27428e7042c36509 Mon Sep 17 00:00:00 2001 | ||
5 | From: nick <oavc-fujie@yandex.com> | ||
6 | Date: Mon, 29 Jun 2015 20:37:26 +0100 | ||
7 | Subject: settings: Include pangofc-fontmap.h header on Wayland | ||
8 | |||
9 | In case the X11 backend is not enabled, we still need to include the | ||
10 | pangofc-fontmap.h header file, as we use the Pango/FontConfig API in | ||
11 | both the X11 and Wayland case. | ||
12 | |||
13 | https://bugzilla.gnome.org/show_bug.cgi?id=751625 | ||
14 | |||
15 | diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c | ||
16 | index 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 | -- | ||
28 | cgit v0.10.2 | ||