summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-11-21 18:02:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-22 12:02:57 +0000
commit06fb03495b051aae5e4d52d037e807c1f8f9b3ac (patch)
tree198db332d88b0df6d52a943c886cc03cf8c4e01d /meta
parentf87c86f67fb939ef2f689a3c41d807e1d418939b (diff)
downloadpoky-06fb03495b051aae5e4d52d037e807c1f8f9b3ac.tar.gz
gtk+3: update to 3.24.1
(From OE-Core rev: d76fa906dd603bd8eadd1932048969065ebd3aab) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch103
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb (renamed from meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb)4
2 files changed, 52 insertions, 55 deletions
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 d2f12dc7ff..e5a67d098e 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 de36df70d87ba3453ed4f2b92e990021c67238f5 Mon Sep 17 00:00:00 2001 1From 9e243474eea4330b593e0f6dd418b61b79699d8b 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 3/4] Add --disable-opengl configure option 4Subject: [PATCH] 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
@@ -21,32 +21,32 @@ Upstream-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--- 23---
24 configure.ac | 13 +++++-- 24 configure.ac | 13 ++++-
25 demos/gtk-demo/glarea.c | 14 ++++++++ 25 demos/gtk-demo/glarea.c | 14 ++++++
26 docs/tools/Makefile.am | 9 +++-- 26 docs/tools/Makefile.am | 9 +++-
27 docs/tools/widgets.c | 4 ++- 27 docs/tools/widgets.c | 4 +-
28 gdk/gdkdisplay.c | 4 ++- 28 gdk/gdkdisplay.c | 4 +-
29 gdk/gdkgl.c | 10 ++++++ 29 gdk/gdkgl.c | 10 ++++
30 gdk/gdkglcontext.c | 6 ++++ 30 gdk/gdkglcontext.c | 6 +++
31 gdk/gdkwindow.c | 13 +++++++ 31 gdk/gdkwindow.c | 13 +++++
32 gdk/x11/Makefile.am | 30 +++++++++++++--- 32 gdk/x11/Makefile.am | 30 +++++++++--
33 gdk/x11/gdkdisplay-x11.c | 6 +++- 33 gdk/x11/gdkdisplay-x11.c | 6 ++-
34 gdk/x11/gdkscreen-x11.c | 5 +++ 34 gdk/x11/gdkscreen-x11.c | 5 ++
35 gdk/x11/gdkwindow-x11.c | 4 +++ 35 gdk/x11/gdkwindow-x11.c | 4 ++
36 gdk/x11/gdkx-autocleanups.h | 2 ++ 36 gdk/x11/gdkx-autocleanups.h | 2 +
37 gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 1 - 37 gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 1 -
38 gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++ 38 gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++
39 gtk/Makefile.am | 3 +- 39 gtk/Makefile.am | 3 +-
40 gtk/gtkglarea.c | 20 ++++++++++- 40 gtk/gtkglarea.c | 20 +++++++-
41 gtk/inspector/general.c | 6 ++++ 41 gtk/inspector/general.c | 6 +++
42 tests/Makefile.am | 10 ++++-- 42 tests/Makefile.am | 10 ++--
43 testsuite/gtk/objects-finalize.c | 2 ++ 43 testsuite/gtk/objects-finalize.c | 2 +
44 20 files changed, 202 insertions(+), 18 deletions(-) 44 20 files changed, 202 insertions(+), 18 deletions(-)
45 rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%) 45 rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%)
46 create mode 100644 gdk/x11/gdkx-without-gl-context.h 46 create mode 100644 gdk/x11/gdkx-without-gl-context.h
47 47
48diff --git a/configure.ac b/configure.ac 48diff --git a/configure.ac b/configure.ac
49index 0a48875..6f0a3a6 100644 49index a91b29c..561d3b5 100644
50--- a/configure.ac 50--- a/configure.ac
51+++ b/configure.ac 51+++ b/configure.ac
52@@ -351,6 +351,15 @@ AC_ARG_ENABLE(cloudproviders, 52@@ -351,6 +351,15 @@ AC_ARG_ENABLE(cloudproviders,
@@ -65,7 +65,7 @@ index 0a48875..6f0a3a6 100644
65 AC_ARG_ENABLE(glx, 65 AC_ARG_ENABLE(glx,
66 [AS_HELP_STRING([--enable-glx], 66 [AS_HELP_STRING([--enable-glx],
67 [When enabled Gdk will try to initialize GLX])]) 67 [When enabled Gdk will try to initialize GLX])])
68@@ -1372,7 +1381,7 @@ CFLAGS="$saved_cflags" 68@@ -1381,7 +1390,7 @@ CFLAGS="$saved_cflags"
69 LDFLAGS="$saved_ldflags" 69 LDFLAGS="$saved_ldflags"
70 70
71 GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" 71 GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
@@ -74,7 +74,7 @@ index 0a48875..6f0a3a6 100644
74 74
75 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) 75 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
76 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" 76 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
77@@ -1406,7 +1415,7 @@ fi 77@@ -1415,7 +1424,7 @@ fi
78 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) 78 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
79 79
80 GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version" 80 GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
@@ -224,12 +224,12 @@ index 40225e9..c55e1de 100644
224 224
225 GdkRenderingMode 225 GdkRenderingMode
226diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c 226diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
227index 8e7b8c2..b579b22 100644 227index 933e204..1767508 100644
228--- a/gdk/gdkgl.c 228--- a/gdk/gdkgl.c
229+++ b/gdk/gdkgl.c 229+++ b/gdk/gdkgl.c
230@@ -22,7 +22,9 @@ 230@@ -26,7 +26,9 @@
231 231 # include "win32/gdkwin32.h"
232 #include "gdkinternals.h" 232 #endif
233 233
234+#ifdef HAVE_OPENGL 234+#ifdef HAVE_OPENGL
235 #include <epoxy/gl.h> 235 #include <epoxy/gl.h>
@@ -237,7 +237,7 @@ index 8e7b8c2..b579b22 100644
237 #include <math.h> 237 #include <math.h>
238 #include <string.h> 238 #include <string.h>
239 239
240@@ -36,6 +38,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface, 240@@ -40,6 +42,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface,
241 g_object_ref (window), g_object_unref); 241 g_object_ref (window), g_object_unref);
242 } 242 }
243 243
@@ -245,7 +245,7 @@ index 8e7b8c2..b579b22 100644
245 static const char * 245 static const char *
246 get_vertex_type_name (int type) 246 get_vertex_type_name (int type)
247 { 247 {
248@@ -208,6 +211,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) 248@@ -212,6 +215,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data)
249 glUseProgram (paint_data->current_program->program); 249 glUseProgram (paint_data->current_program->program);
250 } 250 }
251 } 251 }
@@ -253,7 +253,7 @@ index 8e7b8c2..b579b22 100644
253 253
254 void 254 void
255 gdk_gl_texture_quads (GdkGLContext *paint_context, 255 gdk_gl_texture_quads (GdkGLContext *paint_context,
256@@ -216,6 +220,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, 256@@ -220,6 +224,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
257 GdkTexturedQuad *quads, 257 GdkTexturedQuad *quads,
258 gboolean flip_colors) 258 gboolean flip_colors)
259 { 259 {
@@ -261,7 +261,7 @@ index 8e7b8c2..b579b22 100644
261 GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context); 261 GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context);
262 GdkGLContextProgram *program; 262 GdkGLContextProgram *program;
263 GdkWindow *window = gdk_gl_context_get_window (paint_context); 263 GdkWindow *window = gdk_gl_context_get_window (paint_context);
264@@ -289,6 +294,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, 264@@ -293,6 +298,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
265 265
266 glDisableVertexAttribArray (program->position_location); 266 glDisableVertexAttribArray (program->position_location);
267 glDisableVertexAttribArray (program->uv_location); 267 glDisableVertexAttribArray (program->uv_location);
@@ -269,7 +269,7 @@ index 8e7b8c2..b579b22 100644
269 } 269 }
270 270
271 /* x,y,width,height describes a rectangle in the gl render buffer 271 /* x,y,width,height describes a rectangle in the gl render buffer
272@@ -337,6 +343,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, 272@@ -341,6 +347,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr,
273 int width, 273 int width,
274 int height) 274 int height)
275 { 275 {
@@ -277,7 +277,7 @@ index 8e7b8c2..b579b22 100644
277 GdkGLContext *paint_context; 277 GdkGLContext *paint_context;
278 cairo_surface_t *image; 278 cairo_surface_t *image;
279 cairo_matrix_t matrix; 279 cairo_matrix_t matrix;
280@@ -707,6 +714,7 @@ out: 280@@ -718,6 +725,7 @@ out:
281 if (clip_region) 281 if (clip_region)
282 cairo_region_destroy (clip_region); 282 cairo_region_destroy (clip_region);
283 283
@@ -285,7 +285,7 @@ index 8e7b8c2..b579b22 100644
285 } 285 }
286 286
287 /* This is always called with the paint context current */ 287 /* This is always called with the paint context current */
288@@ -714,6 +722,7 @@ void 288@@ -725,6 +733,7 @@ void
289 gdk_gl_texture_from_surface (cairo_surface_t *surface, 289 gdk_gl_texture_from_surface (cairo_surface_t *surface,
290 cairo_region_t *region) 290 cairo_region_t *region)
291 { 291 {
@@ -293,14 +293,14 @@ index 8e7b8c2..b579b22 100644
293 GdkGLContext *paint_context; 293 GdkGLContext *paint_context;
294 cairo_surface_t *image; 294 cairo_surface_t *image;
295 double device_x_offset, device_y_offset; 295 double device_x_offset, device_y_offset;
296@@ -814,4 +823,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, 296@@ -825,4 +834,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface,
297 297
298 glDisable (GL_SCISSOR_TEST); 298 glDisable (GL_SCISSOR_TEST);
299 glDeleteTextures (1, &texture_id); 299 glDeleteTextures (1, &texture_id);
300+#endif 300+#endif
301 } 301 }
302diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c 302diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
303index c79dca0..8a7bec2 100644 303index dfbed63..556f0a3 100644
304--- a/gdk/gdkglcontext.c 304--- a/gdk/gdkglcontext.c
305+++ b/gdk/gdkglcontext.c 305+++ b/gdk/gdkglcontext.c
306@@ -85,7 +85,9 @@ 306@@ -85,7 +85,9 @@
@@ -337,7 +337,7 @@ index c79dca0..8a7bec2 100644
337 GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); 337 GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
338 gboolean has_npot, has_texture_rectangle; 338 gboolean has_npot, has_texture_rectangle;
339 339
340@@ -847,6 +852,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) 340@@ -853,6 +858,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
341 priv->use_texture_rectangle ? "yes" : "no")); 341 priv->use_texture_rectangle ? "yes" : "no"));
342 342
343 priv->extensions_checked = TRUE; 343 priv->extensions_checked = TRUE;
@@ -346,7 +346,7 @@ index c79dca0..8a7bec2 100644
346 346
347 /** 347 /**
348diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c 348diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
349index c0e0a7d..437ab03 100644 349index 6b231f0..904b86d 100644
350--- a/gdk/gdkwindow.c 350--- a/gdk/gdkwindow.c
351+++ b/gdk/gdkwindow.c 351+++ b/gdk/gdkwindow.c
352@@ -45,7 +45,9 @@ 352@@ -45,7 +45,9 @@
@@ -478,7 +478,7 @@ index 6289f3a..cbbac79 100644
478+ 478+
479 -include $(top_srcdir)/git.mk 479 -include $(top_srcdir)/git.mk
480diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c 480diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
481index e9a263f..2829a31 100644 481index 659b9fa..b15536b 100644
482--- a/gdk/x11/gdkdisplay-x11.c 482--- a/gdk/x11/gdkdisplay-x11.c
483+++ b/gdk/x11/gdkdisplay-x11.c 483+++ b/gdk/x11/gdkdisplay-x11.c
484@@ -37,7 +37,9 @@ 484@@ -37,7 +37,9 @@
@@ -491,7 +491,7 @@ index e9a263f..2829a31 100644
491 #include "gdk-private.h" 491 #include "gdk-private.h"
492 492
493 #include <glib.h> 493 #include <glib.h>
494@@ -3169,7 +3171,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) 494@@ -3194,7 +3196,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
495 display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list; 495 display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list;
496 display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target; 496 display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target;
497 497
@@ -503,10 +503,10 @@ index e9a263f..2829a31 100644
503 display_class->get_default_seat = gdk_x11_display_get_default_seat; 503 display_class->get_default_seat = gdk_x11_display_get_default_seat;
504 504
505diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c 505diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
506index 7bf9979..cd1cc9d 100644 506index 272cecd..2bb34ac 100644
507--- a/gdk/x11/gdkscreen-x11.c 507--- a/gdk/x11/gdkscreen-x11.c
508+++ b/gdk/x11/gdkscreen-x11.c 508+++ b/gdk/x11/gdkscreen-x11.c
509@@ -1643,3 +1643,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) 509@@ -1675,3 +1675,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen)
510 { 510 {
511 return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP"); 511 return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP");
512 } 512 }
@@ -516,7 +516,7 @@ index 7bf9979..cd1cc9d 100644
516+void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} 516+void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {}
517+#endif 517+#endif
518diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c 518diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
519index 3d6fd3b..2bd5c87 100644 519index c6205e4..df2334f 100644
520--- a/gdk/x11/gdkwindow-x11.c 520--- a/gdk/x11/gdkwindow-x11.c
521+++ b/gdk/x11/gdkwindow-x11.c 521+++ b/gdk/x11/gdkwindow-x11.c
522@@ -36,7 +36,9 @@ 522@@ -36,7 +36,9 @@
@@ -529,7 +529,7 @@ index 3d6fd3b..2bd5c87 100644
529 #include "gdkprivate-x11.h" 529 #include "gdkprivate-x11.h"
530 #include "gdk-private.h" 530 #include "gdk-private.h"
531 531
532@@ -5801,7 +5803,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) 532@@ -5804,7 +5806,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
533 impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; 533 impl_class->set_opaque_region = gdk_x11_window_set_opaque_region;
534 impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; 534 impl_class->set_shadow_width = gdk_x11_window_set_shadow_width;
535 impl_class->show_window_menu = gdk_x11_window_show_window_menu; 535 impl_class->show_window_menu = gdk_x11_window_show_window_menu;
@@ -633,10 +633,10 @@ index 0000000..c9e2617
633+ 633+
634+#endif /* __GDK_X_H__ */ 634+#endif /* __GDK_X_H__ */
635diff --git a/gtk/Makefile.am b/gtk/Makefile.am 635diff --git a/gtk/Makefile.am b/gtk/Makefile.am
636index 842c2f9..0921bc7 100644 636index 5594429..2259bb3 100644
637--- a/gtk/Makefile.am 637--- a/gtk/Makefile.am
638+++ b/gtk/Makefile.am 638+++ b/gtk/Makefile.am
639@@ -1416,14 +1416,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. 639@@ -1434,14 +1434,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.
640 && cp xgen-gptbc gtkprivatetypebuiltins.c \ 640 && cp xgen-gptbc gtkprivatetypebuiltins.c \
641 && rm -f xgen-gptbc 641 && rm -f xgen-gptbc
642 642
@@ -650,10 +650,10 @@ index 842c2f9..0921bc7 100644
650- $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' >> xgen-gtf \ 650- $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' >> xgen-gtf \
651+ $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; s/^.*gdk_x11_gl.*$$/#ifdef HAVE_OPENGL\n&\n#endif/; }' >> xgen-gtf \ 651+ $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; s/^.*gdk_x11_gl.*$$/#ifdef HAVE_OPENGL\n&\n#endif/; }' >> xgen-gtf \
652 && cp xgen-gtf $@ && rm -f xgen-gtf 652 && cp xgen-gtf $@ && rm -f xgen-gtf
653 gtktestutils.c: gtktypefuncs.c 653 $(srcdir)/gtktestutils.c: gtktypefuncs.c
654 654
655diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c 655diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
656index 094378e..f7c7f47 100644 656index ea383c0..bb4eb64 100644
657--- a/gtk/gtkglarea.c 657--- a/gtk/gtkglarea.c
658+++ b/gtk/gtkglarea.c 658+++ b/gtk/gtkglarea.c
659@@ -28,7 +28,9 @@ 659@@ -28,7 +28,9 @@
@@ -796,7 +796,7 @@ index c241ec8..24576dd 100644
796 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) 796 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
797 { 797 {
798diff --git a/tests/Makefile.am b/tests/Makefile.am 798diff --git a/tests/Makefile.am b/tests/Makefile.am
799index e2db6e4..e51cf34 100644 799index 7c5ca99..e4a4546 100644
800--- a/tests/Makefile.am 800--- a/tests/Makefile.am
801+++ b/tests/Makefile.am 801+++ b/tests/Makefile.am
802@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ 802@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \
@@ -808,7 +808,7 @@ index e2db6e4..e51cf34 100644
808 testgrid \ 808 testgrid \
809 testgtk \ 809 testgtk \
810 testheaderbar \ 810 testheaderbar \
811@@ -170,12 +168,18 @@ noinst_PROGRAMS = $(TEST_PROGS) \ 811@@ -172,12 +170,18 @@ noinst_PROGRAMS = $(TEST_PROGS) \
812 testactionbar \ 812 testactionbar \
813 testwindowsize \ 813 testwindowsize \
814 testpopover \ 814 testpopover \
@@ -842,6 +842,3 @@ index 0b3a519..07b096f 100644
842 #endif 842 #endif
843 /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ 843 /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */
844 all_types[i] != GDK_TYPE_PIXBUF_LOADER && 844 all_types[i] != GDK_TYPE_PIXBUF_LOADER &&
845--
8462.14.1
847
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb
index 697b518544..6de3e73f2f 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb
@@ -7,8 +7,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
7 file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ 7 file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
8 file://0003-Add-disable-opengl-configure-option.patch \ 8 file://0003-Add-disable-opengl-configure-option.patch \
9 " 9 "
10SRC_URI[md5sum] = "61e60dc073e0a6893c72043d20579dc0" 10SRC_URI[md5sum] = "9dfe16f486573815f242fa400763feb7"
11SRC_URI[sha256sum] = "a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567" 11SRC_URI[sha256sum] = "68387be307b99aadcdc653561d7a2a7f0113b93561fb18ded7075ec9ced5b02f"
12 12
13S = "${WORKDIR}/gtk+-${PV}" 13S = "${WORKDIR}/gtk+-${PV}"
14 14