From c885365107cc31ba2eff94cfae4f09813ac53a97 Mon Sep 17 00:00:00 2001 From: Valentin Popa Date: Thu, 20 Feb 2014 12:09:36 +0200 Subject: 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 Signed-off-by: Saul Wold --- .../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 --------------------- meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb | 17 +++++++++ meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb | 18 --------- 5 files changed, 60 insertions(+), 92 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 create mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb delete mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb (limited to 'meta/recipes-gnome/gtk+') 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 @@ +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/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 @@ -The Wayland backend was including X11 headers, which won't work in a no-X11 -distro. - -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 875b1d07ded377b20acbf1a10cae847f56de05b4 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -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 --#include - - #include - #include --- -1.7.10.4 - 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 @@ -Wayland 1.1 is enforcing the protocol whereas 1.0 was lenient. Backport a patch -from git to fix repainting. - -Upstream-Status: Backport -Signed-off-by: Ross Burton - - -From 0d2c4617203c8fe907c722c9cb53c0345e0405e7 Mon Sep 17 00:00:00 2001 -From: Scott Moreau -Date: Sun, 10 Mar 2013 10:51:01 -0600 -Subject: [PATCH] wayland: Always attach buffer before committing - -With recent changes in attach semantics, we always need to attach before -committing. Without this changes to the window contents to not get reflected -in the content of the surface. - -Signed-off-by: Rob Bradford ---- - gdk/wayland/gdkwindow-wayland.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c -index 112a1f4..fa01e90 100644 ---- a/gdk/wayland/gdkwindow-wayland.c -+++ b/gdk/wayland/gdkwindow-wayland.c -@@ -327,13 +327,6 @@ gdk_wayland_window_attach_image (GdkWindow *window) - if (GDK_WINDOW_DESTROYED (window)) - return; - -- /* The "drawn to" Cairo surface is the same as the Cairo surface from which -- * we are driving the buffer for the Wayland surface. Therefore we don't -- * need to do anything here -- */ -- if (impl->server_surface == impl->cairo_surface) -- return; -- - /* The wayland surface is attached to a buffer that is from the old "drawn - * to" surface. Unref the surface and restore the state. - */ --- -1.7.10.4 - diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb b/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb new file mode 100644 index 0000000000..9f8c6abebc --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb @@ -0,0 +1,17 @@ +require gtk+3.inc + +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" + +SRC_URI[md5sum] = "18a81944a8506231529a76bf2b68372b" +SRC_URI[sha256sum] = "b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427" + +S = "${WORKDIR}/gtk+-${PV}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ + file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ + file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb b/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb deleted file mode 100644 index 5db3745dc4..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -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 \ - file://hardcoded_libtool.patch \ - file://no-x11-in-wayland.patch \ - file://wayland-attach.patch" - -SRC_URI[md5sum] = "8e878e18fc385f2b813419dc7b40a968" -SRC_URI[sha256sum] = "1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297" - -S = "${WORKDIR}/gtk+-${PV}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ - file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ - file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" -- cgit 1.2.3-korg