summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+/gtk+3
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-07-14 14:25:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-16 21:23:43 +0100
commit872418b3a198309f5bf18191a18f4c9acf40ac4c (patch)
tree53187f028cab6717c4f87136145169971f101902 /meta/recipes-gnome/gtk+/gtk+3
parent51decd8a6bbab08f993b0ae2b194db683240f823 (diff)
downloadpoky-872418b3a198309f5bf18191a18f4c9acf40ac4c.tar.gz
gtk+3: upgrade 3.24.29 -> 3.24.30
cloudprint support removed upstream: https://gitlab.gnome.org/GNOME/gtk/-/commit/c77ea5101e55b8690127beed14b26dd3520889b5 (From OE-Core rev: abf3ec0314cc3ba45507f216197bf0fd7ce240b3) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch44
1 files changed, 22 insertions, 22 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 398c9bc36a..35cbab8761 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 f83fcf1991afad6d9c15546b2ccd775dad4e314c Mon Sep 17 00:00:00 2001 1From eef50c94587fc30cd624adb5eb213eb9fa663dc1 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] Add --disable-opengl configure option
@@ -47,7 +47,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
47 create mode 100644 gdk/x11/gdkx-without-gl-context.h 47 create mode 100644 gdk/x11/gdkx-without-gl-context.h
48 48
49diff --git a/configure.ac b/configure.ac 49diff --git a/configure.ac b/configure.ac
50index bd651bb..b4c061f 100644 50index 851bcbf..6cbf6a2 100644
51--- a/configure.ac 51--- a/configure.ac
52+++ b/configure.ac 52+++ b/configure.ac
53@@ -346,6 +346,15 @@ AC_ARG_ENABLE(cloudproviders, 53@@ -346,6 +346,15 @@ AC_ARG_ENABLE(cloudproviders,
@@ -210,7 +210,7 @@ index 932daf1..54239d6 100644
210 210
211 return info; 211 return info;
212diff --git a/gdk/Makefile.am b/gdk/Makefile.am 212diff --git a/gdk/Makefile.am b/gdk/Makefile.am
213index 479d6a1..7edbee8 100644 213index 710a548..b45f631 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 479d6a1..7edbee8 100644
243 GdkX11_3_0_gir_SCANNERFLAGS = \ 243 GdkX11_3_0_gir_SCANNERFLAGS = \
244 --identifier-prefix=Gdk \ 244 --identifier-prefix=Gdk \
245diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c 245diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
246index 240c99f..9eb49bf 100644 246index 748f548..911ab2a 100644
247--- a/gdk/gdkdisplay.c 247--- a/gdk/gdkdisplay.c
248+++ b/gdk/gdkdisplay.c 248+++ b/gdk/gdkdisplay.c
249@@ -2419,7 +2419,9 @@ gboolean 249@@ -2420,7 +2420,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 {
@@ -258,7 +258,7 @@ index 240c99f..9eb49bf 100644
258 258
259 GdkRenderingMode 259 GdkRenderingMode
260diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c 260diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
261index 933e204..1767508 100644 261index 9690077..55f85ef 100644
262--- a/gdk/gdkgl.c 262--- a/gdk/gdkgl.c
263+++ b/gdk/gdkgl.c 263+++ b/gdk/gdkgl.c
264@@ -26,7 +26,9 @@ 264@@ -26,7 +26,9 @@
@@ -334,7 +334,7 @@ index 933e204..1767508 100644
334+#endif 334+#endif
335 } 335 }
336diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c 336diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
337index dfbed63..556f0a3 100644 337index 3b23639..1f04f8e 100644
338--- a/gdk/gdkglcontext.c 338--- a/gdk/gdkglcontext.c
339+++ b/gdk/gdkglcontext.c 339+++ b/gdk/gdkglcontext.c
340@@ -85,7 +85,9 @@ 340@@ -85,7 +85,9 @@
@@ -380,7 +380,7 @@ index dfbed63..556f0a3 100644
380 380
381 /** 381 /**
382diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c 382diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
383index 6ae0f86..4e48a2a 100644 383index 2de8ba4..1883a79 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 @@
@@ -513,7 +513,7 @@ index 32b1f24..6352313 100644
513+ 513+
514 -include $(top_srcdir)/git.mk 514 -include $(top_srcdir)/git.mk
515diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c 515diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
516index 817944e..e7a2947 100644 516index 7e08f47..30fd7b6 100644
517--- a/gdk/x11/gdkdisplay-x11.c 517--- a/gdk/x11/gdkdisplay-x11.c
518+++ b/gdk/x11/gdkdisplay-x11.c 518+++ b/gdk/x11/gdkdisplay-x11.c
519@@ -37,7 +37,9 @@ 519@@ -37,7 +37,9 @@
@@ -526,7 +526,7 @@ index 817944e..e7a2947 100644
526 #include "gdk-private.h" 526 #include "gdk-private.h"
527 #include "gdkprofilerprivate.h" 527 #include "gdkprofilerprivate.h"
528 528
529@@ -3188,7 +3190,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) 529@@ -3191,7 +3193,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
530 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;
531 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;
532 532
@@ -538,10 +538,10 @@ index 817944e..e7a2947 100644
538 display_class->get_default_seat = gdk_x11_display_get_default_seat; 538 display_class->get_default_seat = gdk_x11_display_get_default_seat;
539 539
540diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c 540diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
541index 8939ae9..931bff9 100644 541index bb4df05..46f5349 100644
542--- a/gdk/x11/gdkscreen-x11.c 542--- a/gdk/x11/gdkscreen-x11.c
543+++ b/gdk/x11/gdkscreen-x11.c 543+++ b/gdk/x11/gdkscreen-x11.c
544@@ -1723,3 +1723,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) 544@@ -1827,3 +1827,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen)
545 { 545 {
546 return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP"); 546 return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP");
547 } 547 }
@@ -551,7 +551,7 @@ index 8939ae9..931bff9 100644
551+void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} 551+void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {}
552+#endif 552+#endif
553diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c 553diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
554index 1fe7b90..d23a347 100644 554index 721d9bb..8e87acc 100644
555--- a/gdk/x11/gdkwindow-x11.c 555--- a/gdk/x11/gdkwindow-x11.c
556+++ b/gdk/x11/gdkwindow-x11.c 556+++ b/gdk/x11/gdkwindow-x11.c
557@@ -36,7 +36,9 @@ 557@@ -36,7 +36,9 @@
@@ -564,7 +564,7 @@ index 1fe7b90..d23a347 100644
564 #include "gdkprivate-x11.h" 564 #include "gdkprivate-x11.h"
565 #include "gdk-private.h" 565 #include "gdk-private.h"
566 566
567@@ -5861,7 +5863,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) 567@@ -5881,7 +5883,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
568 impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; 568 impl_class->set_opaque_region = gdk_x11_window_set_opaque_region;
569 impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; 569 impl_class->set_shadow_width = gdk_x11_window_set_shadow_width;
570 impl_class->show_window_menu = gdk_x11_window_show_window_menu; 570 impl_class->show_window_menu = gdk_x11_window_show_window_menu;
@@ -668,10 +668,10 @@ index 0000000..c9e2617
668+ 668+
669+#endif /* __GDK_X_H__ */ 669+#endif /* __GDK_X_H__ */
670diff --git a/gtk/Makefile.am b/gtk/Makefile.am 670diff --git a/gtk/Makefile.am b/gtk/Makefile.am
671index eaca473..99352d1 100644 671index 074fb35..4fa9eb6 100644
672--- a/gtk/Makefile.am 672--- a/gtk/Makefile.am
673+++ b/gtk/Makefile.am 673+++ b/gtk/Makefile.am
674@@ -1449,7 +1449,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s 674@@ -1457,7 +1457,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s
675 ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ 675 ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
676 $(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' | \
677 sort | uniq | \ 677 sort | uniq | \
@@ -681,7 +681,7 @@ index eaca473..99352d1 100644
681 $(srcdir)/gtktestutils.c: gtktypefuncs.inc 681 $(srcdir)/gtktestutils.c: gtktypefuncs.inc
682 682
683diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c 683diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
684index 9a56443..7de0db2 100644 684index 802303e..33001cf 100644
685--- a/gtk/gtkglarea.c 685--- a/gtk/gtkglarea.c
686+++ b/gtk/gtkglarea.c 686+++ b/gtk/gtkglarea.c
687@@ -29,7 +29,9 @@ 687@@ -29,7 +29,9 @@
@@ -724,8 +724,8 @@ index 9a56443..7de0db2 100644
724 724
725 g_return_if_fail (GTK_IS_GL_AREA (area)); 725 g_return_if_fail (GTK_IS_GL_AREA (area));
726@@ -533,11 +540,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area) 726@@ -533,11 +540,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area)
727 glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, 727 glFramebufferRenderbuffer (GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
728 GL_RENDERBUFFER_EXT, priv->depth_stencil_buffer); 728 GL_RENDERBUFFER, priv->depth_stencil_buffer);
729 } 729 }
730+#endif 730+#endif
731 } 731 }
@@ -738,7 +738,7 @@ index 9a56443..7de0db2 100644
738 738
739 if (priv->context == NULL) 739 if (priv->context == NULL)
740@@ -569,6 +578,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area) 740@@ -569,6 +578,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area)
741 glDeleteFramebuffersEXT (1, &priv->frame_buffer); 741 glDeleteFramebuffers (1, &priv->frame_buffer);
742 priv->frame_buffer = 0; 742 priv->frame_buffer = 0;
743 } 743 }
744+#endif 744+#endif
@@ -777,7 +777,7 @@ index 9a56443..7de0db2 100644
777 777
778 static gboolean 778 static gboolean
779diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c 779diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
780index c241ec8..24576dd 100644 780index 48237d1..1f9b9be 100644
781--- a/gtk/inspector/general.c 781--- a/gtk/inspector/general.c
782+++ b/gtk/inspector/general.c 782+++ b/gtk/inspector/general.c
783@@ -33,8 +33,10 @@ 783@@ -33,8 +33,10 @@
@@ -824,7 +824,7 @@ index c241ec8..24576dd 100644
824 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) 824 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
825 { 825 {
826diff --git a/tests/Makefile.am b/tests/Makefile.am 826diff --git a/tests/Makefile.am b/tests/Makefile.am
827index ee1e8b5..e6c6502 100644 827index f283e89..5e7180e 100644
828--- a/tests/Makefile.am 828--- a/tests/Makefile.am
829+++ b/tests/Makefile.am 829+++ b/tests/Makefile.am
830@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ 830@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \