diff options
author | Marko Lindqvist <cazfi74@gmail.com> | 2014-09-08 12:58:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-10 11:33:23 +0100 |
commit | 28500e52095751e3e4c60b4bf88aba558489bf64 (patch) | |
tree | a7d87037390d3a20a6a0c11c795efafd5b26f2c0 /meta | |
parent | 4cdc9fd08cbe445f1cb228fdf211c1af3eea8fc0 (diff) | |
download | ast2050-yocto-poky-28500e52095751e3e4c60b4bf88aba558489bf64.zip ast2050-yocto-poky-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')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 6 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch | 43 | ||||
-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 9e96275..54ca77a 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" FILES_${PN}-demo = "${bindir}/gtk3-demo \ ${bindir}/gtk3-demo-application \ ${bindir}/gtk3-widget-factory \ - ${datadir}/gtk-3.0/demo" + ${datadir}/gtk-3.0/demo \ + ${datadir}/applications/gtk3-demo.desktop \ + ${datadir}/applications/gtk3-widget-factory.desktop \ + ${datadir}/icons/hicolor/*/apps/gtk3-demo.png \ + ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory.png" # The demo uses PNG files and mime type sniffing, so ensure that these # 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 b4b1a09..0000000 --- a/meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix build when wayland backend enabled - -Upstream-Status: Submitted -https://bugzilla.gnome.org/show_bug.cgi?id=710584 - -Author: Emilio Pozuelo Monfort - ---- gtk+-3.10.7/gtk/gtkapplication.c -+++ gtk+-3.10.7/gtk/gtkapplication.c -@@ -144,7 +144,6 @@ - - gboolean register_session; - --#ifdef GDK_WINDOWING_X11 - guint next_id; - - GDBusConnection *session_bus; -@@ -161,7 +160,6 @@ - GDBusProxy *client_proxy; - gchar *app_id; - gchar *client_path; --#endif - - #ifdef GDK_WINDOWING_QUARTZ - GMenu *combined; -@@ -299,6 +297,8 @@ - g_free (application->priv->client_path); - } - -+#endif -+ - const gchar * - gtk_application_get_app_menu_object_path (GtkApplication *application) - { -@@ -311,8 +311,6 @@ - return application->priv->menubar_path; - } - --#endif -- - #ifdef GDK_WINDOWING_QUARTZ - - 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 d0174f6..f4f1971 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)}" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ file://hardcoded_libtool.patch \ - file://fix-build-when-wayland-backend-enabled.patch \ file://fix-flags-for-native.patch \ " -SRC_URI[md5sum] = "18a81944a8506231529a76bf2b68372b" -SRC_URI[sha256sum] = "b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427" +SRC_URI[md5sum] = "0d6d8f9f79132b3b47475d047b369b1c" +SRC_URI[sha256sum] = "61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0" S = "${WORKDIR}/gtk+-${PV}" |