summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+/gtk+3
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-06-11 16:51:59 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-12 10:54:40 +0100
commitfdd18c8805d6c23723b8d173a3f0e5d15781d272 (patch)
treed13af2eee3617d422d58017658ea8ecdb2484bd9 /meta/recipes-gnome/gtk+/gtk+3
parent9fbd020124c9d1edb67014d8b846f76b741ac25e (diff)
downloadpoky-fdd18c8805d6c23723b8d173a3f0e5d15781d272.tar.gz
gtk+3: update 3.24.5 -> 3.24.8
Rebase 0003-Add-disable-opengl-configure-option.patch and add another fix to it (g-introspection input file list assumes opengl is always available). (From OE-Core rev: e6ca80559f02a8a38272ae52c568053dde52ac9f) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.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.patch77
1 files changed, 56 insertions, 21 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 e5a67d098e..852dc9dfcd 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 9e243474eea4330b593e0f6dd418b61b79699d8b Mon Sep 17 00:00:00 2001 1From d11b41a7ff0234f3832d6aabdf498807d1463c18 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
@@ -25,6 +25,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
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/Makefile.am | 8 ++-
28 gdk/gdkdisplay.c | 4 +- 29 gdk/gdkdisplay.c | 4 +-
29 gdk/gdkgl.c | 10 ++++ 30 gdk/gdkgl.c | 10 ++++
30 gdk/gdkglcontext.c | 6 +++ 31 gdk/gdkglcontext.c | 6 +++
@@ -41,15 +42,15 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
41 gtk/inspector/general.c | 6 +++ 42 gtk/inspector/general.c | 6 +++
42 tests/Makefile.am | 10 ++-- 43 tests/Makefile.am | 10 ++--
43 testsuite/gtk/objects-finalize.c | 2 + 44 testsuite/gtk/objects-finalize.c | 2 +
44 20 files changed, 202 insertions(+), 18 deletions(-) 45 21 files changed, 208 insertions(+), 20 deletions(-)
45 rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%) 46 rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%)
46 create mode 100644 gdk/x11/gdkx-without-gl-context.h 47 create mode 100644 gdk/x11/gdkx-without-gl-context.h
47 48
48diff --git a/configure.ac b/configure.ac 49diff --git a/configure.ac b/configure.ac
49index a91b29c..561d3b5 100644 50index 2c4733b..18ae66c 100644
50--- a/configure.ac 51--- a/configure.ac
51+++ b/configure.ac 52+++ b/configure.ac
52@@ -351,6 +351,15 @@ AC_ARG_ENABLE(cloudproviders, 53@@ -352,6 +352,15 @@ AC_ARG_ENABLE(cloudproviders,
53 [AS_HELP_STRING([--enable-cloudproviders], 54 [AS_HELP_STRING([--enable-cloudproviders],
54 [enable libcloudproviders integration])], 55 [enable libcloudproviders integration])],
55 [cloudproviders_set=yes]) 56 [cloudproviders_set=yes])
@@ -65,21 +66,21 @@ index a91b29c..561d3b5 100644
65 AC_ARG_ENABLE(glx, 66 AC_ARG_ENABLE(glx,
66 [AS_HELP_STRING([--enable-glx], 67 [AS_HELP_STRING([--enable-glx],
67 [When enabled Gdk will try to initialize GLX])]) 68 [When enabled Gdk will try to initialize GLX])])
68@@ -1381,7 +1390,7 @@ CFLAGS="$saved_cflags" 69@@ -1370,7 +1379,7 @@ CFLAGS="$saved_cflags"
69 LDFLAGS="$saved_ldflags" 70 LDFLAGS="$saved_ldflags"
70 71
71 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"
72-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES" 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 $MIR_PACKAGES $cairo_backends $EPOXY_PACKAGES $CLOUDPROVIDER_PACKAGES" 74+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends $EPOXY_PACKAGES $CLOUDPROVIDER_PACKAGES fribidi >= fribidi_required_version"
74 75
75 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) 76 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
76 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" 77 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
77@@ -1415,7 +1424,7 @@ fi 78@@ -1404,7 +1413,7 @@ fi
78 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) 79 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
79 80
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" 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_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_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 $MIR_PACKAGES $EPOXY_PACKAGES" 83+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $EPOXY_PACKAGES fribidi >= fribidi_required_version"
83 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
84 GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" 85 GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
85 fi 86 fi
@@ -208,11 +209,44 @@ index 932daf1..54239d6 100644
208 info = new_widget_info ("glarea", widget, MEDIUM); 209 info = new_widget_info ("glarea", widget, MEDIUM);
209 210
210 return info; 211 return info;
212diff --git a/gdk/Makefile.am b/gdk/Makefile.am
213index 689ee52..d6b4e70 100644
214--- a/gdk/Makefile.am
215+++ b/gdk/Makefile.am
216@@ -274,7 +274,6 @@ x11_introspection_files = \
217 x11/gdkeventsource.c \
218 x11/gdkeventtranslator.c \
219 x11/gdkgeometry-x11.c \
220- x11/gdkglcontext-x11.c \
221 x11/gdkkeys-x11.c \
222 x11/gdkmain-x11.c \
223 x11/gdkmonitor-x11.c \
224@@ -300,7 +299,6 @@ x11_introspection_files = \
225 x11/gdkx11display.h \
226 x11/gdkx11displaymanager.h \
227 x11/gdkx11dnd.h \
228- x11/gdkx11glcontext.h \
229 x11/gdkx11keys.h \
230 x11/gdkx11monitor.h \
231 x11/gdkx11property.h \
232@@ -310,6 +308,12 @@ x11_introspection_files = \
233 x11/gdkx11visual.h \
234 x11/gdkx11window.h
235
236+if HAVE_OPENGL
237+x11_introspection_files += \
238+ x11/gdkglcontext-x11.c \
239+ x11/gdkx11glcontext.h
240+endif
241+
242 GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
243 GdkX11_3_0_gir_SCANNERFLAGS = \
244 --identifier-prefix=Gdk \
211diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c 245diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
212index 40225e9..c55e1de 100644 246index 06d4187..832711c 100644
213--- a/gdk/gdkdisplay.c 247--- a/gdk/gdkdisplay.c
214+++ b/gdk/gdkdisplay.c 248+++ b/gdk/gdkdisplay.c
215@@ -2406,7 +2406,9 @@ gboolean 249@@ -2416,7 +2416,9 @@ gboolean
216 gdk_display_make_gl_context_current (GdkDisplay *display, 250 gdk_display_make_gl_context_current (GdkDisplay *display,
217 GdkGLContext *context) 251 GdkGLContext *context)
218 { 252 {
@@ -346,7 +380,7 @@ index dfbed63..556f0a3 100644
346 380
347 /** 381 /**
348diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c 382diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
349index 6b231f0..904b86d 100644 383index 1416409..e3b5630 100644
350--- a/gdk/gdkwindow.c 384--- a/gdk/gdkwindow.c
351+++ b/gdk/gdkwindow.c 385+++ b/gdk/gdkwindow.c
352@@ -45,7 +45,9 @@ 386@@ -45,7 +45,9 @@
@@ -478,7 +512,7 @@ index 6289f3a..cbbac79 100644
478+ 512+
479 -include $(top_srcdir)/git.mk 513 -include $(top_srcdir)/git.mk
480diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c 514diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
481index 659b9fa..b15536b 100644 515index 5b95196..9a2f2a2 100644
482--- a/gdk/x11/gdkdisplay-x11.c 516--- a/gdk/x11/gdkdisplay-x11.c
483+++ b/gdk/x11/gdkdisplay-x11.c 517+++ b/gdk/x11/gdkdisplay-x11.c
484@@ -37,7 +37,9 @@ 518@@ -37,7 +37,9 @@
@@ -491,7 +525,7 @@ index 659b9fa..b15536b 100644
491 #include "gdk-private.h" 525 #include "gdk-private.h"
492 526
493 #include <glib.h> 527 #include <glib.h>
494@@ -3194,7 +3196,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) 528@@ -3184,7 +3186,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
495 display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list; 529 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; 530 display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target;
497 531
@@ -516,7 +550,7 @@ index 272cecd..2bb34ac 100644
516+void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} 550+void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {}
517+#endif 551+#endif
518diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c 552diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
519index c6205e4..df2334f 100644 553index f92a146..89f900a 100644
520--- a/gdk/x11/gdkwindow-x11.c 554--- a/gdk/x11/gdkwindow-x11.c
521+++ b/gdk/x11/gdkwindow-x11.c 555+++ b/gdk/x11/gdkwindow-x11.c
522@@ -36,7 +36,9 @@ 556@@ -36,7 +36,9 @@
@@ -529,7 +563,7 @@ index c6205e4..df2334f 100644
529 #include "gdkprivate-x11.h" 563 #include "gdkprivate-x11.h"
530 #include "gdk-private.h" 564 #include "gdk-private.h"
531 565
532@@ -5804,7 +5806,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) 566@@ -5839,7 +5841,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
533 impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; 567 impl_class->set_opaque_region = gdk_x11_window_set_opaque_region;
534 impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; 568 impl_class->set_shadow_width = gdk_x11_window_set_shadow_width;
535 impl_class->show_window_menu = gdk_x11_window_show_window_menu; 569 impl_class->show_window_menu = gdk_x11_window_show_window_menu;
@@ -633,17 +667,18 @@ index 0000000..c9e2617
633+ 667+
634+#endif /* __GDK_X_H__ */ 668+#endif /* __GDK_X_H__ */
635diff --git a/gtk/Makefile.am b/gtk/Makefile.am 669diff --git a/gtk/Makefile.am b/gtk/Makefile.am
636index 5594429..2259bb3 100644 670index e556e9d..ce912d7 100644
637--- a/gtk/Makefile.am 671--- a/gtk/Makefile.am
638+++ b/gtk/Makefile.am 672+++ b/gtk/Makefile.am
639@@ -1434,14 +1434,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. 673@@ -1441,7 +1441,6 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.
640 && cp xgen-gptbc gtkprivatetypebuiltins.c \ 674 && cp xgen-gptbc gtkprivatetypebuiltins.c \
641 && rm -f xgen-gptbc 675 && rm -f xgen-gptbc
642 676
643- 677-
644 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 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
645 $(AM_V_GEN) (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtkx.h>') > xgen-gtfsrc.c && \ 679 $(AM_V_GEN) export LC_ALL=C ; \
646 echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \ 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
647 ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ 682 ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
648 $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \ 683 $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
649 sort | uniq | \ 684 sort | uniq | \