summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+/gtk+3
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2014-09-08 12:58:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-10 11:33:23 +0100
commit28500e52095751e3e4c60b4bf88aba558489bf64 (patch)
treea7d87037390d3a20a6a0c11c795efafd5b26f2c0 /meta/recipes-gnome/gtk+/gtk+3
parent4cdc9fd08cbe445f1cb228fdf211c1af3eea8fc0 (diff)
downloadpoky-28500e52095751e3e4c60b4bf88aba558489bf64.tar.gz
gtk+3: update to 3.12.2
fix-build-when-wayland-backend-enabled.patch removed as the issue is fixed in upstream. (From OE-Core rev: 59fe6f91b39c4aa67e7e1734c3731d49c7ea8376) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Ross Burton <ross.burton@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/fix-build-when-wayland-backend-enabled.patch43
1 files changed, 0 insertions, 43 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
deleted file mode 100644
index b4b1a09455..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch
+++ /dev/null
@@ -1,43 +0,0 @@
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 {