diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-05 16:43:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-09 12:00:42 +0000 |
commit | 491aac8f8f46bd5501203fef57e33f3ed871555c (patch) | |
tree | 0a84a7e42949040d87b2dc0ab559c651d18f6c39 | |
parent | e978f1e82aae8bb3decbb34254828f83cb14e271 (diff) | |
download | poky-491aac8f8f46bd5501203fef57e33f3ed871555c.tar.gz |
gtk+3: update to 3.24.13
(From OE-Core rev: ce21d9ada5d040b40e5a310ea150d2fbb6985c9f)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch | 15 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch | 103 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb (renamed from meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb) | 4 |
3 files changed, 56 insertions, 66 deletions
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 cc7edf7607..80dc2d7a05 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,7 +1,7 @@ | |||
1 | From 23a563155406980dfc8cf6f7c2da6cce0ac310f0 Mon Sep 17 00:00:00 2001 | 1 | From 6575ab0f0e8c1bba033ad1616511e37a2ec995ff Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Fri, 16 Oct 2015 16:35:16 +0300 | 3 | Date: Fri, 16 Oct 2015 16:35:16 +0300 |
4 | Subject: [PATCH 2/4] Do not try to initialize GL without libGL | 4 | Subject: [PATCH] Do not try to initialize GL without libGL |
5 | 5 | ||
6 | _gdk_x11_screen_update_visuals_for_gl() will end up calling epoxys | 6 | _gdk_x11_screen_update_visuals_for_gl() will end up calling epoxys |
7 | GLX api which will exit() if libGL.so.1 is not present. We do not | 7 | GLX api which will exit() if libGL.so.1 is not present. We do not |
@@ -22,10 +22,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
22 | 2 files changed, 11 insertions(+) | 22 | 2 files changed, 11 insertions(+) |
23 | 23 | ||
24 | diff --git a/configure.ac b/configure.ac | 24 | diff --git a/configure.ac b/configure.ac |
25 | index 757fd7c..0a48875 100644 | 25 | index e9f5583..bd651bb 100644 |
26 | --- a/configure.ac | 26 | --- a/configure.ac |
27 | +++ b/configure.ac | 27 | +++ b/configure.ac |
28 | @@ -351,6 +351,12 @@ AC_ARG_ENABLE(cloudproviders, | 28 | @@ -346,6 +346,12 @@ AC_ARG_ENABLE(cloudproviders, |
29 | [AS_HELP_STRING([--enable-cloudproviders], | 29 | [AS_HELP_STRING([--enable-cloudproviders], |
30 | [enable libcloudproviders integration])], | 30 | [enable libcloudproviders integration])], |
31 | [cloudproviders_set=yes]) | 31 | [cloudproviders_set=yes]) |
@@ -36,8 +36,8 @@ index 757fd7c..0a48875 100644 | |||
36 | + AC_DEFINE([HAVE_GLX], [], [GLX will be available at runtime]) | 36 | + AC_DEFINE([HAVE_GLX], [], [GLX will be available at runtime]) |
37 | +]) | 37 | +]) |
38 | 38 | ||
39 | if test -z "$backend_set"; then | 39 | AC_ARG_ENABLE(profiler, |
40 | if test "$platform_win32" = yes; then | 40 | [AS_HELP_STRING([--enable-profiler], |
41 | diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c | 41 | diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c |
42 | index 81479d8..3c8c5c0 100644 | 42 | index 81479d8..3c8c5c0 100644 |
43 | --- a/gdk/x11/gdkvisual-x11.c | 43 | --- a/gdk/x11/gdkvisual-x11.c |
@@ -55,6 +55,3 @@ index 81479d8..3c8c5c0 100644 | |||
55 | } | 55 | } |
56 | 56 | ||
57 | gint | 57 | gint |
58 | -- | ||
59 | 2.14.1 | ||
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 852dc9dfcd..398c9bc36a 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,4 +1,4 @@ | |||
1 | From d11b41a7ff0234f3832d6aabdf498807d1463c18 Mon Sep 17 00:00:00 2001 | 1 | From f83fcf1991afad6d9c15546b2ccd775dad4e314c Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Tue, 21 Jun 2016 15:11:39 +0300 | 3 | Date: Tue, 21 Jun 2016 15:11:39 +0300 |
4 | Subject: [PATCH] Add --disable-opengl configure option | 4 | Subject: [PATCH] Add --disable-opengl configure option |
@@ -37,20 +37,20 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
37 | gdk/x11/gdkx-autocleanups.h | 2 + | 37 | gdk/x11/gdkx-autocleanups.h | 2 + |
38 | gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 1 - | 38 | gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 1 - |
39 | gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++ | 39 | gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++ |
40 | gtk/Makefile.am | 3 +- | 40 | gtk/Makefile.am | 2 +- |
41 | gtk/gtkglarea.c | 20 +++++++- | 41 | gtk/gtkglarea.c | 20 +++++++- |
42 | gtk/inspector/general.c | 6 +++ | 42 | gtk/inspector/general.c | 6 +++ |
43 | tests/Makefile.am | 10 ++-- | 43 | tests/Makefile.am | 10 ++-- |
44 | testsuite/gtk/objects-finalize.c | 2 + | 44 | testsuite/gtk/objects-finalize.c | 2 + |
45 | 21 files changed, 208 insertions(+), 20 deletions(-) | 45 | 21 files changed, 208 insertions(+), 19 deletions(-) |
46 | rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%) | 46 | rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%) |
47 | create mode 100644 gdk/x11/gdkx-without-gl-context.h | 47 | create mode 100644 gdk/x11/gdkx-without-gl-context.h |
48 | 48 | ||
49 | diff --git a/configure.ac b/configure.ac | 49 | diff --git a/configure.ac b/configure.ac |
50 | index 2c4733b..18ae66c 100644 | 50 | index bd651bb..b4c061f 100644 |
51 | --- a/configure.ac | 51 | --- a/configure.ac |
52 | +++ b/configure.ac | 52 | +++ b/configure.ac |
53 | @@ -352,6 +352,15 @@ AC_ARG_ENABLE(cloudproviders, | 53 | @@ -346,6 +346,15 @@ AC_ARG_ENABLE(cloudproviders, |
54 | [AS_HELP_STRING([--enable-cloudproviders], | 54 | [AS_HELP_STRING([--enable-cloudproviders], |
55 | [enable libcloudproviders integration])], | 55 | [enable libcloudproviders integration])], |
56 | [cloudproviders_set=yes]) | 56 | [cloudproviders_set=yes]) |
@@ -66,21 +66,21 @@ index 2c4733b..18ae66c 100644 | |||
66 | AC_ARG_ENABLE(glx, | 66 | AC_ARG_ENABLE(glx, |
67 | [AS_HELP_STRING([--enable-glx], | 67 | [AS_HELP_STRING([--enable-glx], |
68 | [When enabled Gdk will try to initialize GLX])]) | 68 | [When enabled Gdk will try to initialize GLX])]) |
69 | @@ -1370,7 +1379,7 @@ CFLAGS="$saved_cflags" | 69 | @@ -1345,7 +1354,7 @@ CFLAGS="$saved_cflags" |
70 | LDFLAGS="$saved_ldflags" | 70 | LDFLAGS="$saved_ldflags" |
71 | 71 | ||
72 | GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" | 72 | GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" |
73 | -GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES fribidi >= fribidi_required_version" | 73 | -GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version" |
74 | +GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends $EPOXY_PACKAGES $CLOUDPROVIDER_PACKAGES fribidi >= fribidi_required_version" | 74 | +GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends $EPOXY_PACKAGES $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version" |
75 | 75 | ||
76 | PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) | 76 | PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) |
77 | GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" | 77 | GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" |
78 | @@ -1404,7 +1413,7 @@ fi | 78 | @@ -1379,7 +1388,7 @@ fi |
79 | PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) | 79 | PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) |
80 | 80 | ||
81 | 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" | 81 | 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" |
82 | -GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version" | 82 | -GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version" |
83 | +GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $EPOXY_PACKAGES fribidi >= fribidi_required_version" | 83 | +GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $EPOXY_PACKAGES fribidi >= fribidi_required_version" |
84 | if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then | 84 | if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then |
85 | GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" | 85 | GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" |
86 | fi | 86 | fi |
@@ -168,7 +168,7 @@ index b51e4ae..82409c7 100644 | |||
168 | return TRUE; | 168 | return TRUE; |
169 | } | 169 | } |
170 | diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am | 170 | diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am |
171 | index 6a6d70f..5cdf312 100644 | 171 | index bec43e3..189e8fc 100644 |
172 | --- a/docs/tools/Makefile.am | 172 | --- a/docs/tools/Makefile.am |
173 | +++ b/docs/tools/Makefile.am | 173 | +++ b/docs/tools/Makefile.am |
174 | @@ -9,13 +9,18 @@ AM_CPPFLAGS = \ | 174 | @@ -9,13 +9,18 @@ AM_CPPFLAGS = \ |
@@ -210,7 +210,7 @@ index 932daf1..54239d6 100644 | |||
210 | 210 | ||
211 | return info; | 211 | return info; |
212 | diff --git a/gdk/Makefile.am b/gdk/Makefile.am | 212 | diff --git a/gdk/Makefile.am b/gdk/Makefile.am |
213 | index 689ee52..d6b4e70 100644 | 213 | index 479d6a1..7edbee8 100644 |
214 | --- a/gdk/Makefile.am | 214 | --- a/gdk/Makefile.am |
215 | +++ b/gdk/Makefile.am | 215 | +++ b/gdk/Makefile.am |
216 | @@ -274,7 +274,6 @@ x11_introspection_files = \ | 216 | @@ -274,7 +274,6 @@ x11_introspection_files = \ |
@@ -243,10 +243,10 @@ index 689ee52..d6b4e70 100644 | |||
243 | GdkX11_3_0_gir_SCANNERFLAGS = \ | 243 | GdkX11_3_0_gir_SCANNERFLAGS = \ |
244 | --identifier-prefix=Gdk \ | 244 | --identifier-prefix=Gdk \ |
245 | diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c | 245 | diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c |
246 | index 06d4187..832711c 100644 | 246 | index 240c99f..9eb49bf 100644 |
247 | --- a/gdk/gdkdisplay.c | 247 | --- a/gdk/gdkdisplay.c |
248 | +++ b/gdk/gdkdisplay.c | 248 | +++ b/gdk/gdkdisplay.c |
249 | @@ -2416,7 +2416,9 @@ gboolean | 249 | @@ -2419,7 +2419,9 @@ gboolean |
250 | gdk_display_make_gl_context_current (GdkDisplay *display, | 250 | gdk_display_make_gl_context_current (GdkDisplay *display, |
251 | GdkGLContext *context) | 251 | GdkGLContext *context) |
252 | { | 252 | { |
@@ -380,7 +380,7 @@ index dfbed63..556f0a3 100644 | |||
380 | 380 | ||
381 | /** | 381 | /** |
382 | diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c | 382 | diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c |
383 | index 1416409..e3b5630 100644 | 383 | index 6ae0f86..4e48a2a 100644 |
384 | --- a/gdk/gdkwindow.c | 384 | --- a/gdk/gdkwindow.c |
385 | +++ b/gdk/gdkwindow.c | 385 | +++ b/gdk/gdkwindow.c |
386 | @@ -45,7 +45,9 @@ | 386 | @@ -45,7 +45,9 @@ |
@@ -393,7 +393,7 @@ index 1416409..e3b5630 100644 | |||
393 | 393 | ||
394 | /* for the use of round() */ | 394 | /* for the use of round() */ |
395 | #include "fallback-c89.c" | 395 | #include "fallback-c89.c" |
396 | @@ -2822,6 +2824,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window, | 396 | @@ -2844,6 +2846,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window, |
397 | { | 397 | { |
398 | GError *internal_error = NULL; | 398 | GError *internal_error = NULL; |
399 | 399 | ||
@@ -407,7 +407,7 @@ index 1416409..e3b5630 100644 | |||
407 | if (_gdk_gl_flags & GDK_GL_DISABLE) | 407 | if (_gdk_gl_flags & GDK_GL_DISABLE) |
408 | { | 408 | { |
409 | g_set_error_literal (error, GDK_GL_ERROR, | 409 | g_set_error_literal (error, GDK_GL_ERROR, |
410 | @@ -2957,6 +2966,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, | 410 | @@ -2979,6 +2988,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, |
411 | } | 411 | } |
412 | else | 412 | else |
413 | { | 413 | { |
@@ -415,7 +415,7 @@ index 1416409..e3b5630 100644 | |||
415 | gdk_gl_context_make_current (context); | 415 | gdk_gl_context_make_current (context); |
416 | /* With gl we always need a surface to combine the gl | 416 | /* With gl we always need a surface to combine the gl |
417 | drawing with the native drawing. */ | 417 | drawing with the native drawing. */ |
418 | @@ -2971,6 +2981,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, | 418 | @@ -2993,6 +3003,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, |
419 | glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); | 419 | glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); |
420 | 420 | ||
421 | glViewport (0, 0, ww, wh); | 421 | glViewport (0, 0, ww, wh); |
@@ -423,7 +423,7 @@ index 1416409..e3b5630 100644 | |||
423 | } | 423 | } |
424 | } | 424 | } |
425 | 425 | ||
426 | @@ -3034,6 +3045,7 @@ gdk_window_end_paint_internal (GdkWindow *window) | 426 | @@ -3056,6 +3067,7 @@ gdk_window_end_paint_internal (GdkWindow *window) |
427 | 427 | ||
428 | gdk_gl_context_make_current (window->gl_paint_context); | 428 | gdk_gl_context_make_current (window->gl_paint_context); |
429 | 429 | ||
@@ -431,7 +431,7 @@ index 1416409..e3b5630 100644 | |||
431 | if (!cairo_region_is_empty (opaque_region)) | 431 | if (!cairo_region_is_empty (opaque_region)) |
432 | gdk_gl_texture_from_surface (window->current_paint.surface, | 432 | gdk_gl_texture_from_surface (window->current_paint.surface, |
433 | opaque_region); | 433 | opaque_region); |
434 | @@ -3044,6 +3056,7 @@ gdk_window_end_paint_internal (GdkWindow *window) | 434 | @@ -3066,6 +3078,7 @@ gdk_window_end_paint_internal (GdkWindow *window) |
435 | window->current_paint.need_blend_region); | 435 | window->current_paint.need_blend_region); |
436 | glDisable(GL_BLEND); | 436 | glDisable(GL_BLEND); |
437 | } | 437 | } |
@@ -440,7 +440,7 @@ index 1416409..e3b5630 100644 | |||
440 | cairo_region_destroy (opaque_region); | 440 | cairo_region_destroy (opaque_region); |
441 | 441 | ||
442 | diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am | 442 | diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am |
443 | index 6289f3a..cbbac79 100644 | 443 | index 32b1f24..6352313 100644 |
444 | --- a/gdk/x11/Makefile.am | 444 | --- a/gdk/x11/Makefile.am |
445 | +++ b/gdk/x11/Makefile.am | 445 | +++ b/gdk/x11/Makefile.am |
446 | @@ -40,8 +40,6 @@ libgdk_x11_la_SOURCES = \ | 446 | @@ -40,8 +40,6 @@ libgdk_x11_la_SOURCES = \ |
@@ -494,7 +494,7 @@ index 6289f3a..cbbac79 100644 | |||
494 | gdkx11keys.h \ | 494 | gdkx11keys.h \ |
495 | gdkx11monitor.h \ | 495 | gdkx11monitor.h \ |
496 | gdkx11property.h \ | 496 | gdkx11property.h \ |
497 | @@ -87,9 +102,16 @@ libgdkx11include_HEADERS = \ | 497 | @@ -87,10 +102,17 @@ libgdkx11include_HEADERS = \ |
498 | gdkx11visual.h \ | 498 | gdkx11visual.h \ |
499 | gdkx11window.h | 499 | gdkx11window.h |
500 | 500 | ||
@@ -506,13 +506,14 @@ index 6289f3a..cbbac79 100644 | |||
506 | # don't seem to be correctly expanded for the dist files. | 506 | # don't seem to be correctly expanded for the dist files. |
507 | EXTRA_DIST += \ | 507 | EXTRA_DIST += \ |
508 | + gdkx.h \ | 508 | + gdkx.h \ |
509 | gdksettings.c | 509 | gdksettings.c \ |
510 | meson.build | ||
510 | 511 | ||
511 | +MAINTAINERCLEANFILES = gdkx.h | 512 | +MAINTAINERCLEANFILES = gdkx.h |
512 | + | 513 | + |
513 | -include $(top_srcdir)/git.mk | 514 | -include $(top_srcdir)/git.mk |
514 | diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c | 515 | diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c |
515 | index 5b95196..9a2f2a2 100644 | 516 | index 817944e..e7a2947 100644 |
516 | --- a/gdk/x11/gdkdisplay-x11.c | 517 | --- a/gdk/x11/gdkdisplay-x11.c |
517 | +++ b/gdk/x11/gdkdisplay-x11.c | 518 | +++ b/gdk/x11/gdkdisplay-x11.c |
518 | @@ -37,7 +37,9 @@ | 519 | @@ -37,7 +37,9 @@ |
@@ -523,9 +524,9 @@ index 5b95196..9a2f2a2 100644 | |||
523 | #include "gdkglcontext-x11.h" | 524 | #include "gdkglcontext-x11.h" |
524 | +#endif | 525 | +#endif |
525 | #include "gdk-private.h" | 526 | #include "gdk-private.h" |
527 | #include "gdkprofilerprivate.h" | ||
526 | 528 | ||
527 | #include <glib.h> | 529 | @@ -3188,7 +3190,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) |
528 | @@ -3184,7 +3186,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) | ||
529 | display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list; | 530 | display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list; |
530 | display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target; | 531 | display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target; |
531 | 532 | ||
@@ -537,10 +538,10 @@ index 5b95196..9a2f2a2 100644 | |||
537 | display_class->get_default_seat = gdk_x11_display_get_default_seat; | 538 | display_class->get_default_seat = gdk_x11_display_get_default_seat; |
538 | 539 | ||
539 | diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c | 540 | diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c |
540 | index 272cecd..2bb34ac 100644 | 541 | index 8939ae9..931bff9 100644 |
541 | --- a/gdk/x11/gdkscreen-x11.c | 542 | --- a/gdk/x11/gdkscreen-x11.c |
542 | +++ b/gdk/x11/gdkscreen-x11.c | 543 | +++ b/gdk/x11/gdkscreen-x11.c |
543 | @@ -1675,3 +1675,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) | 544 | @@ -1723,3 +1723,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) |
544 | { | 545 | { |
545 | return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP"); | 546 | return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP"); |
546 | } | 547 | } |
@@ -550,7 +551,7 @@ index 272cecd..2bb34ac 100644 | |||
550 | +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} | 551 | +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} |
551 | +#endif | 552 | +#endif |
552 | diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c | 553 | diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c |
553 | index f92a146..89f900a 100644 | 554 | index 1fe7b90..d23a347 100644 |
554 | --- a/gdk/x11/gdkwindow-x11.c | 555 | --- a/gdk/x11/gdkwindow-x11.c |
555 | +++ b/gdk/x11/gdkwindow-x11.c | 556 | +++ b/gdk/x11/gdkwindow-x11.c |
556 | @@ -36,7 +36,9 @@ | 557 | @@ -36,7 +36,9 @@ |
@@ -563,7 +564,7 @@ index f92a146..89f900a 100644 | |||
563 | #include "gdkprivate-x11.h" | 564 | #include "gdkprivate-x11.h" |
564 | #include "gdk-private.h" | 565 | #include "gdk-private.h" |
565 | 566 | ||
566 | @@ -5839,7 +5841,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) | 567 | @@ -5861,7 +5863,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) |
567 | impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; | 568 | impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; |
568 | impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; | 569 | impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; |
569 | impl_class->show_window_menu = gdk_x11_window_show_window_menu; | 570 | impl_class->show_window_menu = gdk_x11_window_show_window_menu; |
@@ -667,31 +668,23 @@ index 0000000..c9e2617 | |||
667 | + | 668 | + |
668 | +#endif /* __GDK_X_H__ */ | 669 | +#endif /* __GDK_X_H__ */ |
669 | diff --git a/gtk/Makefile.am b/gtk/Makefile.am | 670 | diff --git a/gtk/Makefile.am b/gtk/Makefile.am |
670 | index e556e9d..ce912d7 100644 | 671 | index eaca473..99352d1 100644 |
671 | --- a/gtk/Makefile.am | 672 | --- a/gtk/Makefile.am |
672 | +++ b/gtk/Makefile.am | 673 | +++ b/gtk/Makefile.am |
673 | @@ -1441,7 +1441,6 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. | 674 | @@ -1449,7 +1449,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s |
674 | && cp xgen-gptbc gtkprivatetypebuiltins.c \ | ||
675 | && rm -f xgen-gptbc | ||
676 | |||
677 | - | ||
678 | gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile | ||
679 | $(AM_V_GEN) export LC_ALL=C ; \ | ||
680 | (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtkx.h>') > xgen-gtfsrc.c && \ | ||
681 | @@ -1449,7 +1448,7 @@ gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_src | ||
682 | ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ | 675 | ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ |
683 | $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \ | 676 | $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \ |
684 | sort | uniq | \ | 677 | sort | uniq | \ |
685 | - $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' >> xgen-gtf \ | 678 | - $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' >> xgen-gtf \ |
686 | + $(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 \ | 679 | + $(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 \ |
687 | && cp xgen-gtf $@ && rm -f xgen-gtf | 680 | && cp xgen-gtf $@ && rm -f xgen-gtf |
688 | $(srcdir)/gtktestutils.c: gtktypefuncs.c | 681 | $(srcdir)/gtktestutils.c: gtktypefuncs.inc |
689 | 682 | ||
690 | diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c | 683 | diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c |
691 | index ea383c0..bb4eb64 100644 | 684 | index 9a56443..7de0db2 100644 |
692 | --- a/gtk/gtkglarea.c | 685 | --- a/gtk/gtkglarea.c |
693 | +++ b/gtk/gtkglarea.c | 686 | +++ b/gtk/gtkglarea.c |
694 | @@ -28,7 +28,9 @@ | 687 | @@ -29,7 +29,9 @@ |
695 | #include "gtkprivate.h" | 688 | #include "gtkprivate.h" |
696 | #include "gtkrender.h" | 689 | #include "gtkrender.h" |
697 | 690 | ||
@@ -701,7 +694,7 @@ index ea383c0..bb4eb64 100644 | |||
701 | 694 | ||
702 | /** | 695 | /** |
703 | * SECTION:gtkglarea | 696 | * SECTION:gtkglarea |
704 | @@ -368,9 +370,12 @@ gtk_gl_area_real_create_context (GtkGLArea *area) | 697 | @@ -369,9 +371,12 @@ gtk_gl_area_real_create_context (GtkGLArea *area) |
705 | static void | 698 | static void |
706 | gtk_gl_area_resize (GtkGLArea *area, int width, int height) | 699 | gtk_gl_area_resize (GtkGLArea *area, int width, int height) |
707 | { | 700 | { |
@@ -714,7 +707,7 @@ index ea383c0..bb4eb64 100644 | |||
714 | /* | 707 | /* |
715 | * Creates all the buffer objects needed for rendering the scene | 708 | * Creates all the buffer objects needed for rendering the scene |
716 | */ | 709 | */ |
717 | @@ -482,6 +487,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area) | 710 | @@ -483,6 +488,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area) |
718 | 711 | ||
719 | priv->needs_render = TRUE; | 712 | priv->needs_render = TRUE; |
720 | } | 713 | } |
@@ -722,7 +715,7 @@ index ea383c0..bb4eb64 100644 | |||
722 | 715 | ||
723 | /** | 716 | /** |
724 | * gtk_gl_area_attach_buffers: | 717 | * gtk_gl_area_attach_buffers: |
725 | @@ -500,6 +506,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area) | 718 | @@ -501,6 +507,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area) |
726 | void | 719 | void |
727 | gtk_gl_area_attach_buffers (GtkGLArea *area) | 720 | gtk_gl_area_attach_buffers (GtkGLArea *area) |
728 | { | 721 | { |
@@ -730,7 +723,7 @@ index ea383c0..bb4eb64 100644 | |||
730 | GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); | 723 | GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); |
731 | 724 | ||
732 | g_return_if_fail (GTK_IS_GL_AREA (area)); | 725 | g_return_if_fail (GTK_IS_GL_AREA (area)); |
733 | @@ -532,11 +539,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area) | 726 | @@ -533,11 +540,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area) |
734 | glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, | 727 | glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, |
735 | GL_RENDERBUFFER_EXT, priv->depth_stencil_buffer); | 728 | GL_RENDERBUFFER_EXT, priv->depth_stencil_buffer); |
736 | } | 729 | } |
@@ -744,7 +737,7 @@ index ea383c0..bb4eb64 100644 | |||
744 | GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); | 737 | GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); |
745 | 738 | ||
746 | if (priv->context == NULL) | 739 | if (priv->context == NULL) |
747 | @@ -568,6 +577,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area) | 740 | @@ -569,6 +578,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area) |
748 | glDeleteFramebuffersEXT (1, &priv->frame_buffer); | 741 | glDeleteFramebuffersEXT (1, &priv->frame_buffer); |
749 | priv->frame_buffer = 0; | 742 | priv->frame_buffer = 0; |
750 | } | 743 | } |
@@ -752,7 +745,7 @@ index ea383c0..bb4eb64 100644 | |||
752 | } | 745 | } |
753 | 746 | ||
754 | static void | 747 | static void |
755 | @@ -678,6 +688,7 @@ gtk_gl_area_draw (GtkWidget *widget, | 748 | @@ -679,6 +689,7 @@ gtk_gl_area_draw (GtkWidget *widget, |
756 | GtkGLArea *area = GTK_GL_AREA (widget); | 749 | GtkGLArea *area = GTK_GL_AREA (widget); |
757 | GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); | 750 | GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); |
758 | gboolean unused; | 751 | gboolean unused; |
@@ -760,7 +753,7 @@ index ea383c0..bb4eb64 100644 | |||
760 | int w, h, scale; | 753 | int w, h, scale; |
761 | GLenum status; | 754 | GLenum status; |
762 | 755 | ||
763 | @@ -689,7 +700,6 @@ gtk_gl_area_draw (GtkWidget *widget, | 756 | @@ -690,7 +701,6 @@ gtk_gl_area_draw (GtkWidget *widget, |
764 | gtk_widget_get_allocated_height (widget)); | 757 | gtk_widget_get_allocated_height (widget)); |
765 | return FALSE; | 758 | return FALSE; |
766 | } | 759 | } |
@@ -768,7 +761,7 @@ index ea383c0..bb4eb64 100644 | |||
768 | if (priv->context == NULL) | 761 | if (priv->context == NULL) |
769 | return FALSE; | 762 | return FALSE; |
770 | 763 | ||
771 | @@ -735,6 +745,14 @@ gtk_gl_area_draw (GtkWidget *widget, | 764 | @@ -736,6 +746,14 @@ gtk_gl_area_draw (GtkWidget *widget, |
772 | } | 765 | } |
773 | 766 | ||
774 | return TRUE; | 767 | return TRUE; |
@@ -831,7 +824,7 @@ index c241ec8..24576dd 100644 | |||
831 | if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) | 824 | if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) |
832 | { | 825 | { |
833 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 826 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
834 | index 7c5ca99..e4a4546 100644 | 827 | index ee1e8b5..e6c6502 100644 |
835 | --- a/tests/Makefile.am | 828 | --- a/tests/Makefile.am |
836 | +++ b/tests/Makefile.am | 829 | +++ b/tests/Makefile.am |
837 | @@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ | 830 | @@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ |
@@ -864,10 +857,10 @@ index 7c5ca99..e4a4546 100644 | |||
864 | noinst_PROGRAMS += testforeign | 857 | noinst_PROGRAMS += testforeign |
865 | endif | 858 | endif |
866 | diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c | 859 | diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c |
867 | index 0b3a519..07b096f 100644 | 860 | index 24540e3..e0f863a 100644 |
868 | --- a/testsuite/gtk/objects-finalize.c | 861 | --- a/testsuite/gtk/objects-finalize.c |
869 | +++ b/testsuite/gtk/objects-finalize.c | 862 | +++ b/testsuite/gtk/objects-finalize.c |
870 | @@ -115,7 +115,9 @@ main (int argc, char **argv) | 863 | @@ -116,7 +116,9 @@ main (int argc, char **argv) |
871 | all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && | 864 | all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && |
872 | all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && | 865 | all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && |
873 | all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && | 866 | all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && |
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb index d79b18bee0..18976b54c5 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb | |||
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar | |||
8 | file://0003-Add-disable-opengl-configure-option.patch \ | 8 | file://0003-Add-disable-opengl-configure-option.patch \ |
9 | file://link_fribidi.patch \ | 9 | file://link_fribidi.patch \ |
10 | " | 10 | " |
11 | SRC_URI[md5sum] = "eeedde01856238114dcf4df3ebc942a5" | 11 | SRC_URI[md5sum] = "f65515e7bfa2199bd2188e871d69c686" |
12 | SRC_URI[sha256sum] = "666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799" | 12 | SRC_URI[sha256sum] = "4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9" |
13 | 13 | ||
14 | S = "${WORKDIR}/gtk+-${PV}" | 14 | S = "${WORKDIR}/gtk+-${PV}" |
15 | 15 | ||