summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-10-09 16:09:14 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-09 12:33:16 +0000
commitdc26a7478894285814b2a1142d1bbe52cd044f1a (patch)
tree4def8a579539b0a92bcc85ffff209dc06156f253 /meta/recipes-gnome
parent5a5971bbab7acb210dfaf10f7bd74e438d697776 (diff)
downloadpoky-dc26a7478894285814b2a1142d1bbe52cd044f1a.tar.gz
gtk+3: update to 3.22.24
Rebase Jussi's GL patches. (From OE-Core rev: 7b23d5a7cbc536b9139f9f53baa1fbe4c50e2135) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch22
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch244
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.22.24.bb (renamed from meta/recipes-gnome/gtk+/gtk+3_3.22.17.bb)4
3 files changed, 76 insertions, 194 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 ab7b659414..cc7edf7607 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 2d2361f24be1e51201063dbbda570debe8702b6f Mon Sep 17 00:00:00 2001 1From 23a563155406980dfc8cf6f7c2da6cce0ac310f0 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
@@ -15,29 +15,29 @@ before calling epoxy APIs.
15 15
16Upstream-Status: Denied 16Upstream-Status: Denied
17Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 17Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
18
18--- 19---
19 configure.ac | 7 +++++++ 20 configure.ac | 6 ++++++
20 gdk/x11/gdkvisual-x11.c | 5 +++++ 21 gdk/x11/gdkvisual-x11.c | 5 +++++
21 2 files changed, 12 insertions(+) 22 2 files changed, 11 insertions(+)
22 23
23diff --git a/configure.ac b/configure.ac 24diff --git a/configure.ac b/configure.ac
24index f43ac09..965eec9 100644 25index 757fd7c..0a48875 100644
25--- a/configure.ac 26--- a/configure.ac
26+++ b/configure.ac 27+++ b/configure.ac
27@@ -346,6 +346,13 @@ AC_ARG_ENABLE(mir-backend, 28@@ -351,6 +351,12 @@ AC_ARG_ENABLE(cloudproviders,
28 [enable the Mir gdk backend])], 29 [AS_HELP_STRING([--enable-cloudproviders],
29 [backend_set=yes]) 30 [enable libcloudproviders integration])],
30 31 [cloudproviders_set=yes])
31+AC_ARG_ENABLE(glx, 32+AC_ARG_ENABLE(glx,
32+ [AS_HELP_STRING([--enable-glx], 33+ [AS_HELP_STRING([--enable-glx],
33+ [When enabled Gdk will try to initialize GLX])]) 34+ [When enabled Gdk will try to initialize GLX])])
34+AS_IF([test "x$enable_glx" != "xno"], [ 35+AS_IF([test "x$enable_glx" != "xno"], [
35+ AC_DEFINE([HAVE_GLX], [], [GLX will be available at runtime]) 36+ AC_DEFINE([HAVE_GLX], [], [GLX will be available at runtime])
36+]) 37+])
37+ 38
38 if test -z "$backend_set"; then 39 if test -z "$backend_set"; then
39 if test "$platform_win32" = yes; then 40 if test "$platform_win32" = yes; then
40 enable_win32_backend=yes
41diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c 41diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
42index 81479d8..3c8c5c0 100644 42index 81479d8..3c8c5c0 100644
43--- a/gdk/x11/gdkvisual-x11.c 43--- a/gdk/x11/gdkvisual-x11.c
@@ -56,5 +56,5 @@ index 81479d8..3c8c5c0 100644
56 56
57 gint 57 gint
58-- 58--
592.12.0 592.14.1
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 9cdee0e54e..d2f12dc7ff 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 @@
1From a2e6b7cbbd6d741fed38d91b3742aa4a08395aba Mon Sep 17 00:00:00 2001 1From de36df70d87ba3453ed4f2b92e990021c67238f5 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 3/4] Add --disable-opengl configure option
@@ -19,41 +19,40 @@ as it actually will depend on OpenGL.
19 19
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---
23 configure.ac | 13 +++++++-- 24 configure.ac | 13 +++++--
24 demos/gtk-demo/glarea.c | 14 +++++++++ 25 demos/gtk-demo/glarea.c | 14 ++++++++
25 docs/tools/Makefile.am | 9 ++++-- 26 docs/tools/Makefile.am | 9 +++--
26 docs/tools/widgets.c | 4 ++- 27 docs/tools/widgets.c | 4 ++-
27 gdk/gdkdisplay.c | 4 ++- 28 gdk/gdkdisplay.c | 4 ++-
28 gdk/gdkgl.c | 10 +++++++ 29 gdk/gdkgl.c | 10 ++++++
29 gdk/gdkglcontext.c | 6 ++++ 30 gdk/gdkglcontext.c | 6 ++++
30 gdk/gdkwindow.c | 13 +++++++++ 31 gdk/gdkwindow.c | 13 +++++++
31 gdk/x11/Makefile.am | 30 +++++++++++++++++--- 32 gdk/x11/Makefile.am | 30 +++++++++++++---
32 gdk/x11/gdkdisplay-x11.c | 6 +++- 33 gdk/x11/gdkdisplay-x11.c | 6 +++-
33 gdk/x11/gdkscreen-x11.c | 5 ++++ 34 gdk/x11/gdkscreen-x11.c | 5 +++
34 gdk/x11/gdkwindow-x11.c | 4 +++ 35 gdk/x11/gdkwindow-x11.c | 4 +++
35 gdk/x11/gdkx-autocleanups.h | 2 ++ 36 gdk/x11/gdkx-autocleanups.h | 2 ++
36 gdk/x11/gdkx-with-gl-context.h | 59 ++++++++++++++++++++++++++++++++++++++ 37 gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 1 -
37 gdk/x11/gdkx-without-gl-context.h | 58 +++++++++++++++++++++++++++++++++++++ 38 gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++
38 gdk/x11/gdkx.h | 60 --------------------------------------- 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 21 files changed, 261 insertions(+), 77 deletions(-) 45 rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%)
45 create mode 100644 gdk/x11/gdkx-with-gl-context.h
46 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
48 47
49diff --git a/configure.ac b/configure.ac 48diff --git a/configure.ac b/configure.ac
50index 965eec9..00bf544 100644 49index 0a48875..6f0a3a6 100644
51--- a/configure.ac 50--- a/configure.ac
52+++ b/configure.ac 51+++ b/configure.ac
53@@ -346,6 +346,15 @@ AC_ARG_ENABLE(mir-backend, 52@@ -351,6 +351,15 @@ AC_ARG_ENABLE(cloudproviders,
54 [enable the Mir gdk backend])], 53 [AS_HELP_STRING([--enable-cloudproviders],
55 [backend_set=yes]) 54 [enable libcloudproviders integration])],
56 55 [cloudproviders_set=yes])
57+AC_ARG_ENABLE(opengl, 56+AC_ARG_ENABLE(opengl,
58+ [AS_HELP_STRING([--enable-opengl], 57+ [AS_HELP_STRING([--enable-opengl],
59+ [When enabled, Gtk+ will use libepoxy and exposes GtkGLArea widget ])]) 58+ [When enabled, Gtk+ will use libepoxy and exposes GtkGLArea widget ])])
@@ -66,16 +65,16 @@ index 965eec9..00bf544 100644
66 AC_ARG_ENABLE(glx, 65 AC_ARG_ENABLE(glx,
67 [AS_HELP_STRING([--enable-glx], 66 [AS_HELP_STRING([--enable-glx],
68 [When enabled Gdk will try to initialize GLX])]) 67 [When enabled Gdk will try to initialize GLX])])
69@@ -1352,7 +1361,7 @@ CFLAGS="$saved_cflags" 68@@ -1372,7 +1381,7 @@ CFLAGS="$saved_cflags"
70 LDFLAGS="$saved_ldflags" 69 LDFLAGS="$saved_ldflags"
71 70
72 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"
73-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version" 72-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES"
74+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends $EPOXY_PACKAGES" 73+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends $EPOXY_PACKAGES $CLOUDPROVIDER_PACKAGES"
75 74
76 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) 75 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
77 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" 76 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
78@@ -1386,7 +1395,7 @@ fi 77@@ -1406,7 +1415,7 @@ fi
79 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) 78 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
80 79
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" 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"
@@ -210,10 +209,10 @@ index 932daf1..54239d6 100644
210 209
211 return info; 210 return info;
212diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c 211diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
213index 6b012ca..311c7f7 100644 212index 40225e9..c55e1de 100644
214--- a/gdk/gdkdisplay.c 213--- a/gdk/gdkdisplay.c
215+++ b/gdk/gdkdisplay.c 214+++ b/gdk/gdkdisplay.c
216@@ -2409,7 +2409,9 @@ gboolean 215@@ -2406,7 +2406,9 @@ gboolean
217 gdk_display_make_gl_context_current (GdkDisplay *display, 216 gdk_display_make_gl_context_current (GdkDisplay *display,
218 GdkGLContext *context) 217 GdkGLContext *context)
219 { 218 {
@@ -347,7 +346,7 @@ index c79dca0..8a7bec2 100644
347 346
348 /** 347 /**
349diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c 348diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
350index 689d666..fb84256 100644 349index c0e0a7d..437ab03 100644
351--- a/gdk/gdkwindow.c 350--- a/gdk/gdkwindow.c
352+++ b/gdk/gdkwindow.c 351+++ b/gdk/gdkwindow.c
353@@ -45,7 +45,9 @@ 352@@ -45,7 +45,9 @@
@@ -360,7 +359,7 @@ index 689d666..fb84256 100644
360 359
361 /* for the use of round() */ 360 /* for the use of round() */
362 #include "fallback-c89.c" 361 #include "fallback-c89.c"
363@@ -2819,6 +2821,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window, 362@@ -2822,6 +2824,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window,
364 { 363 {
365 GError *internal_error = NULL; 364 GError *internal_error = NULL;
366 365
@@ -374,7 +373,7 @@ index 689d666..fb84256 100644
374 if (_gdk_gl_flags & GDK_GL_DISABLE) 373 if (_gdk_gl_flags & GDK_GL_DISABLE)
375 { 374 {
376 g_set_error_literal (error, GDK_GL_ERROR, 375 g_set_error_literal (error, GDK_GL_ERROR,
377@@ -2954,6 +2963,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, 376@@ -2957,6 +2966,7 @@ gdk_window_begin_paint_internal (GdkWindow *window,
378 } 377 }
379 else 378 else
380 { 379 {
@@ -382,7 +381,7 @@ index 689d666..fb84256 100644
382 gdk_gl_context_make_current (context); 381 gdk_gl_context_make_current (context);
383 /* With gl we always need a surface to combine the gl 382 /* With gl we always need a surface to combine the gl
384 drawing with the native drawing. */ 383 drawing with the native drawing. */
385@@ -2968,6 +2978,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, 384@@ -2971,6 +2981,7 @@ gdk_window_begin_paint_internal (GdkWindow *window,
386 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 385 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
387 386
388 glViewport (0, 0, ww, wh); 387 glViewport (0, 0, ww, wh);
@@ -390,7 +389,7 @@ index 689d666..fb84256 100644
390 } 389 }
391 } 390 }
392 391
393@@ -3031,6 +3042,7 @@ gdk_window_end_paint_internal (GdkWindow *window) 392@@ -3034,6 +3045,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
394 393
395 gdk_gl_context_make_current (window->gl_paint_context); 394 gdk_gl_context_make_current (window->gl_paint_context);
396 395
@@ -398,7 +397,7 @@ index 689d666..fb84256 100644
398 if (!cairo_region_is_empty (opaque_region)) 397 if (!cairo_region_is_empty (opaque_region))
399 gdk_gl_texture_from_surface (window->current_paint.surface, 398 gdk_gl_texture_from_surface (window->current_paint.surface,
400 opaque_region); 399 opaque_region);
401@@ -3041,6 +3053,7 @@ gdk_window_end_paint_internal (GdkWindow *window) 400@@ -3044,6 +3056,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
402 window->current_paint.need_blend_region); 401 window->current_paint.need_blend_region);
403 glDisable(GL_BLEND); 402 glDisable(GL_BLEND);
404 } 403 }
@@ -479,7 +478,7 @@ index 6289f3a..cbbac79 100644
479+ 478+
480 -include $(top_srcdir)/git.mk 479 -include $(top_srcdir)/git.mk
481diff --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
482index ad65e29..91345ee 100644 481index e9a263f..2829a31 100644
483--- a/gdk/x11/gdkdisplay-x11.c 482--- a/gdk/x11/gdkdisplay-x11.c
484+++ b/gdk/x11/gdkdisplay-x11.c 483+++ b/gdk/x11/gdkdisplay-x11.c
485@@ -37,7 +37,9 @@ 484@@ -37,7 +37,9 @@
@@ -492,7 +491,7 @@ index ad65e29..91345ee 100644
492 #include "gdk-private.h" 491 #include "gdk-private.h"
493 492
494 #include <glib.h> 493 #include <glib.h>
495@@ -2994,7 +2996,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) 494@@ -3169,7 +3171,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
496 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;
497 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;
498 497
@@ -554,71 +553,21 @@ index edb0ea7..a317d61 100644
554 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref) 553 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref)
555 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref) 554 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref)
556 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref) 555 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref)
557diff --git a/gdk/x11/gdkx-with-gl-context.h b/gdk/x11/gdkx-with-gl-context.h 556diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h
558new file mode 100644 557similarity index 98%
559index 0000000..ae05fa6 558rename from gdk/x11/gdkx.h
560--- /dev/null 559rename to gdk/x11/gdkx-with-gl-context.h
560index 1f64bcc..ae05fa6 100644
561--- a/gdk/x11/gdkx.h
561+++ b/gdk/x11/gdkx-with-gl-context.h 562+++ b/gdk/x11/gdkx-with-gl-context.h
562@@ -0,0 +1,59 @@ 563@@ -45,7 +45,6 @@
563+/* GDK - The GIMP Drawing Kit 564 #include <gdk/x11/gdkx11dnd.h>
564+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald 565 #include <gdk/x11/gdkx11glcontext.h>
565+ * 566 #include <gdk/x11/gdkx11keys.h>
566+ * This library is free software; you can redistribute it and/or 567-#include <gdk/x11/gdkx11monitor.h>
567+ * modify it under the terms of the GNU Lesser General Public 568 #include <gdk/x11/gdkx11property.h>
568+ * License as published by the Free Software Foundation; either 569 #include <gdk/x11/gdkx11screen.h>
569+ * version 2 of the License, or (at your option) any later version. 570 #include <gdk/x11/gdkx11selection.h>
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__ */
622diff --git a/gdk/x11/gdkx-without-gl-context.h b/gdk/x11/gdkx-without-gl-context.h 571diff --git a/gdk/x11/gdkx-without-gl-context.h b/gdk/x11/gdkx-without-gl-context.h
623new file mode 100644 572new file mode 100644
624index 0000000..c9e2617 573index 0000000..c9e2617
@@ -683,77 +632,11 @@ index 0000000..c9e2617
683+#undef __GDKX_H_INSIDE__ 632+#undef __GDKX_H_INSIDE__
684+ 633+
685+#endif /* __GDK_X_H__ */ 634+#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__ */
752diff --git a/gtk/Makefile.am b/gtk/Makefile.am 635diff --git a/gtk/Makefile.am b/gtk/Makefile.am
753index 45fb7c2..ce81011 100644 636index 842c2f9..0921bc7 100644
754--- a/gtk/Makefile.am 637--- a/gtk/Makefile.am
755+++ b/gtk/Makefile.am 638+++ b/gtk/Makefile.am
756@@ -1411,14 +1411,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. 639@@ -1416,14 +1416,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.
757 && cp xgen-gptbc gtkprivatetypebuiltins.c \ 640 && cp xgen-gptbc gtkprivatetypebuiltins.c \
758 && rm -f xgen-gptbc 641 && rm -f xgen-gptbc
759 642
@@ -913,7 +796,7 @@ index c241ec8..24576dd 100644
913 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) 796 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
914 { 797 {
915diff --git a/tests/Makefile.am b/tests/Makefile.am 798diff --git a/tests/Makefile.am b/tests/Makefile.am
916index f86c166..ba1acad 100644 799index e2db6e4..e51cf34 100644
917--- a/tests/Makefile.am 800--- a/tests/Makefile.am
918+++ b/tests/Makefile.am 801+++ b/tests/Makefile.am
919@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ 802@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \
@@ -949,17 +832,16 @@ diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
949index 0b3a519..07b096f 100644 832index 0b3a519..07b096f 100644
950--- a/testsuite/gtk/objects-finalize.c 833--- a/testsuite/gtk/objects-finalize.c
951+++ b/testsuite/gtk/objects-finalize.c 834+++ b/testsuite/gtk/objects-finalize.c
952@@ -115,8 +115,10 @@ main (int argc, char **argv) 835@@ -115,7 +115,9 @@ main (int argc, char **argv)
953 all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && 836 all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE &&
954 all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && 837 all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 &&
955 all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && 838 all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER &&
956+#ifdef HAVE_OPENGL 839+#ifdef HAVE_OPENGL
957 all_types[i] != GDK_TYPE_X11_GL_CONTEXT && 840 all_types[i] != GDK_TYPE_X11_GL_CONTEXT &&
958 #endif
959+#endif 841+#endif
842 #endif
960 /* 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() */
961 all_types[i] != GDK_TYPE_PIXBUF_LOADER && 844 all_types[i] != GDK_TYPE_PIXBUF_LOADER &&
962 all_types[i] != GDK_TYPE_DRAWING_CONTEXT &&
963-- 845--
9642.12.0 8462.14.1
965 847
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.22.17.bb b/meta/recipes-gnome/gtk+/gtk+3_3.22.24.bb
index 66a54639df..02eca3f5cb 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.22.17.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.22.24.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://0004-configure.ac-Fix-wayland-protocols-path.patch \ 9 file://0004-configure.ac-Fix-wayland-protocols-path.patch \
10 " 10 "
11SRC_URI[md5sum] = "29f85430cf7cfa8ca8d0703ba65dbe11" 11SRC_URI[md5sum] = "b782a15b7b5b2005a1ce4647fb002a49"
12SRC_URI[sha256sum] = "a6c1fb8f229c626a3d9c0e1ce6ea138de7f64a5a6bc799d45fa286fe461c3437" 12SRC_URI[sha256sum] = "cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b"
13 13
14S = "${WORKDIR}/gtk+-${PV}" 14S = "${WORKDIR}/gtk+-${PV}"
15 15
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 20:17:11 +0000