gtk%2B/gtk%2B3/opengl.patch

20  docs/tools/meson.build           |  7 +++++--
33  gdk/x11/meson.build              |  7 +++++--
42 diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
44 --- a/demos/gtk-demo/meson.build
46 @@ -28,7 +28,6 @@ demos = files([
65 diff --git a/docs/tools/meson.build b/docs/tools/meson.build
67 --- a/docs/tools/meson.build
85 diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
87 --- a/docs/tools/widgets.c
89 @@ -8,7 +8,9 @@
112 diff --git a/gdk/gdkconfig.h.meson b/gdk/gdkconfig.h.meson
113 index 7db19e0..088651b 100644
114 --- a/gdk/gdkconfig.h.meson
116 @@ -15,6 +15,7 @@ G_BEGIN_DECLS
124 diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
126 --- a/gdk/gdkdisplay.c
128 @@ -2420,7 +2420,11 @@ gboolean
140 diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
142 --- a/gdk/gdkgl.c
155 @@ -36,6 +37,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface,
163 @@ -208,6 +210,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data)
171 @@ -216,6 +219,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
179 @@ -289,6 +293,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
186  /* x,y,width,height describes a rectangle in the gl render buffer
187 @@ -337,6 +342,7 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
195 @@ -727,6 +733,7 @@ out:
203 @@ -734,6 +741,7 @@ void
217 diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
218 index cb0ed90..7ed74f3 100644
219 --- a/gdk/gdkglcontext.c
221 @@ -85,7 +85,9 @@
231 @@ -246,6 +248,7 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
239 @@ -289,6 +292,7 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
247 @@ -801,6 +805,7 @@ gdk_gl_context_realize (GdkGLContext  *context,
255 @@ -888,6 +893,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
263 diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
265 --- a/gdk/gdkwindow.c
267 @@ -45,7 +45,9 @@
291 @@ -2979,6 +2988,7 @@ gdk_window_begin_paint_internal (GdkWindow            *window,
297            /* With gl we always need a surface to combine the gl
299 @@ -2993,6 +3003,7 @@ gdk_window_begin_paint_internal (GdkWindow            *window,
307 @@ -3056,6 +3067,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
315 @@ -3066,6 +3078,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
323 diff --git a/gdk/meson.build b/gdk/meson.build
325 --- a/gdk/meson.build
327 @@ -56,7 +56,6 @@ gdk_gir_public_headers = files(
348 @@ -166,6 +171,7 @@ gdkconfig_cdata.set('GDK_WINDOWING_WAYLAND', wayland_enabled)
356 diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
357 index 7e08f47..30fd7b6 100644
358 --- a/gdk/x11/gdkdisplay-x11.c
360 @@ -37,7 +37,9 @@
370 @@ -3191,7 +3193,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
381 diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
383 --- a/gdk/x11/gdkvisual-x11.c
385 @@ -306,7 +306,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen)
398 diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
400 --- a/gdk/x11/gdkwindow-x11.c
402 @@ -36,7 +36,9 @@
412 @@ -5906,7 +5908,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
422 diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h
424 --- a/gdk/x11/gdkx-autocleanups.h
426 @@ -30,7 +30,9 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DeviceXI2, g_object_unref)
436 diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
438 --- a/gdk/x11/gdkx.h
440 @@ -43,7 +43,9 @@
450 diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
452 --- a/gdk/x11/meson.build
454 @@ -14,7 +14,6 @@ gdk_x11_sources = files(
462 @@ -42,7 +41,6 @@ gdk_x11_public_headers = files(
482 diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
484 --- a/gtk/gtkglarea.c
486 @@ -29,7 +29,9 @@
509 @@ -483,6 +488,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
517 @@ -501,6 +507,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
539 @@ -569,6 +578,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area)
547 @@ -679,6 +689,7 @@ gtk_gl_area_draw (GtkWidget *widget,
570 diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
572 --- a/gtk/inspector/general.c
585 @@ -221,6 +223,7 @@ add_label_row (GtkInspectorGeneral *gen,
593 @@ -230,6 +233,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen,
601 @@ -279,6 +283,7 @@ wayland_get_display (struct wl_display *wl_display)
609 @@ -305,6 +310,7 @@ init_gl (GtkInspectorGeneral *gen)
617 diff --git a/meson.build b/meson.build
619 --- a/meson.build
621 @@ -137,6 +137,7 @@ wayland_enabled        = get_option('wayland_backend')
629 @@ -430,7 +431,7 @@ pangocairo_dep = dependency('pangocairo', version: cairo_req,
666 @@ -930,7 +941,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages)
675 diff --git a/meson_options.txt b/meson_options.txt
677 --- a/meson_options.txt
688 diff --git a/tests/meson.build b/tests/meson.build
690 --- a/tests/meson.build
692 @@ -5,7 +5,6 @@ gtk_tests = [
700 @@ -55,7 +54,6 @@ gtk_tests = [
722 diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
723 index 95b565c..7f340c3 100644
724 --- a/testsuite/gtk/objects-finalize.c
726 @@ -109,7 +109,9 @@ main (int argc, char **argv)
734  	  /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */