summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-31 15:22:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-17 16:45:34 +0100
commit64ae5444e5db776f28e06c458e7d6db7c3529e94 (patch)
tree4d506900b34ab94731ed54743bb24c06331e70d8 /meta/recipes-gnome/gtk+
parent1f0a4d7bacb30446d8ba6d24b5e47d2dc3366051 (diff)
downloadpoky-64ae5444e5db776f28e06c458e7d6db7c3529e94.tar.gz
gtk+3: fix repainting under Weston 1.1
Weston 1.1 is stricter with the protocol, so fix the behaviour in GTK+. (From OE-Core rev: 3eb9bbea6f08171d0598c48ca65256c2afc92676) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch42
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb3
2 files changed, 44 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch b/meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch
new file mode 100644
index 0000000000..fa0d0e6529
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch
@@ -0,0 +1,42 @@
1Wayland 1.1 is enforcing the protocol whereas 1.0 was lenient. Backport a patch
2from git to fix repainting.
3
4Upstream-Status: Backport
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7
8From 0d2c4617203c8fe907c722c9cb53c0345e0405e7 Mon Sep 17 00:00:00 2001
9From: Scott Moreau <oreaus@gmail.com>
10Date: Sun, 10 Mar 2013 10:51:01 -0600
11Subject: [PATCH] wayland: Always attach buffer before committing
12
13With recent changes in attach semantics, we always need to attach before
14committing. Without this changes to the window contents to not get reflected
15in the content of the surface.
16
17Signed-off-by: Rob Bradford <rob@linux.intel.com>
18---
19 gdk/wayland/gdkwindow-wayland.c | 7 -------
20 1 file changed, 7 deletions(-)
21
22diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
23index 112a1f4..fa01e90 100644
24--- a/gdk/wayland/gdkwindow-wayland.c
25+++ b/gdk/wayland/gdkwindow-wayland.c
26@@ -327,13 +327,6 @@ gdk_wayland_window_attach_image (GdkWindow *window)
27 if (GDK_WINDOW_DESTROYED (window))
28 return;
29
30- /* The "drawn to" Cairo surface is the same as the Cairo surface from which
31- * we are driving the buffer for the Wayland surface. Therefore we don't
32- * need to do anything here
33- */
34- if (impl->server_surface == impl->cairo_surface)
35- return;
36-
37 /* The wayland surface is attached to a buffer that is from the old "drawn
38 * to" surface. Unref the surface and restore the state.
39 */
40--
411.7.10.4
42
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb b/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
index b9d4091091..d92d8f34aa 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
@@ -3,7 +3,8 @@ require gtk+3.inc
3MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 3MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
4 4
5SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ 5SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
6 file://no-x11-in-wayland.patch" 6 file://no-x11-in-wayland.patch \
7 file://wayland-attach.patch"
7 8
8SRC_URI[md5sum] = "8e878e18fc385f2b813419dc7b40a968" 9SRC_URI[md5sum] = "8e878e18fc385f2b813419dc7b40a968"
9SRC_URI[sha256sum] = "1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297" 10SRC_URI[sha256sum] = "1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297"