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.
Signed-off-by Valentin Popa <[email protected]>
---
.../fix-build-when-wayland-backend-enabled.patch | 43 ++++++++++++++++++++++
.../gtk+/gtk+3/no-x11-in-wayland.patch | 32 ----------------
meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch | 42 ---------------------
.../gtk+/{gtk+3_3.8.2.bb => gtk+3_3.10.7.bb} | 9 ++---
4 files changed, 47 insertions(+), 79 deletions(-)
create mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.8.2.bb => gtk+3_3.10.7.bb} (61%)meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch new file +43 -0
@@ -0,0 +1,43 @@ +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 {
meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch deleted +0 -32
@@ -1,32 +0,0 @@ -The Wayland backend was including X11 headers, which won't work in a no-X11 -distro. - -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From 875b1d07ded377b20acbf1a10cae847f56de05b4 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <[email protected]> -Date: Thu, 23 May 2013 12:26:26 -0400 -Subject: [PATCH] Don't include X11 headers in wayland - -The include of X11/keysyms.h in gdkdevice-wayland.c was just -a leftover. ---- - gdk/wayland/gdkdevice-wayland.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c -index c258be3..cd4a695 100644 ---- a/gdk/wayland/gdkdevice-wayland.c -+++ b/gdk/wayland/gdkdevice-wayland.c -@@ -32,7 +32,6 @@ - #include "gdkdevicemanagerprivate.h" - - #include <xkbcommon/xkbcommon.h> --#include <X11/keysym.h> - - #include <sys/time.h> - #include <sys/mman.h> --- -1.7.10.4 -
meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch deleted +0 -42
42 lines not on this page · raw message
meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb +4 -5
@@ -2,13 +2,12 @@ require gtk+3.inc MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" -SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ file://hardcoded_libtool.patch \ - file://no-x11-in-wayland.patch \ - file://wayland-attach.patch" + file://fix-build-when-wayland-backend-enabled.patch" -SRC_URI[md5sum] = "8e878e18fc385f2b813419dc7b40a968" -SRC_URI[sha256sum] = "1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297" +SRC_URI[md5sum] = "18a81944a8506231529a76bf2b68372b" +SRC_URI[sha256sum] = "b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427" S = "${WORKDIR}/gtk+-${PV}"
Signature · 1 line
1.8.3.2