summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/wayland-pango.patch28
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb (renamed from meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb)5
2 files changed, 2 insertions, 31 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 @@
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.6.bb
index 4bb6b0c959..1d736a4326 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.16.4.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb
@@ -5,11 +5,10 @@ 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 \
9 " 8 "
10 9
11SRC_URI[md5sum] = "c7497aaf6730524a127597b768a73bd7" 10SRC_URI[md5sum] = "fc59e5c8b5a4585b60623dd708df400b"
12SRC_URI[sha256sum] = "1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e" 11SRC_URI[sha256sum] = "4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe"
13 12
14S = "${WORKDIR}/gtk+-${PV}" 13S = "${WORKDIR}/gtk+-${PV}"
15 14