summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-07-04 02:06:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 14:38:13 +0100
commitcad6482662e2a257b609bbc76435af7356567298 (patch)
tree08009631bd2c6cdb909014261d00cf3bda41b463 /meta/recipes-gnome/gtk+
parent10356fefcd2aee781cc659ce9e3ea82c479fff21 (diff)
downloadpoky-cad6482662e2a257b609bbc76435af7356567298.tar.gz
gtk+3: Update the patches to work with old versions of patch
The patch "0003-Add-disable-opengl-configure-option.patch" used Git rename syntax, which is not supported by patch 2.6.x and older. (From OE-Core rev: 43e640ddcf32c718b3e0bb3f3654ed60eb497058) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch12
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch8
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch268
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch8
4 files changed, 207 insertions, 89 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
index 0bda1f1074..c210bbc7d5 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
@@ -1,4 +1,4 @@
1From 5a73a5b92566e314bbc8a1bd40f1ec204837c111 Mon Sep 17 00:00:00 2001 1From 0ecaa5bab162abf0cb2057d77beeb7b89d5873b4 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 21 Jun 2016 14:53:56 +0300 3Date: Tue, 21 Jun 2016 14:53:56 +0300
4Subject: [PATCH 1/4] Hardcoded libtool 4Subject: [PATCH 1/4] Hardcoded libtool
@@ -12,10 +12,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
12 1 file changed, 3 insertions(+), 3 deletions(-) 12 1 file changed, 3 insertions(+), 3 deletions(-)
13 13
14diff --git a/configure.ac b/configure.ac 14diff --git a/configure.ac b/configure.ac
15index 23d3077..b6931d6 100644 15index 6628e21..f43ac09 100644
16--- a/configure.ac 16--- a/configure.ac
17+++ b/configure.ac 17+++ b/configure.ac
18@@ -610,7 +610,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc files]) 18@@ -617,7 +617,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc files])
19 case $enable_explicit_deps in 19 case $enable_explicit_deps in
20 auto) 20 auto)
21 export SED 21 export SED
@@ -24,7 +24,7 @@ index 23d3077..b6931d6 100644
24 if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then 24 if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then
25 enable_explicit_deps=yes 25 enable_explicit_deps=yes
26 else 26 else
27@@ -876,7 +876,7 @@ else 27@@ -895,7 +895,7 @@ else
28 dnl Now we check to see if our libtool supports shared lib deps 28 dnl Now we check to see if our libtool supports shared lib deps
29 dnl (in a rather ugly way even) 29 dnl (in a rather ugly way even)
30 if $dynworks; then 30 if $dynworks; then
@@ -33,7 +33,7 @@ index 23d3077..b6931d6 100644
33 module_deplibs_check=`$module_libtool_config | \ 33 module_deplibs_check=`$module_libtool_config | \
34 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ 34 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
35 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` 35 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
36@@ -1630,7 +1630,7 @@ AC_SUBST(GTK_PRINT_BACKENDS) 36@@ -1649,7 +1649,7 @@ AC_SUBST(GTK_PRINT_BACKENDS)
37 # We are using gmodule-no-export now, but I'm leaving the stripping 37 # We are using gmodule-no-export now, but I'm leaving the stripping
38 # code in place for now, since pango and atk still require gmodule. 38 # code in place for now, since pango and atk still require gmodule.
39 export SED 39 export SED
@@ -43,5 +43,5 @@ index 23d3077..b6931d6 100644
43 GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` 43 GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
44 GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` 44 GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
45-- 45--
462.1.4 462.12.0
47 47
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch b/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
index 989716e513..ab7b659414 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
+++ b/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
@@ -1,4 +1,4 @@
1From d63b926f8c8d8b5c9f9ec33d078b775f0409d88a Mon Sep 17 00:00:00 2001 1From 2d2361f24be1e51201063dbbda570debe8702b6f Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 16 Oct 2015 16:35:16 +0300 3Date: Fri, 16 Oct 2015 16:35:16 +0300
4Subject: [PATCH 2/4] Do not try to initialize GL without libGL 4Subject: [PATCH 2/4] Do not try to initialize GL without libGL
@@ -21,10 +21,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
21 2 files changed, 12 insertions(+) 21 2 files changed, 12 insertions(+)
22 22
23diff --git a/configure.ac b/configure.ac 23diff --git a/configure.ac b/configure.ac
24index b6931d6..e27da49 100644 24index f43ac09..965eec9 100644
25--- a/configure.ac 25--- a/configure.ac
26+++ b/configure.ac 26+++ b/configure.ac
27@@ -342,6 +342,13 @@ AC_ARG_ENABLE(mir-backend, 27@@ -346,6 +346,13 @@ AC_ARG_ENABLE(mir-backend,
28 [enable the Mir gdk backend])], 28 [enable the Mir gdk backend])],
29 [backend_set=yes]) 29 [backend_set=yes])
30 30
@@ -56,5 +56,5 @@ index 81479d8..3c8c5c0 100644
56 56
57 gint 57 gint
58-- 58--
592.1.4 592.12.0
60 60
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
index 91e35121de..9cdee0e54e 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
+++ b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
@@ -1,7 +1,7 @@
1From cdfd6216ac49fc7622d563d671a5b6511492827d Mon Sep 17 00:00:00 2001 1From a2e6b7cbbd6d741fed38d91b3742aa4a08395aba Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 21 Jun 2016 15:11:39 +0300 3Date: Tue, 21 Jun 2016 15:11:39 +0300
4Subject: [PATCH] Add --disable-opengl configure option 4Subject: [PATCH 3/4] Add --disable-opengl configure option
5 5
6--disable-opengl will remove the dependency on libepoxy and on the 6--disable-opengl will remove the dependency on libepoxy and on the
7OpenGL APIs. This is useful for those who want to keep using gtk+3 7OpenGL APIs. This is useful for those who want to keep using gtk+3
@@ -20,32 +20,34 @@ as it actually will depend on OpenGL.
20Upstream-Status: Inappropriate [Evil eye expected from upstream] 20Upstream-Status: Inappropriate [Evil eye expected from upstream]
21Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 21Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
22--- 22---
23 configure.ac | 13 +++++-- 23 configure.ac | 13 +++++++--
24 demos/gtk-demo/glarea.c | 13 +++++++ 24 demos/gtk-demo/glarea.c | 14 +++++++++
25 docs/tools/Makefile.am | 9 +++-- 25 docs/tools/Makefile.am | 9 ++++--
26 docs/tools/widgets.c | 4 ++- 26 docs/tools/widgets.c | 4 ++-
27 gdk/gdkdisplay.c | 4 ++- 27 gdk/gdkdisplay.c | 4 ++-
28 gdk/gdkgl.c | 10 ++++++ 28 gdk/gdkgl.c | 10 +++++++
29 gdk/gdkglcontext.c | 6 ++++ 29 gdk/gdkglcontext.c | 6 ++++
30 gdk/gdkwindow.c | 13 +++++++ 30 gdk/gdkwindow.c | 13 +++++++++
31 gdk/x11/Makefile.am | 30 +++++++++++++--- 31 gdk/x11/Makefile.am | 30 +++++++++++++++++---
32 gdk/x11/gdkdisplay-x11.c | 6 +++- 32 gdk/x11/gdkdisplay-x11.c | 6 +++-
33 gdk/x11/gdkscreen-x11.c | 5 +++ 33 gdk/x11/gdkscreen-x11.c | 5 ++++
34 gdk/x11/gdkwindow-x11.c | 4 +++ 34 gdk/x11/gdkwindow-x11.c | 4 +++
35 gdk/x11/gdkx-autocleanups.h | 2 ++ 35 gdk/x11/gdkx-autocleanups.h | 2 ++
36 gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 1 - 36 gdk/x11/gdkx-with-gl-context.h | 59 ++++++++++++++++++++++++++++++++++++++
37 gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++ 37 gdk/x11/gdkx-without-gl-context.h | 58 +++++++++++++++++++++++++++++++++++++
38 gtk/Makefile.am | 3 +- 38 gdk/x11/gdkx.h | 60 ---------------------------------------
39 gtk/gtkglarea.c | 20 ++++++++++- 39 gtk/Makefile.am | 3 +-
40 gtk/inspector/general.c | 6 ++++ 40 gtk/gtkglarea.c | 20 ++++++++++++-
41 tests/Makefile.am | 10 ++++-- 41 gtk/inspector/general.c | 6 ++++
42 testsuite/gtk/objects-finalize.c | 2 ++ 42 tests/Makefile.am | 10 +++++--
43 20 files changed, 201 insertions(+), 18 deletions(-) 43 testsuite/gtk/objects-finalize.c | 2 ++
44 rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%) 44 21 files changed, 261 insertions(+), 77 deletions(-)
45 create mode 100644 gdk/x11/gdkx-with-gl-context.h
45 create mode 100644 gdk/x11/gdkx-without-gl-context.h 46 create mode 100644 gdk/x11/gdkx-without-gl-context.h
47 delete mode 100644 gdk/x11/gdkx.h
46 48
47diff --git a/configure.ac b/configure.ac 49diff --git a/configure.ac b/configure.ac
48index 1cfdbc4..2d1a945 100644 50index 965eec9..00bf544 100644
49--- a/configure.ac 51--- a/configure.ac
50+++ b/configure.ac 52+++ b/configure.ac
51@@ -346,6 +346,15 @@ AC_ARG_ENABLE(mir-backend, 53@@ -346,6 +346,15 @@ AC_ARG_ENABLE(mir-backend,
@@ -83,7 +85,7 @@ index 1cfdbc4..2d1a945 100644
83 GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" 85 GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
84 fi 86 fi
85diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c 87diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c
86index 715b067..4a9c7c8 100644 88index b51e4ae..82409c7 100644
87--- a/demos/gtk-demo/glarea.c 89--- a/demos/gtk-demo/glarea.c
88+++ b/demos/gtk-demo/glarea.c 90+++ b/demos/gtk-demo/glarea.c
89@@ -3,9 +3,12 @@ 91@@ -3,9 +3,12 @@
@@ -99,7 +101,7 @@ index 715b067..4a9c7c8 100644
99 101
100 static GtkWidget *demo_window = NULL; 102 static GtkWidget *demo_window = NULL;
101 103
102@@ -23,6 +25,8 @@ enum { 104@@ -23,6 +26,8 @@ enum {
103 /* Rotation angles on each axis */ 105 /* Rotation angles on each axis */
104 static float rotation_angles[N_AXIS] = { 0.0 }; 106 static float rotation_angles[N_AXIS] = { 0.0 };
105 107
@@ -108,7 +110,7 @@ index 715b067..4a9c7c8 100644
108 /* The object we are drawing */ 110 /* The object we are drawing */
109 static const GLfloat vertex_data[] = { 111 static const GLfloat vertex_data[] = {
110 0.f, 0.5f, 0.f, 1.f, 112 0.f, 0.5f, 0.f, 1.f,
111@@ -215,6 +219,7 @@ compute_mvp (float *res, 113@@ -215,6 +220,7 @@ compute_mvp (float *res,
112 static GLuint position_buffer; 114 static GLuint position_buffer;
113 static GLuint program; 115 static GLuint program;
114 static GLuint mvp_location; 116 static GLuint mvp_location;
@@ -116,7 +118,7 @@ index 715b067..4a9c7c8 100644
116 118
117 /* We need to set up our state when we realize the GtkGLArea widget */ 119 /* We need to set up our state when we realize the GtkGLArea widget */
118 static void 120 static void
119@@ -241,8 +246,10 @@ realize (GtkWidget *widget) 121@@ -241,8 +247,10 @@ realize (GtkWidget *widget)
120 fragment_path = "/glarea/glarea-gl.fs.glsl"; 122 fragment_path = "/glarea/glarea-gl.fs.glsl";
121 } 123 }
122 124
@@ -127,7 +129,7 @@ index 715b067..4a9c7c8 100644
127 } 129 }
128 130
129 /* We should tear down the state when unrealizing */ 131 /* We should tear down the state when unrealizing */
130@@ -254,10 +261,13 @@ unrealize (GtkWidget *widget) 132@@ -254,10 +262,13 @@ unrealize (GtkWidget *widget)
131 if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL) 133 if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL)
132 return; 134 return;
133 135
@@ -141,7 +143,7 @@ index 715b067..4a9c7c8 100644
141 static void 143 static void
142 draw_triangle (void) 144 draw_triangle (void)
143 { 145 {
144@@ -290,6 +300,7 @@ draw_triangle (void) 146@@ -290,6 +301,7 @@ draw_triangle (void)
145 glBindBuffer (GL_ARRAY_BUFFER, 0); 147 glBindBuffer (GL_ARRAY_BUFFER, 0);
146 glUseProgram (0); 148 glUseProgram (0);
147 } 149 }
@@ -149,7 +151,7 @@ index 715b067..4a9c7c8 100644
149 151
150 static gboolean 152 static gboolean
151 render (GtkGLArea *area, 153 render (GtkGLArea *area,
152@@ -298,6 +309,7 @@ render (GtkGLArea *area, 154@@ -298,6 +310,7 @@ render (GtkGLArea *area,
153 if (gtk_gl_area_get_error (area) != NULL) 155 if (gtk_gl_area_get_error (area) != NULL)
154 return FALSE; 156 return FALSE;
155 157
@@ -157,7 +159,7 @@ index 715b067..4a9c7c8 100644
157 /* Clear the viewport */ 159 /* Clear the viewport */
158 glClearColor (0.5, 0.5, 0.5, 1.0); 160 glClearColor (0.5, 0.5, 0.5, 1.0);
159 glClear (GL_COLOR_BUFFER_BIT); 161 glClear (GL_COLOR_BUFFER_BIT);
160@@ -307,6 +319,7 @@ render (GtkGLArea *area, 162@@ -307,6 +320,7 @@ render (GtkGLArea *area,
161 163
162 /* Flush the contents of the pipeline */ 164 /* Flush the contents of the pipeline */
163 glFlush (); 165 glFlush ();
@@ -208,7 +210,7 @@ index 932daf1..54239d6 100644
208 210
209 return info; 211 return info;
210diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c 212diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
211index ed0e65f..1f81b71 100644 213index 6b012ca..311c7f7 100644
212--- a/gdk/gdkdisplay.c 214--- a/gdk/gdkdisplay.c
213+++ b/gdk/gdkdisplay.c 215+++ b/gdk/gdkdisplay.c
214@@ -2409,7 +2409,9 @@ gboolean 216@@ -2409,7 +2409,9 @@ gboolean
@@ -223,7 +225,7 @@ index ed0e65f..1f81b71 100644
223 225
224 GdkRenderingMode 226 GdkRenderingMode
225diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c 227diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
226index 51d2b02..efa9e95 100644 228index 8e7b8c2..b579b22 100644
227--- a/gdk/gdkgl.c 229--- a/gdk/gdkgl.c
228+++ b/gdk/gdkgl.c 230+++ b/gdk/gdkgl.c
229@@ -22,7 +22,9 @@ 231@@ -22,7 +22,9 @@
@@ -276,7 +278,7 @@ index 51d2b02..efa9e95 100644
276 GdkGLContext *paint_context; 278 GdkGLContext *paint_context;
277 cairo_surface_t *image; 279 cairo_surface_t *image;
278 cairo_matrix_t matrix; 280 cairo_matrix_t matrix;
279@@ -706,6 +713,7 @@ out: 281@@ -707,6 +714,7 @@ out:
280 if (clip_region) 282 if (clip_region)
281 cairo_region_destroy (clip_region); 283 cairo_region_destroy (clip_region);
282 284
@@ -284,7 +286,7 @@ index 51d2b02..efa9e95 100644
284 } 286 }
285 287
286 /* This is always called with the paint context current */ 288 /* This is always called with the paint context current */
287@@ -713,6 +721,7 @@ void 289@@ -714,6 +722,7 @@ void
288 gdk_gl_texture_from_surface (cairo_surface_t *surface, 290 gdk_gl_texture_from_surface (cairo_surface_t *surface,
289 cairo_region_t *region) 291 cairo_region_t *region)
290 { 292 {
@@ -292,14 +294,14 @@ index 51d2b02..efa9e95 100644
292 GdkGLContext *paint_context; 294 GdkGLContext *paint_context;
293 cairo_surface_t *image; 295 cairo_surface_t *image;
294 double device_x_offset, device_y_offset; 296 double device_x_offset, device_y_offset;
295@@ -813,4 +822,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, 297@@ -814,4 +823,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface,
296 298
297 glDisable (GL_SCISSOR_TEST); 299 glDisable (GL_SCISSOR_TEST);
298 glDeleteTextures (1, &texture_id); 300 glDeleteTextures (1, &texture_id);
299+#endif 301+#endif
300 } 302 }
301diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c 303diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
302index bf6e45f..d016e4b 100644 304index c79dca0..8a7bec2 100644
303--- a/gdk/gdkglcontext.c 305--- a/gdk/gdkglcontext.c
304+++ b/gdk/gdkglcontext.c 306+++ b/gdk/gdkglcontext.c
305@@ -85,7 +85,9 @@ 307@@ -85,7 +85,9 @@
@@ -312,7 +314,7 @@ index bf6e45f..d016e4b 100644
312 314
313 typedef struct { 315 typedef struct {
314 GdkDisplay *display; 316 GdkDisplay *display;
315@@ -243,6 +243,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, 317@@ -243,6 +245,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context,
316 int height, 318 int height,
317 guint texture_target) 319 guint texture_target)
318 { 320 {
@@ -320,7 +322,7 @@ index bf6e45f..d016e4b 100644
320 GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); 322 GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
321 323
322 g_return_if_fail (GDK_IS_GL_CONTEXT (context)); 324 g_return_if_fail (GDK_IS_GL_CONTEXT (context));
323@@ -286,6 +287,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, 325@@ -286,6 +289,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context,
324 glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (unsigned char*) data + (i * stride)); 326 glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (unsigned char*) data + (i * stride));
325 } 327 }
326 } 328 }
@@ -328,7 +330,7 @@ index bf6e45f..d016e4b 100644
328 } 330 }
329 331
330 static gboolean 332 static gboolean
331@@ -760,6 +764,7 @@ gdk_gl_context_realize (GdkGLContext *context, 333@@ -774,6 +778,7 @@ gdk_gl_context_realize (GdkGLContext *context,
332 static void 334 static void
333 gdk_gl_context_check_extensions (GdkGLContext *context) 335 gdk_gl_context_check_extensions (GdkGLContext *context)
334 { 336 {
@@ -336,7 +338,7 @@ index bf6e45f..d016e4b 100644
336 GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); 338 GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
337 gboolean has_npot, has_texture_rectangle; 339 gboolean has_npot, has_texture_rectangle;
338 340
339@@ -824,6 +829,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) 341@@ -847,6 +852,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
340 priv->use_texture_rectangle ? "yes" : "no")); 342 priv->use_texture_rectangle ? "yes" : "no"));
341 343
342 priv->extensions_checked = TRUE; 344 priv->extensions_checked = TRUE;
@@ -345,7 +347,7 @@ index bf6e45f..d016e4b 100644
345 347
346 /** 348 /**
347diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c 349diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
348index 514732d..0e4fc7e 100644 350index 689d666..fb84256 100644
349--- a/gdk/gdkwindow.c 351--- a/gdk/gdkwindow.c
350+++ b/gdk/gdkwindow.c 352+++ b/gdk/gdkwindow.c
351@@ -45,7 +45,9 @@ 353@@ -45,7 +45,9 @@
@@ -358,7 +360,7 @@ index 514732d..0e4fc7e 100644
358 360
359 /* for the use of round() */ 361 /* for the use of round() */
360 #include "fallback-c89.c" 362 #include "fallback-c89.c"
361@@ -2801,6 +2803,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window, 363@@ -2819,6 +2821,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window,
362 { 364 {
363 GError *internal_error = NULL; 365 GError *internal_error = NULL;
364 366
@@ -372,7 +374,7 @@ index 514732d..0e4fc7e 100644
372 if (_gdk_gl_flags & GDK_GL_DISABLE) 374 if (_gdk_gl_flags & GDK_GL_DISABLE)
373 { 375 {
374 g_set_error_literal (error, GDK_GL_ERROR, 376 g_set_error_literal (error, GDK_GL_ERROR,
375@@ -2936,6 +2945,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, 377@@ -2954,6 +2963,7 @@ gdk_window_begin_paint_internal (GdkWindow *window,
376 } 378 }
377 else 379 else
378 { 380 {
@@ -380,7 +382,7 @@ index 514732d..0e4fc7e 100644
380 gdk_gl_context_make_current (context); 382 gdk_gl_context_make_current (context);
381 /* With gl we always need a surface to combine the gl 383 /* With gl we always need a surface to combine the gl
382 drawing with the native drawing. */ 384 drawing with the native drawing. */
383@@ -2950,6 +2960,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, 385@@ -2968,6 +2978,7 @@ gdk_window_begin_paint_internal (GdkWindow *window,
384 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 386 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
385 387
386 glViewport (0, 0, ww, wh); 388 glViewport (0, 0, ww, wh);
@@ -388,7 +390,7 @@ index 514732d..0e4fc7e 100644
388 } 390 }
389 } 391 }
390 392
391@@ -3013,6 +3024,7 @@ gdk_window_end_paint_internal (GdkWindow *window) 393@@ -3031,6 +3042,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
392 394
393 gdk_gl_context_make_current (window->gl_paint_context); 395 gdk_gl_context_make_current (window->gl_paint_context);
394 396
@@ -396,7 +398,7 @@ index 514732d..0e4fc7e 100644
396 if (!cairo_region_is_empty (opaque_region)) 398 if (!cairo_region_is_empty (opaque_region))
397 gdk_gl_texture_from_surface (window->current_paint.surface, 399 gdk_gl_texture_from_surface (window->current_paint.surface,
398 opaque_region); 400 opaque_region);
399@@ -3023,6 +3035,7 @@ gdk_window_end_paint_internal (GdkWindow *window) 401@@ -3041,6 +3053,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
400 window->current_paint.need_blend_region); 402 window->current_paint.need_blend_region);
401 glDisable(GL_BLEND); 403 glDisable(GL_BLEND);
402 } 404 }
@@ -502,10 +504,10 @@ index ad65e29..91345ee 100644
502 display_class->get_default_seat = gdk_x11_display_get_default_seat; 504 display_class->get_default_seat = gdk_x11_display_get_default_seat;
503 505
504diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c 506diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
505index 450872d..f8a2f6e 100644 507index 7bf9979..cd1cc9d 100644
506--- a/gdk/x11/gdkscreen-x11.c 508--- a/gdk/x11/gdkscreen-x11.c
507+++ b/gdk/x11/gdkscreen-x11.c 509+++ b/gdk/x11/gdkscreen-x11.c
508@@ -1642,3 +1642,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) 510@@ -1643,3 +1643,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen)
509 { 511 {
510 return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP"); 512 return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP");
511 } 513 }
@@ -515,7 +517,7 @@ index 450872d..f8a2f6e 100644
515+void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} 517+void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {}
516+#endif 518+#endif
517diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c 519diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
518index fe311a7..d16bdfe 100644 520index 3d6fd3b..2bd5c87 100644
519--- a/gdk/x11/gdkwindow-x11.c 521--- a/gdk/x11/gdkwindow-x11.c
520+++ b/gdk/x11/gdkwindow-x11.c 522+++ b/gdk/x11/gdkwindow-x11.c
521@@ -36,7 +36,9 @@ 523@@ -36,7 +36,9 @@
@@ -528,7 +530,7 @@ index fe311a7..d16bdfe 100644
528 #include "gdkprivate-x11.h" 530 #include "gdkprivate-x11.h"
529 #include "gdk-private.h" 531 #include "gdk-private.h"
530 532
531@@ -5781,7 +5783,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) 533@@ -5801,7 +5803,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
532 impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; 534 impl_class->set_opaque_region = gdk_x11_window_set_opaque_region;
533 impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; 535 impl_class->set_shadow_width = gdk_x11_window_set_shadow_width;
534 impl_class->show_window_menu = gdk_x11_window_show_window_menu; 536 impl_class->show_window_menu = gdk_x11_window_show_window_menu;
@@ -552,21 +554,71 @@ index edb0ea7..a317d61 100644
552 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref) 554 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref)
553 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref) 555 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref)
554 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref) 556 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref)
555diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h 557diff --git a/gdk/x11/gdkx-with-gl-context.h b/gdk/x11/gdkx-with-gl-context.h
556similarity index 98% 558new file mode 100644
557rename from gdk/x11/gdkx.h 559index 0000000..ae05fa6
558rename to gdk/x11/gdkx-with-gl-context.h 560--- /dev/null
559index 1f64bcc..ae05fa6 100644
560--- a/gdk/x11/gdkx.h
561+++ b/gdk/x11/gdkx-with-gl-context.h 561+++ b/gdk/x11/gdkx-with-gl-context.h
562@@ -45,7 +45,6 @@ 562@@ -0,0 +1,59 @@
563 #include <gdk/x11/gdkx11dnd.h> 563+/* GDK - The GIMP Drawing Kit
564 #include <gdk/x11/gdkx11glcontext.h> 564+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
565 #include <gdk/x11/gdkx11keys.h> 565+ *
566-#include <gdk/x11/gdkx11monitor.h> 566+ * This library is free software; you can redistribute it and/or
567 #include <gdk/x11/gdkx11property.h> 567+ * modify it under the terms of the GNU Lesser General Public
568 #include <gdk/x11/gdkx11screen.h> 568+ * License as published by the Free Software Foundation; either
569 #include <gdk/x11/gdkx11selection.h> 569+ * version 2 of the License, or (at your option) any later version.
570+ *
571+ * This library is distributed in the hope that it will be useful,
572+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
573+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
574+ * Lesser General Public License for more details.
575+ *
576+ * You should have received a copy of the GNU Lesser General Public
577+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
578+ */
579+
580+/*
581+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
582+ * file for a list of people on the GTK+ Team. See the ChangeLog
583+ * files for a list of changes. These files are distributed with
584+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
585+ */
586+
587+#ifndef __GDK_X_H__
588+#define __GDK_X_H__
589+
590+#include <gdk/gdk.h>
591+
592+#include <X11/Xlib.h>
593+#include <X11/Xutil.h>
594+
595+#define __GDKX_H_INSIDE__
596+
597+#include <gdk/x11/gdkx11applaunchcontext.h>
598+#include <gdk/x11/gdkx11cursor.h>
599+#include <gdk/x11/gdkx11device.h>
600+#include <gdk/x11/gdkx11device-core.h>
601+#include <gdk/x11/gdkx11device-xi2.h>
602+#include <gdk/x11/gdkx11devicemanager.h>
603+#include <gdk/x11/gdkx11devicemanager-core.h>
604+#include <gdk/x11/gdkx11devicemanager-xi2.h>
605+#include <gdk/x11/gdkx11display.h>
606+#include <gdk/x11/gdkx11displaymanager.h>
607+#include <gdk/x11/gdkx11dnd.h>
608+#include <gdk/x11/gdkx11glcontext.h>
609+#include <gdk/x11/gdkx11keys.h>
610+#include <gdk/x11/gdkx11property.h>
611+#include <gdk/x11/gdkx11screen.h>
612+#include <gdk/x11/gdkx11selection.h>
613+#include <gdk/x11/gdkx11utils.h>
614+#include <gdk/x11/gdkx11visual.h>
615+#include <gdk/x11/gdkx11window.h>
616+
617+#include <gdk/x11/gdkx-autocleanups.h>
618+
619+#undef __GDKX_H_INSIDE__
620+
621+#endif /* __GDK_X_H__ */
570diff --git a/gdk/x11/gdkx-without-gl-context.h b/gdk/x11/gdkx-without-gl-context.h 622diff --git a/gdk/x11/gdkx-without-gl-context.h b/gdk/x11/gdkx-without-gl-context.h
571new file mode 100644 623new file mode 100644
572index 0000000..c9e2617 624index 0000000..c9e2617
@@ -631,11 +683,77 @@ index 0000000..c9e2617
631+#undef __GDKX_H_INSIDE__ 683+#undef __GDKX_H_INSIDE__
632+ 684+
633+#endif /* __GDK_X_H__ */ 685+#endif /* __GDK_X_H__ */
686diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
687deleted file mode 100644
688index 1f64bcc..0000000
689--- a/gdk/x11/gdkx.h
690+++ /dev/null
691@@ -1,60 +0,0 @@
692-/* GDK - The GIMP Drawing Kit
693- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
694- *
695- * This library is free software; you can redistribute it and/or
696- * modify it under the terms of the GNU Lesser General Public
697- * License as published by the Free Software Foundation; either
698- * version 2 of the License, or (at your option) any later version.
699- *
700- * This library is distributed in the hope that it will be useful,
701- * but WITHOUT ANY WARRANTY; without even the implied warranty of
702- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
703- * Lesser General Public License for more details.
704- *
705- * You should have received a copy of the GNU Lesser General Public
706- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
707- */
708-
709-/*
710- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
711- * file for a list of people on the GTK+ Team. See the ChangeLog
712- * files for a list of changes. These files are distributed with
713- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
714- */
715-
716-#ifndef __GDK_X_H__
717-#define __GDK_X_H__
718-
719-#include <gdk/gdk.h>
720-
721-#include <X11/Xlib.h>
722-#include <X11/Xutil.h>
723-
724-#define __GDKX_H_INSIDE__
725-
726-#include <gdk/x11/gdkx11applaunchcontext.h>
727-#include <gdk/x11/gdkx11cursor.h>
728-#include <gdk/x11/gdkx11device.h>
729-#include <gdk/x11/gdkx11device-core.h>
730-#include <gdk/x11/gdkx11device-xi2.h>
731-#include <gdk/x11/gdkx11devicemanager.h>
732-#include <gdk/x11/gdkx11devicemanager-core.h>
733-#include <gdk/x11/gdkx11devicemanager-xi2.h>
734-#include <gdk/x11/gdkx11display.h>
735-#include <gdk/x11/gdkx11displaymanager.h>
736-#include <gdk/x11/gdkx11dnd.h>
737-#include <gdk/x11/gdkx11glcontext.h>
738-#include <gdk/x11/gdkx11keys.h>
739-#include <gdk/x11/gdkx11monitor.h>
740-#include <gdk/x11/gdkx11property.h>
741-#include <gdk/x11/gdkx11screen.h>
742-#include <gdk/x11/gdkx11selection.h>
743-#include <gdk/x11/gdkx11utils.h>
744-#include <gdk/x11/gdkx11visual.h>
745-#include <gdk/x11/gdkx11window.h>
746-
747-#include <gdk/x11/gdkx-autocleanups.h>
748-
749-#undef __GDKX_H_INSIDE__
750-
751-#endif /* __GDK_X_H__ */
634diff --git a/gtk/Makefile.am b/gtk/Makefile.am 752diff --git a/gtk/Makefile.am b/gtk/Makefile.am
635index 3b76b82..eb4a065 100644 753index 45fb7c2..ce81011 100644
636--- a/gtk/Makefile.am 754--- a/gtk/Makefile.am
637+++ b/gtk/Makefile.am 755+++ b/gtk/Makefile.am
638@@ -1378,14 +1378,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. 756@@ -1411,14 +1411,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.
639 && cp xgen-gptbc gtkprivatetypebuiltins.c \ 757 && cp xgen-gptbc gtkprivatetypebuiltins.c \
640 && rm -f xgen-gptbc 758 && rm -f xgen-gptbc
641 759
@@ -748,7 +866,7 @@ index 094378e..f7c7f47 100644
748 866
749 static gboolean 867 static gboolean
750diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c 868diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
751index 31dd6aa..1cedbd3 100644 869index c241ec8..24576dd 100644
752--- a/gtk/inspector/general.c 870--- a/gtk/inspector/general.c
753+++ b/gtk/inspector/general.c 871+++ b/gtk/inspector/general.c
754@@ -33,8 +33,10 @@ 872@@ -33,8 +33,10 @@
@@ -778,7 +896,7 @@ index 31dd6aa..1cedbd3 100644
778 896
779 #ifdef GDK_WINDOWING_WAYLAND 897 #ifdef GDK_WINDOWING_WAYLAND
780 static void 898 static void
781@@ -220,6 +224,7 @@ append_egl_extension_row (GtkInspectorGeneral *gen, 899@@ -254,6 +258,7 @@ wayland_get_display (struct wl_display *wl_display)
782 static void 900 static void
783 init_gl (GtkInspectorGeneral *gen) 901 init_gl (GtkInspectorGeneral *gen)
784 { 902 {
@@ -786,7 +904,7 @@ index 31dd6aa..1cedbd3 100644
786 #ifdef GDK_WINDOWING_X11 904 #ifdef GDK_WINDOWING_X11
787 if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) 905 if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
788 { 906 {
789@@ -246,6 +251,7 @@ init_gl (GtkInspectorGeneral *gen) 907@@ -280,6 +285,7 @@ init_gl (GtkInspectorGeneral *gen)
790 } 908 }
791 else 909 else
792 #endif 910 #endif
@@ -795,7 +913,7 @@ index 31dd6aa..1cedbd3 100644
795 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) 913 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
796 { 914 {
797diff --git a/tests/Makefile.am b/tests/Makefile.am 915diff --git a/tests/Makefile.am b/tests/Makefile.am
798index 649981f..a0e48a6 100644 916index f86c166..ba1acad 100644
799--- a/tests/Makefile.am 917--- a/tests/Makefile.am
800+++ b/tests/Makefile.am 918+++ b/tests/Makefile.am
801@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ 919@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \
@@ -807,7 +925,7 @@ index 649981f..a0e48a6 100644
807 testgrid \ 925 testgrid \
808 testgtk \ 926 testgtk \
809 testheaderbar \ 927 testheaderbar \
810@@ -169,12 +167,18 @@ noinst_PROGRAMS = $(TEST_PROGS) \ 928@@ -170,12 +168,18 @@ noinst_PROGRAMS = $(TEST_PROGS) \
811 testactionbar \ 929 testactionbar \
812 testwindowsize \ 930 testwindowsize \
813 testpopover \ 931 testpopover \
@@ -843,5 +961,5 @@ index 0b3a519..07b096f 100644
843 all_types[i] != GDK_TYPE_PIXBUF_LOADER && 961 all_types[i] != GDK_TYPE_PIXBUF_LOADER &&
844 all_types[i] != GDK_TYPE_DRAWING_CONTEXT && 962 all_types[i] != GDK_TYPE_DRAWING_CONTEXT &&
845-- 963--
8462.1.4 9642.12.0
847 965
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch
index 634b3a46ff..aca55ceaf4 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch
+++ b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch
@@ -1,4 +1,4 @@
1From 97b78e566634579bbae51be914aeaaa921137a8b Mon Sep 17 00:00:00 2001 1From 34f4d3928e8206a89b0a601bdf79d6194b3cc77e Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 9 Jun 2016 11:21:36 +0300 3Date: Thu, 9 Jun 2016 11:21:36 +0300
4Subject: [PATCH 4/4] configure.ac: Fix wayland-protocols path 4Subject: [PATCH 4/4] configure.ac: Fix wayland-protocols path
@@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
19 1 file changed, 1 insertion(+), 1 deletion(-) 19 1 file changed, 1 insertion(+), 1 deletion(-)
20 20
21diff --git a/configure.ac b/configure.ac 21diff --git a/configure.ac b/configure.ac
22index a3e9beb..dde9dc5 100644 22index 00bf544..5515915 100644
23--- a/configure.ac 23--- a/configure.ac
24+++ b/configure.ac 24+++ b/configure.ac
25@@ -461,7 +461,7 @@ fi 25@@ -465,7 +465,7 @@ fi
26 if test "$enable_wayland_backend" = "yes"; then 26 if test "$enable_wayland_backend" = "yes"; then
27 # For the cairo image backend 27 # For the cairo image backend
28 cairo_backends="$cairo_backends cairo" 28 cairo_backends="$cairo_backends cairo"
@@ -32,5 +32,5 @@ index a3e9beb..dde9dc5 100644
32 GDK_WINDOWING="$GDK_WINDOWING 32 GDK_WINDOWING="$GDK_WINDOWING
33 #define GDK_WINDOWING_WAYLAND" 33 #define GDK_WINDOWING_WAYLAND"
34-- 34--
352.1.4 352.12.0
36 36