summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc6
-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_3.12.2.bb (renamed from meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb)5
3 files changed, 7 insertions, 47 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 9e96275554..54ca77a5ec 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -49,7 +49,11 @@ LIBV = "3.0.0"
49FILES_${PN}-demo = "${bindir}/gtk3-demo \ 49FILES_${PN}-demo = "${bindir}/gtk3-demo \
50 ${bindir}/gtk3-demo-application \ 50 ${bindir}/gtk3-demo-application \
51 ${bindir}/gtk3-widget-factory \ 51 ${bindir}/gtk3-widget-factory \
52 ${datadir}/gtk-3.0/demo" 52 ${datadir}/gtk-3.0/demo \
53 ${datadir}/applications/gtk3-demo.desktop \
54 ${datadir}/applications/gtk3-widget-factory.desktop \
55 ${datadir}/icons/hicolor/*/apps/gtk3-demo.png \
56 ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory.png"
53 57
54# The demo uses PNG files and mime type sniffing, so ensure that these 58# The demo uses PNG files and mime type sniffing, so ensure that these
55# dependencies are present. 59# dependencies are present.
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 {
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb b/meta/recipes-gnome/gtk+/gtk+3_3.12.2.bb
index d0174f6093..f4f197131b 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.12.2.bb
@@ -4,12 +4,11 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
4 4
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://fix-build-when-wayland-backend-enabled.patch \
8 file://fix-flags-for-native.patch \ 7 file://fix-flags-for-native.patch \
9 " 8 "
10 9
11SRC_URI[md5sum] = "18a81944a8506231529a76bf2b68372b" 10SRC_URI[md5sum] = "0d6d8f9f79132b3b47475d047b369b1c"
12SRC_URI[sha256sum] = "b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427" 11SRC_URI[sha256sum] = "61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0"
13 12
14S = "${WORKDIR}/gtk+-${PV}" 13S = "${WORKDIR}/gtk+-${PV}"
15 14