<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On 6 July 2016 at 06:21, Robert Yang <span dir="ltr"><<a href="mailto:liezhi.yang@windriver.com" target="_blank">liezhi.yang@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On 07/06/2016 11:09 AM, Robert Yang wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On 07/05/2016 10:08 PM, Jussi Kukkonen wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On 5 July 2016 at 16:09, Robert Yang <<a href="mailto:liezhi.yang@windriver.com" target="_blank">liezhi.yang@windriver.com</a><br>
<mailto:<a href="mailto:liezhi.yang@windriver.com" target="_blank">liezhi.yang@windriver.com</a>>> wrote:<br>
<br>
<br>
Hi,<br>
<br>
I can't build it on Ubuntu 14.04:<br>
<br>
<br>
I can't see from the log why the file would be be missing and can't reproduce<br>
that locally... Cleaning sstate should be a valid workaround but I'd be really<br>
interested in reproducing this: if you can reproduce (or remember if you did any<br>
distro feature or packageconfig changes) please let me know the details.<br>
<br>
In the meantime I'll take another look at the build system...<br>
</blockquote>
<br>
Please see below ...<br>
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h<br>
+similarity index 100%<br>
+rename from gdk/x11/gdkx.h<br>
+rename to gdk/x11/gdkx-with-gl-context.h<br>
</blockquote>
<br>
Older patch tool such as patch 2.7.1 can't apply this patch, I will update it.<br>
</blockquote>
<br></span>
Sorry, 2.6.1:-).<span class="HOEnZb"><font color="#888888"><br>
<br></font></span></blockquote><div><br></div><div><br></div><div>Thanks for the follow up. Ubuntu 14.04 should not have gnu patch 2.6.1 though, or am I mistaken?</div><div><br></div><div>Jussi</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="HOEnZb"><font color="#888888">
// Robert</font></span><div class="HOEnZb"><div class="h5"><br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
// Robert<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
diff --git a/gdk/x11/gdkx-without-gl-context.h<br>
b/gdk/x11/gdkx-without-gl-context.h<br>
new file mode 100644<br>
index 0000000..c9e2617<br>
@@ -686,76 +617,11 @@ index 0000000..c9e2617<br>
+#undef __GDKX_H_INSIDE__<br>
+<br>
+#endif /* __GDK_X_H__ */<br>
-diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h<br>
-deleted file mode 100644<br>
-index ae05fa6..0000000<br>
---- a/gdk/x11/gdkx.h<br>
-+++ /dev/null<br>
-@@ -1,59 +0,0 @@<br>
--/* GDK - The GIMP Drawing Kit<br>
-- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh<br>
MacDonald<br>
-- *<br>
-- * This library is free software; you can redistribute it and/or<br>
-- * modify it under the terms of the GNU Lesser General Public<br>
-- * License as published by the Free Software Foundation; either<br>
-- * version 2 of the License, or (at your option) any later version.<br>
-- *<br>
-- * This library is distributed in the hope that it will be useful,<br>
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU<br>
-- * Lesser General Public License for more details.<br>
-- *<br>
-- * You should have received a copy of the GNU Lesser General Public<br>
-- * License along with this library. If not, see<br>
<<a href="http://www.gnu.org/licenses/" rel="noreferrer" target="_blank">http://www.gnu.org/licenses/</a>>.<br>
-- */<br>
--<br>
--/*<br>
-- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS<br>
-- * file for a list of people on the GTK+ Team. See the ChangeLog<br>
-- * files for a list of changes. These files are distributed with<br>
-- * GTK+ at <a href="ftp://ftp.gtk.org/pub/gtk/" rel="noreferrer" target="_blank">ftp://ftp.gtk.org/pub/gtk/</a>.<br>
-- */<br>
--<br>
--#ifndef __GDK_X_H__<br>
--#define __GDK_X_H__<br>
--<br>
--#include <gdk/gdk.h><br>
--<br>
--#include <X11/Xlib.h><br>
--#include <X11/Xutil.h><br>
--<br>
--#define __GDKX_H_INSIDE__<br>
--<br>
--#include <gdk/x11/gdkx11applaunchcontext.h><br>
--#include <gdk/x11/gdkx11cursor.h><br>
--#include <gdk/x11/gdkx11device.h><br>
--#include <gdk/x11/gdkx11device-core.h><br>
--#include <gdk/x11/gdkx11device-xi2.h><br>
--#include <gdk/x11/gdkx11devicemanager.h><br>
--#include <gdk/x11/gdkx11devicemanager-core.h><br>
--#include <gdk/x11/gdkx11devicemanager-xi2.h><br>
--#include <gdk/x11/gdkx11display.h><br>
--#include <gdk/x11/gdkx11displaymanager.h><br>
--#include <gdk/x11/gdkx11dnd.h><br>
--#include <gdk/x11/gdkx11glcontext.h><br>
--#include <gdk/x11/gdkx11keys.h><br>
--#include <gdk/x11/gdkx11property.h><br>
--#include <gdk/x11/gdkx11screen.h><br>
--#include <gdk/x11/gdkx11selection.h><br>
--#include <gdk/x11/gdkx11utils.h><br>
--#include <gdk/x11/gdkx11visual.h><br>
--#include <gdk/x11/gdkx11window.h><br>
--<br>
--#include <gdk/x11/gdkx-autocleanups.h><br>
--<br>
--#undef __GDKX_H_INSIDE__<br>
--<br>
--#endif /* __GDK_X_H__ */<br>
diff --git a/gtk/Makefile.am b/gtk/Makefile.am<br>
-index 801c3a5..2d8839d 100644<br>
+index 6a53a2b..49a35e6 100644<br>
--- a/gtk/Makefile.am<br>
+++ b/gtk/Makefile.am<br>
-@@ -1246,14 +1246,13 @@ gtkprivatetypebuiltins.c:<br>
$(gtk_private_type_h_sources) gtkprivatetypebuiltins.<br>
+@@ -1351,14 +1351,13 @@ gtkprivatetypebuiltins.c:<br>
$(gtk_private_type_h_sources) gtkprivatetypebuiltins.<br>
&& cp xgen-gptbc gtkprivatetypebuiltins.c \<br>
&& rm -f xgen-gptbc<br>
<br>
@@ -772,7 +638,7 @@ index 801c3a5..2d8839d 100644<br>
gtktestutils.c: gtktypefuncs.c<br>
<br>
diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c<br>
-index 4098409..45fa1d1 100644<br>
+index 245fc6b..4214ad1 100644<br>
--- a/gtk/gtkglarea.c<br>
+++ b/gtk/gtkglarea.c<br>
@@ -28,7 +28,9 @@<br>
@@ -868,7 +734,7 @@ index 4098409..45fa1d1 100644<br>
<br>
static gboolean<br>
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c<br>
-index 0611373..4499a29 100644<br>
+index 4eab3a7..c4e900e 100644<br>
--- a/gtk/inspector/general.c<br>
+++ b/gtk/inspector/general.c<br>
@@ -33,8 +33,10 @@<br>
@@ -882,7 +748,7 @@ index 0611373..4499a29 100644<br>
<br>
#ifdef GDK_WINDOWING_WIN32<br>
#include "win32/gdkwin32.h"<br>
-@@ -146,6 +148,7 @@ append_extension_row (GtkInspectorGeneral *gen,<br>
+@@ -147,6 +149,7 @@ append_extension_row (GtkInspectorGeneral *gen,<br>
gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels),<br>
label);<br>
}<br>
<br>
@@ -890,7 +756,7 @@ index 0611373..4499a29 100644<br>
#ifdef GDK_WINDOWING_X11<br>
static void<br>
append_glx_extension_row (GtkInspectorGeneral *gen,<br>
-@@ -155,6 +158,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen,<br>
+@@ -156,6 +159,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen,<br>
append_extension_row (gen, ext, epoxy_has_glx_extension (dpy, 0,<br>
ext));<br>
}<br>
#endif<br>
@@ -898,27 +764,27 @@ index 0611373..4499a29 100644<br>
<br>
#ifdef GDK_WINDOWING_WAYLAND<br>
static void<br>
-@@ -174,6 +178,7 @@ init_gl (GtkInspectorGeneral *gen)<br>
-<br>
- display = gdk_display_get_default ();<br>
-<br>
+@@ -171,6 +175,7 @@ append_egl_extension_row (GtkInspectorGeneral *gen,<br>
+ static void<br>
+ init_gl (GtkInspectorGeneral *gen)<br>
+ {<br>
+#ifdef HAVE_OPENGL<br>
#ifdef GDK_WINDOWING_X11<br>
- if (GDK_IS_X11_DISPLAY (display))<br>
+ if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))<br>
{<br>
-@@ -199,6 +204,7 @@ init_gl (GtkInspectorGeneral *gen)<br>
+@@ -197,6 +202,7 @@ init_gl (GtkInspectorGeneral *gen)<br>
}<br>
else<br>
#endif<br>
+#endif<br>
#ifdef GDK_WINDOWING_WAYLAND<br>
- if (GDK_IS_WAYLAND_DISPLAY (display))<br>
+ if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))<br>
{<br>
diff --git a/tests/Makefile.am b/tests/Makefile.am<br>
-index 50f2986..3b39169 100644<br>
+index 681807d..2941a36 100644<br>
--- a/tests/Makefile.am<br>
+++ b/tests/Makefile.am<br>
-@@ -78,8 +78,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \<br>
+@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \<br>
testfullscreen \<br>
testgeometry \<br>
testgiconpixbuf \<br>
@@ -927,18 +793,19 @@ index 50f2986..3b39169 100644<br>
testgrid \<br>
testgtk \<br>
testheaderbar \<br>
-@@ -166,10 +164,16 @@ noinst_PROGRAMS = $(TEST_PROGS) \<br>
+@@ -169,11 +167,17 @@ noinst_PROGRAMS = $(TEST_PROGS) \<br>
testactionbar \<br>
testwindowsize \<br>
testpopover \<br>
- gdkgears \<br>
listmodel \<br>
+ testpopup \<br>
$(NULL)<br>
<br>
+if HAVE_OPENGL<br>
+noinst_PROGRAMS +=<br>
-+ testglarea \<br>
-+ testglblending \<br>
++ testglarea \<br>
++ testglblending \<br>
+ gdkgears<br>
+endif<br>
+<br>
@@ -946,11 +813,11 @@ index 50f2986..3b39169 100644<br>
noinst_PROGRAMS += testerrors<br>
endif<br>
diff --git a/testsuite/gtk/objects-finalize.c<br>
b/testsuite/gtk/objects-finalize.c<br>
-index 3568505..682ea10 100644<br>
+index e0ebee0..703643c 100644<br>
--- a/testsuite/gtk/objects-finalize.c<br>
+++ b/testsuite/gtk/objects-finalize.c<br>
-@@ -114,8 +114,10 @@ main (int argc, char **argv)<br>
- all_types[i] != GDK_TYPE_X11_DISPLAY &&<br>
+@@ -115,8 +115,10 @@ main (int argc, char **argv)<br>
+ all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE &&<br>
all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 &&<br>
all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER &&<br>
+#ifdef HAVE_OPENGL<br>
@@ -961,5 +828,5 @@ index 3568505..682ea10 100644<br>
all_types[i] != GDK_TYPE_PIXBUF_LOADER &&<br>
all_types[i] != gdk_pixbuf_simple_anim_iter_get_type())<br>
--<br>
-2.8.1<br>
+2.1.4<br>
<br>
diff --git<br>
<br>
a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch<br>
<br>
<br>
b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch<br>
<br>
new file mode 100644<br>
index 0000000..634b3a4<br>
--- /dev/null<br>
+++<br>
<br>
b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch<br>
<br>
@@ -0,0 +1,36 @@<br>
+From 97b78e566634579bbae51be914aeaaa921137a8b Mon Sep 17 00:00:00 2001<br>
+From: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a><br>
<mailto:<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>>><br>
+Date: Thu, 9 Jun 2016 11:21:36 +0300<br>
+Subject: [PATCH 4/4] <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> <<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>>: Fix<br>
wayland-protocols path<br>
+<br>
+The wayland-protocols directory is used during build: Fix the path<br>
+to point to sysroot specified in recipe.<br>
+<br>
+Normally PKG_CONFIG_SYSROOT_DIR could be used in <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
<<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>> but that<br>
+breaks multilib gtk+ as it would point to multilib sysroot when the<br>
+(allarch) wayland-protocols is actually in the machine sysroot.<br>
+<br>
+Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a><br>
<mailto:<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>>><br>
+Upstream-Status: Inappropriate [embedded specific]<br>
+<br>
+Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a><br>
<mailto:<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>>><br>
+---<br>
+ <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> <<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>> | 2 +-<br>
+ 1 file changed, 1 insertion(+), 1 deletion(-)<br>
+<br>
+diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> <<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
<<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>><br>
+index a3e9beb..dde9dc5 100644<br>
+--- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> <<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>><br>
++++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> <<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>><br>
+@@ -461,7 +461,7 @@ fi<br>
+ if test "$enable_wayland_backend" = "yes"; then<br>
+ # For the cairo image backend<br>
+ cairo_backends="$cairo_backends cairo"<br>
+- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG<br>
--variable=pkgdatadir wayland-protocols`)<br>
++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR,<br>
${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir<br>
wayland-protocols`)<br>
+ GDK_BACKENDS="$GDK_BACKENDS wayland"<br>
+ GDK_WINDOWING="$GDK_WINDOWING<br>
+ #define GDK_WINDOWING_WAYLAND"<br>
+--<br>
+2.1.4<br>
+<br>
diff --git a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch<br>
b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch<br>
deleted file mode 100644<br>
index 32d8a84..0000000<br>
--- a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch<br>
+++ /dev/null<br>
@@ -1,118 +0,0 @@<br>
-window: Check if we can use CSD before enabling them<br>
-<br>
-Upstream-Status: Backport<br>
-Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a><br>
<mailto:<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>>><br>
-<br>
-<br>
-From c5e5ee67490e7e7af56052d8f8beb75db002c2f1 Mon Sep 17 00:00:00 2001<br>
-From: Emmanuele Bassi <<a href="mailto:ebassi@gnome.org" target="_blank">ebassi@gnome.org</a> <mailto:<a href="mailto:ebassi@gnome.org" target="_blank">ebassi@gnome.org</a>>><br>
-Date: Wed, 3 Jun 2015 14:07:29 +0100<br>
-Subject: window: Check if we can use CSD before enabling them<br>
-<br>
-The change in 03213b9509fc1df16c66194ea168aed6c15110e9 changed the rules<br>
-as to when CSD can be enabled, but it also unconditionally enables CSD<br>
-with the implicit assumption that client-side shadows were the real<br>
-issue, and that we could work around that by drawing our own borders.<br>
-This also means that setting a titlebar for a GtkWindow will enable CSD<br>
-unconditionally.<br>
-<br>
-In reality, some window managers (like Matchbox) *only* support<br>
-server-side decorations, and will ignore all hints to the contrary, to<br>
-the point of drawing decorations at random locations on top of the<br>
-window.<br>
-<br>
-Since CSD are enabled unconditionally, the GTK_CSD environment variable<br>
-is also not a suitable escape hatch.<br>
-<br>
-In the grand tradition of asking ourselves if we should do something<br>
-just because we can, we should split the environment checks from the<br>
-checks on what the user requested; by doing that, we can also check<br>
-when enabling client-side decorations, and ideally bail out if needed.<br>
-<br>
-<a href="https://bugzilla.gnome.org/show_bug.cgi?id=750343" rel="noreferrer" target="_blank">https://bugzilla.gnome.org/show_bug.cgi?id=750343</a><br>
-<br>
-diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c<br>
-index 423c6bd..9fe882f 100644<br>
---- a/gtk/gtkwindow.c<br>
-+++ b/gtk/gtkwindow.c<br>
-@@ -4056,6 +4056,32 @@ gtk_window_supports_client_shadow (GtkWindow<br>
*window)<br>
- return TRUE;<br>
- }<br>
-<br>
-+static gboolean<br>
-+gtk_window_can_use_csd (GtkWindow *window)<br>
-+{<br>
-+ const gchar *csd_env;<br>
-+<br>
-+#ifdef GDK_WINDOWING_BROADWAY<br>
-+ if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET<br>
(window))))<br>
-+ return TRUE;<br>
-+#endif<br>
-+<br>
-+#ifdef GDK_WINDOWING_WAYLAND<br>
-+ if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET<br>
(window))))<br>
-+ return TRUE;<br>
-+#endif<br>
-+<br>
-+#ifdef GDK_WINDOWING_MIR<br>
-+ if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET<br>
(window))))<br>
-+ return TRUE;<br>
-+#endif<br>
-+<br>
-+ csd_env = g_getenv ("GTK_CSD");<br>
-+<br>
-+ /* If GTK_CSD is unset we default to CSD support */<br>
-+ return csd_env == NULL || (strcmp (csd_env, "1") == 0);<br>
-+}<br>
-+<br>
- static void<br>
- gtk_window_enable_csd (GtkWindow *window)<br>
- {<br>
-@@ -4063,6 +4089,10 @@ gtk_window_enable_csd (GtkWindow *window)<br>
- GtkWidget *widget = GTK_WIDGET (window);<br>
- GdkVisual *visual;<br>
-<br>
-+ /* If the environment does not support CSD, then there's no point in<br>
enabling them */<br>
-+ if (!gtk_window_can_use_csd (window))<br>
-+ return;<br>
-+<br>
- /* We need a visual with alpha for client shadows */<br>
- if (priv->use_client_shadow)<br>
- {<br>
-@@ -5839,7 +5869,6 @@ static gboolean<br>
- gtk_window_should_use_csd (GtkWindow *window)<br>
- {<br>
- GtkWindowPrivate *priv = window->priv;<br>
-- const gchar *csd_env;<br>
-<br>
- if (priv->csd_requested)<br>
- return TRUE;<br>
-@@ -5850,24 +5879,7 @@ gtk_window_should_use_csd (GtkWindow *window)<br>
- if (priv->type == GTK_WINDOW_POPUP)<br>
- return FALSE;<br>
-<br>
--#ifdef GDK_WINDOWING_BROADWAY<br>
-- if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET<br>
(window))))<br>
-- return TRUE;<br>
--#endif<br>
--<br>
--#ifdef GDK_WINDOWING_WAYLAND<br>
-- if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET<br>
(window))))<br>
-- return TRUE;<br>
--#endif<br>
--<br>
--#ifdef GDK_WINDOWING_MIR<br>
-- if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET<br>
(window))))<br>
-- return TRUE;<br>
--#endif<br>
--<br>
-- csd_env = g_getenv ("GTK_CSD");<br>
--<br>
-- return (g_strcmp0 (csd_env, "1") == 0);<br>
-+ return gtk_window_can_use_csd (window);<br>
- }<br>
-<br>
- static void<br>
---<br>
-cgit v0.10.2<br>
-<br>
diff --git a/meta/recipes-gnome/gtk+/gtk+<a href="http://3_3.18.8.bb" rel="noreferrer" target="_blank">3_3.18.8.bb</a><br>
<<a href="http://3_3.18.8.bb" rel="noreferrer" target="_blank">http://3_3.18.8.bb</a>> b/meta/recipes-gnome/gtk+/gtk+<a href="http://3_3.20.6.bb" rel="noreferrer" target="_blank">3_3.20.6.bb</a><br>
<<a href="http://3_3.20.6.bb" rel="noreferrer" target="_blank">http://3_3.20.6.bb</a>><br>
similarity index 57%<br>
rename from meta/recipes-gnome/gtk+/gtk+<a href="http://3_3.18.8.bb" rel="noreferrer" target="_blank">3_3.18.8.bb</a> <<a href="http://3_3.18.8.bb" rel="noreferrer" target="_blank">http://3_3.18.8.bb</a>><br>
rename to meta/recipes-gnome/gtk+/gtk+<a href="http://3_3.20.6.bb" rel="noreferrer" target="_blank">3_3.20.6.bb</a> <<a href="http://3_3.20.6.bb" rel="noreferrer" target="_blank">http://3_3.20.6.bb</a>><br>
index d776b6d..453a4e2 100644<br>
--- a/meta/recipes-gnome/gtk+/gtk+<a href="http://3_3.18.8.bb" rel="noreferrer" target="_blank">3_3.18.8.bb</a> <<a href="http://3_3.18.8.bb" rel="noreferrer" target="_blank">http://3_3.18.8.bb</a>><br>
+++ b/meta/recipes-gnome/gtk+/gtk+<a href="http://3_3.20.6.bb" rel="noreferrer" target="_blank">3_3.20.6.bb</a> <<a href="http://3_3.20.6.bb" rel="noreferrer" target="_blank">http://3_3.20.6.bb</a>><br>
@@ -3,14 +3,13 @@ require gtk+3.inc<br>
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"<br>
<br>
SRC_URI =<br>
<br>
"<a href="http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz" rel="noreferrer" target="_blank">http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz</a><br>
<<a href="http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz" rel="noreferrer" target="_blank">http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz</a>><br>
<br>
\<br>
- file://hardcoded_libtool.patch \<br>
- file://Dont-force-csd.patch \<br>
- file://Do-not-try-to-initialize-GL-without-libGL.patch \<br>
- file://0001-Add-disable-opengl-configure-option.patch \<br>
+ file://0001-Hardcoded-libtool.patch \<br>
+ file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \<br>
+ file://0003-Add-disable-opengl-configure-option.patch \<br>
+ file://0004-configure.ac-Fix-wayland-protocols-path.patch \<br>
"<br>
-<br>
-SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184"<br>
-SRC_URI[sha256sum] =<br>
"1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8"<br>
+SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954"<br>
+SRC_URI[sha256sum] =<br>
"3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2"<br>
<br>
S = "${WORKDIR}/gtk+-${PV}"<br>
<br>
diff --git a/meta/recipes-gnome/gtk+/<a href="http://gtk-icon-utils-native_3.18.8.bb" rel="noreferrer" target="_blank">gtk-icon-utils-native_3.18.8.bb</a><br>
<<a href="http://gtk-icon-utils-native_3.18.8.bb" rel="noreferrer" target="_blank">http://gtk-icon-utils-native_3.18.8.bb</a>><br>
b/meta/recipes-gnome/gtk+/<a href="http://gtk-icon-utils-native_3.20.6.bb" rel="noreferrer" target="_blank">gtk-icon-utils-native_3.20.6.bb</a><br>
<<a href="http://gtk-icon-utils-native_3.20.6.bb" rel="noreferrer" target="_blank">http://gtk-icon-utils-native_3.20.6.bb</a>><br>
similarity index 93%<br>
rename from meta/recipes-gnome/gtk+/<a href="http://gtk-icon-utils-native_3.18.8.bb" rel="noreferrer" target="_blank">gtk-icon-utils-native_3.18.8.bb</a><br>
<<a href="http://gtk-icon-utils-native_3.18.8.bb" rel="noreferrer" target="_blank">http://gtk-icon-utils-native_3.18.8.bb</a>><br>
rename to meta/recipes-gnome/gtk+/<a href="http://gtk-icon-utils-native_3.20.6.bb" rel="noreferrer" target="_blank">gtk-icon-utils-native_3.20.6.bb</a><br>
<<a href="http://gtk-icon-utils-native_3.20.6.bb" rel="noreferrer" target="_blank">http://gtk-icon-utils-native_3.20.6.bb</a>><br>
index 793f14a..e870ba3 100644<br>
--- a/meta/recipes-gnome/gtk+/<a href="http://gtk-icon-utils-native_3.18.8.bb" rel="noreferrer" target="_blank">gtk-icon-utils-native_3.18.8.bb</a><br>
<<a href="http://gtk-icon-utils-native_3.18.8.bb" rel="noreferrer" target="_blank">http://gtk-icon-utils-native_3.18.8.bb</a>><br>
+++ b/meta/recipes-gnome/gtk+/<a href="http://gtk-icon-utils-native_3.20.6.bb" rel="noreferrer" target="_blank">gtk-icon-utils-native_3.20.6.bb</a><br>
<<a href="http://gtk-icon-utils-native_3.20.6.bb" rel="noreferrer" target="_blank">http://gtk-icon-utils-native_3.20.6.bb</a>><br>
@@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"<br>
<br>
SRC_URI =<br>
<br>
"<a href="http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz" rel="noreferrer" target="_blank">http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz</a><br>
<<a href="http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz" rel="noreferrer" target="_blank">http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz</a>><br>
<br>
\<br>
<br>
file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch"<br>
-SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184"<br>
-SRC_URI[sha256sum] =<br>
"1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8"<br>
+SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954"<br>
+SRC_URI[sha256sum] =<br>
"3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2"<br>
<br>
LIC_FILES_CHKSUM =<br>
"file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \<br>
<br>
file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \<br>
<br>
<br>
</blockquote></blockquote>
</div></div></blockquote></div><br></div></div>