summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValentin Popa <valentin.popa@intel.com>2014-02-20 12:09:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-21 16:09:08 +0000
commit4590a00af50cc69e120a5a186e87c4abf43bb9ca (patch)
treefd684f0d20bbeb9acd34d623934a068b037cd264
parentb8c50fb9bde393653780a76c8f10f7a3e5d30657 (diff)
downloadpoky-4590a00af50cc69e120a5a186e87c4abf43bb9ca.tar.gz
gtk+3: upgrade to 3.10.7
(*) removed patches that were already commited upstream (*) added new patch to solve the build issue (*) changed the package URL because the old one is unreliable. (From OE-Core rev: c885365107cc31ba2eff94cfae4f09813ac53a97) Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch43
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch32
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch42
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb (renamed from meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb)9
4 files changed, 47 insertions, 79 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch b/meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch
new file mode 100644
index 0000000000..b4b1a09455
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch
@@ -0,0 +1,43 @@
1Fix build when wayland backend enabled
2
3Upstream-Status: Submitted
4https://bugzilla.gnome.org/show_bug.cgi?id=710584
5
6Author: Emilio Pozuelo Monfort
7
8--- gtk+-3.10.7/gtk/gtkapplication.c
9+++ gtk+-3.10.7/gtk/gtkapplication.c
10@@ -144,7 +144,6 @@
11
12 gboolean register_session;
13
14-#ifdef GDK_WINDOWING_X11
15 guint next_id;
16
17 GDBusConnection *session_bus;
18@@ -161,7 +160,6 @@
19 GDBusProxy *client_proxy;
20 gchar *app_id;
21 gchar *client_path;
22-#endif
23
24 #ifdef GDK_WINDOWING_QUARTZ
25 GMenu *combined;
26@@ -299,6 +297,8 @@
27 g_free (application->priv->client_path);
28 }
29
30+#endif
31+
32 const gchar *
33 gtk_application_get_app_menu_object_path (GtkApplication *application)
34 {
35@@ -311,8 +311,6 @@
36 return application->priv->menubar_path;
37 }
38
39-#endif
40-
41 #ifdef GDK_WINDOWING_QUARTZ
42
43 typedef struct {
diff --git a/meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch b/meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch
deleted file mode 100644
index df0921acbd..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1The Wayland backend was including X11 headers, which won't work in a no-X11
2distro.
3
4Upstream-Status: Backport
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7From 875b1d07ded377b20acbf1a10cae847f56de05b4 Mon Sep 17 00:00:00 2001
8From: Matthias Clasen <mclasen@redhat.com>
9Date: Thu, 23 May 2013 12:26:26 -0400
10Subject: [PATCH] Don't include X11 headers in wayland
11
12The include of X11/keysyms.h in gdkdevice-wayland.c was just
13a leftover.
14---
15 gdk/wayland/gdkdevice-wayland.c | 1 -
16 1 file changed, 1 deletion(-)
17
18diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
19index c258be3..cd4a695 100644
20--- a/gdk/wayland/gdkdevice-wayland.c
21+++ b/gdk/wayland/gdkdevice-wayland.c
22@@ -32,7 +32,6 @@
23 #include "gdkdevicemanagerprivate.h"
24
25 #include <xkbcommon/xkbcommon.h>
26-#include <X11/keysym.h>
27
28 #include <sys/time.h>
29 #include <sys/mman.h>
30--
311.7.10.4
32
diff --git a/meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch b/meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch
deleted file mode 100644
index fa0d0e6529..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch
+++ /dev/null
@@ -1,42 +0,0 @@
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.10.7.bb
index 5db3745dc4..9f8c6abebc 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb
@@ -2,13 +2,12 @@ require gtk+3.inc
2 2
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://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://no-x11-in-wayland.patch \ 7 file://fix-build-when-wayland-backend-enabled.patch"
8 file://wayland-attach.patch"
9 8
10SRC_URI[md5sum] = "8e878e18fc385f2b813419dc7b40a968" 9SRC_URI[md5sum] = "18a81944a8506231529a76bf2b68372b"
11SRC_URI[sha256sum] = "1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297" 10SRC_URI[sha256sum] = "b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427"
12 11
13S = "${WORKDIR}/gtk+-${PV}" 12S = "${WORKDIR}/gtk+-${PV}"
14 13