* [PATCH 00/10] Upgrades and misc. fixes
@ 2016-06-22 11:51 Jussi Kukkonen
2016-06-22 11:52 ` [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 Jussi Kukkonen
` (9 more replies)
0 siblings, 10 replies; 19+ messages in thread
From: Jussi Kukkonen @ 2016-06-22 11:51 UTC (permalink / raw)
To: openembedded-core
This contains an uppgrade to Gtk+3 (which I didn't add into
sato-gtk3 branch to keep it from changing too much between versions),
upgrades to other recipes related to Gtk+, and miscallaneous fixes.
The following changes since commit 95f6e7bd0f7188f59e66e1769799e44a123b638b:
bitbake: cooker: clean up EvertWriter (2016-06-20 17:23:57 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/upgrades-post-gtk3
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/upgrades-post-gtk3
Jussi Kukkonen (10):
gtk+3: Upgrade 3.18.8 -> 3.20.6
atk: Upgrade 2.18.0 -> 2.20.0
at-spi2-core: Upgrade 2.18.3 -> 2.20.2
at-spi2-atk: Upgrade 2.18.1 -> 2.20.1
clutter-gtk-1.0: Upgrade 1.6.6 -> 1.8.0
puzzles: Keep building even with deprecation warnings
cairo: inherit upstream-version-is-even
gsettings-desktop-schemas: inherit upstream-version-is-even
vte: don't build test app
connman-gnome: StatusIcon adapts to size changes
.../connman/connman-gnome/0001-Port-to-Gtk3.patch | 136 ++++++++-
.../gsettings-desktop-schemas_3.20.0.bb | 2 +-
meta/recipes-gnome/gtk+/gtk+3.inc | 9 +-
..._libtool.patch => 0001-Hardcoded-libtool.patch} | 26 +-
...o-not-try-to-initialize-GL-without-libGL.patch} | 12 +-
...0003-Add-disable-opengl-configure-option.patch} | 327 ++++++---------------
...4-configure.ac-Fix-wayland-protocols-path.patch | 36 +++
meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch | 118 --------
.../gtk+/{gtk+3_3.18.8.bb => gtk+3_3.20.6.bb} | 13 +-
...e_3.18.8.bb => gtk-icon-utils-native_3.20.6.bb} | 4 +-
meta/recipes-graphics/cairo/cairo.inc | 2 +-
.../clutter/clutter-gtk-1.0_1.6.6.bb | 6 -
.../clutter/clutter-gtk-1.0_1.8.0.bb | 6 +
meta/recipes-sato/puzzles/puzzles_git.bb | 2 +
...at-spi2-atk_2.18.1.bb => at-spi2-atk_2.20.1.bb} | 4 +-
.../0001-build-Add-with-systemduserunitdir.patch | 49 +++
...-spi2-core_2.18.3.bb => at-spi2-core_2.20.2.bb} | 18 +-
.../atk/{atk_2.18.0.bb => atk_2.20.0.bb} | 6 +-
meta/recipes-support/vte/vte_0.44.1.bb | 2 +-
19 files changed, 371 insertions(+), 407 deletions(-)
rename meta/recipes-gnome/gtk+/gtk+3/{hardcoded_libtool.patch => 0001-Hardcoded-libtool.patch} (70%)
rename meta/recipes-gnome/gtk+/gtk+3/{Do-not-try-to-initialize-GL-without-libGL.patch => 0002-Do-not-try-to-initialize-GL-without-libGL.patch} (86%)
rename meta/recipes-gnome/gtk+/gtk+3/{0001-Add-disable-opengl-configure-option.patch => 0003-Add-disable-opengl-configure-option.patch} (71%)
create mode 100644 meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.18.8.bb => gtk+3_3.20.6.bb} (57%)
rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.18.8.bb => gtk-icon-utils-native_3.20.6.bb} (93%)
delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.0.bb
rename meta/recipes-support/atk/{at-spi2-atk_2.18.1.bb => at-spi2-atk_2.20.1.bb} (81%)
create mode 100644 meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch
rename meta/recipes-support/atk/{at-spi2-core_2.18.3.bb => at-spi2-core_2.20.2.bb} (49%)
rename meta/recipes-support/atk/{atk_2.18.0.bb => atk_2.20.0.bb} (69%)
--
2.1.4
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 2016-06-22 11:51 [PATCH 00/10] Upgrades and misc. fixes Jussi Kukkonen @ 2016-06-22 11:52 ` Jussi Kukkonen 2016-07-05 13:09 ` Robert Yang 2016-06-22 11:52 ` [PATCH 02/10] atk: Upgrade 2.18.0 -> 2.20.0 Jussi Kukkonen ` (8 subsequent siblings) 9 siblings, 1 reply; 19+ messages in thread From: Jussi Kukkonen @ 2016-06-22 11:52 UTC (permalink / raw) To: openembedded-core * Remove a patch that's no longer needed (as we don't have a problem with client side decorations anymore) * Wayland build now depends on wayland-protocols: Use same WAYLAND_PROTOCOLS_SYSROOT_DIR trick as weston so protocols are found and multilib build does not break * Add new binary gtk-query-settings to -dev package * Rebase patches * Modify 0003-Add-disable-opengl-configure-option.patch so that gdkx.h really is generated whenever it changes Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- meta/recipes-gnome/gtk+/gtk+3.inc | 9 +- ..._libtool.patch => 0001-Hardcoded-libtool.patch} | 26 +- ...o-not-try-to-initialize-GL-without-libGL.patch} | 12 +- ...0003-Add-disable-opengl-configure-option.patch} | 327 ++++++--------------- ...4-configure.ac-Fix-wayland-protocols-path.patch | 36 +++ meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch | 118 -------- .../gtk+/{gtk+3_3.18.8.bb => gtk+3_3.20.6.bb} | 13 +- ...e_3.18.8.bb => gtk-icon-utils-native_3.20.6.bb} | 4 +- 8 files changed, 173 insertions(+), 372 deletions(-) rename meta/recipes-gnome/gtk+/gtk+3/{hardcoded_libtool.patch => 0001-Hardcoded-libtool.patch} (70%) rename meta/recipes-gnome/gtk+/gtk+3/{Do-not-try-to-initialize-GL-without-libGL.patch => 0002-Do-not-try-to-initialize-GL-without-libGL.patch} (86%) rename meta/recipes-gnome/gtk+/gtk+3/{0001-Add-disable-opengl-configure-option.patch => 0003-Add-disable-opengl-configure-option.patch} (71%) create mode 100644 meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch rename meta/recipes-gnome/gtk+/{gtk+3_3.18.8.bb => gtk+3_3.20.6.bb} (57%) rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.18.8.bb => gtk-icon-utils-native_3.20.6.bb} (93%) diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 959fb44..0de114d 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -31,7 +31,9 @@ EXTRA_OECONF += " \ --enable-modules \ --disable-cups \ --disable-colord \ -" + WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ + " +EXTRA_OECONF[vardepsexclude] = "MACHINE" do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" @@ -46,7 +48,7 @@ PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fon # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy" PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" -PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon virtual/mesa wayland-native" +PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/mesa wayland-native" do_install_append() { mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 @@ -76,6 +78,7 @@ FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \ FILES_${PN}-dev += " \ ${datadir}/gtk-3.0/gtkbuilder.rng \ ${datadir}/gtk-3.0/include \ + ${datadir}/gettext/its \ ${libdir}/gtk-3.0/include \ ${libdir}/gtk-3.0/${LIBV}/loaders/*.la \ ${libdir}/gtk-3.0/${LIBV}/immodules/*.la \ @@ -85,6 +88,7 @@ FILES_${PN}-dev += " \ ${bindir}/gtk-builder-convert \ ${bindir}/gtk-encode-symbolic-svg \ ${bindir}/gtk-builder-tool \ + ${bindir}/gtk-query-settings \ " GTKBASE_RRECOMMENDS ?= "liberation-fonts \ @@ -99,6 +103,7 @@ GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" +RRECOMMENDS_${PN}-dev += "wayland-protocols" PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" diff --git a/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch similarity index 70% rename from meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch rename to meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch index 3b4beeb..0bda1f1 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch @@ -1,12 +1,21 @@ +From 5a73a5b92566e314bbc8a1bd40f1ec204837c111 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 21 Jun 2016 14:53:56 +0300 +Subject: [PATCH 1/4] Hardcoded libtool + Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) -Index: gtk+-3.8.2/configure.ac -=================================================================== ---- gtk+-3.8.2.orig/configure.ac -+++ gtk+-3.8.2/configure.ac -@@ -531,7 +531,7 @@ AC_MSG_CHECKING([Whether to write depend +diff --git a/configure.ac b/configure.ac +index 23d3077..b6931d6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -610,7 +610,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc files]) case $enable_explicit_deps in auto) export SED @@ -15,7 +24,7 @@ Index: gtk+-3.8.2/configure.ac if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then enable_explicit_deps=yes else -@@ -793,7 +793,7 @@ else +@@ -876,7 +876,7 @@ else dnl Now we check to see if our libtool supports shared lib deps dnl (in a rather ugly way even) if $dynworks; then @@ -24,7 +33,7 @@ Index: gtk+-3.8.2/configure.ac module_deplibs_check=`$module_libtool_config | \ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1528,7 +1528,7 @@ fi +@@ -1630,7 +1630,7 @@ AC_SUBST(GTK_PRINT_BACKENDS) # We are using gmodule-no-export now, but I'm leaving the stripping # code in place for now, since pango and atk still require gmodule. export SED @@ -33,3 +42,6 @@ Index: gtk+-3.8.2/configure.ac if test -n "$export_dynamic"; then GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` +-- +2.1.4 + diff --git a/meta/recipes-gnome/gtk+/gtk+3/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 similarity index 86% rename from meta/recipes-gnome/gtk+/gtk+3/Do-not-try-to-initialize-GL-without-libGL.patch rename to meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch index c8c480c..989716e 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/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 @@ -From fc22058a10db913534f11348f86681fe9e1838e5 Mon Sep 17 00:00:00 2001 +From d63b926f8c8d8b5c9f9ec33d078b775f0409d88a Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Fri, 16 Oct 2015 16:35:16 +0300 -Subject: [PATCH] Do not try to initialize GL without libGL +Subject: [PATCH 2/4] Do not try to initialize GL without libGL _gdk_x11_screen_update_visuals_for_gl() will end up calling epoxys GLX api which will exit() if libGL.so.1 is not present. We do not @@ -21,10 +21,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 2 files changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac -index 729a62e..58cc1ac 100644 +index b6931d6..e27da49 100644 --- a/configure.ac +++ b/configure.ac -@@ -328,6 +328,13 @@ AC_ARG_ENABLE(mir-backend, +@@ -342,6 +342,13 @@ AC_ARG_ENABLE(mir-backend, [enable the Mir gdk backend])], [backend_set=yes]) @@ -39,10 +39,10 @@ index 729a62e..58cc1ac 100644 if test "$platform_win32" = yes; then enable_win32_backend=yes diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c -index f3b062d..c8243f4 100644 +index 81479d8..3c8c5c0 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c -@@ -345,7 +345,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen) +@@ -306,7 +306,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen) /* If GL is available we want to pick better default/rgba visuals, as we care about glx details such as alpha/depth/stencil depth, stereo and double buffering */ diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch similarity index 71% rename from meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch rename to meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch index a963334..8552f53 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch @@ -1,7 +1,7 @@ -From c77afa19881d955d759879aeae8bbd88613dd4fe Mon Sep 17 00:00:00 2001 +From a8fa547fdc1416b330aced805f5343ad912932ae Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Thu, 16 Jun 2016 15:11:34 +0300 -Subject: [PATCH] Add --disable-opengl configure option +Date: Tue, 21 Jun 2016 15:11:39 +0300 +Subject: [PATCH 3/4] Add --disable-opengl configure option --disable-opengl will remove the dependency on libepoxy and on the OpenGL APIs. This is useful for those who want to keep using gtk+3 @@ -20,37 +20,35 @@ Long-term it would be good to find an alternative solution to this Upstream-Status: Inappropriate [Evil eye expected from upstream] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- - configure.ac | 13 +++++++-- - demos/gtk-demo/glarea.c | 13 +++++++++ - docs/tools/Makefile.am | 9 ++++-- - docs/tools/widgets.c | 4 ++- - gdk/gdkdisplay.c | 4 ++- - gdk/gdkgl.c | 10 +++++++ - gdk/gdkglcontext.c | 6 ++++ - gdk/gdkwindow.c | 14 +++++++++- - gdk/x11/Makefile.am | 28 ++++++++++++++++--- - gdk/x11/gdkdisplay-x11.c | 6 ++-- - gdk/x11/gdkscreen-x11.c | 5 ++++ - gdk/x11/gdkwindow-x11.c | 4 +++ - gdk/x11/gdkx-autocleanups.h | 2 ++ - gdk/x11/gdkx-with-gl-context.h | 59 +++++++++++++++++++++++++++++++++++++++ - gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++++++++++ - gdk/x11/gdkx.h | 59 --------------------------------------- - gtk/Makefile.am | 3 +- - gtk/gtkglarea.c | 20 ++++++++++++- - gtk/inspector/general.c | 6 ++++ - tests/Makefile.am | 10 +++++-- - testsuite/gtk/objects-finalize.c | 2 ++ - 21 files changed, 257 insertions(+), 78 deletions(-) - create mode 100644 gdk/x11/gdkx-with-gl-context.h + configure.ac | 13 +++++-- + demos/gtk-demo/glarea.c | 13 +++++++ + docs/tools/Makefile.am | 9 +++-- + docs/tools/widgets.c | 4 ++- + gdk/gdkdisplay.c | 4 ++- + gdk/gdkgl.c | 10 ++++++ + gdk/gdkglcontext.c | 6 ++++ + gdk/gdkwindow.c | 13 +++++++ + gdk/x11/Makefile.am | 30 +++++++++++++--- + gdk/x11/gdkdisplay-x11.c | 6 +++- + gdk/x11/gdkscreen-x11.c | 5 +++ + gdk/x11/gdkwindow-x11.c | 4 +++ + gdk/x11/gdkx-autocleanups.h | 2 ++ + gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 0 + gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++ + gtk/Makefile.am | 3 +- + gtk/gtkglarea.c | 20 ++++++++++- + gtk/inspector/general.c | 6 ++++ + tests/Makefile.am | 10 ++++-- + testsuite/gtk/objects-finalize.c | 2 ++ + 20 files changed, 201 insertions(+), 17 deletions(-) + rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (100%) create mode 100644 gdk/x11/gdkx-without-gl-context.h - delete mode 100644 gdk/x11/gdkx.h diff --git a/configure.ac b/configure.ac -index c280543..32da151 100644 +index e27da49..a3e9beb 100644 --- a/configure.ac +++ b/configure.ac -@@ -340,6 +340,15 @@ AC_ARG_ENABLE(mir-backend, +@@ -342,6 +342,15 @@ AC_ARG_ENABLE(mir-backend, [enable the Mir gdk backend])], [backend_set=yes]) @@ -66,7 +64,7 @@ index c280543..32da151 100644 AC_ARG_ENABLE(glx, [AS_HELP_STRING([--enable-glx], [When enabled Gdk will try to initialize GLX])]) -@@ -1330,7 +1339,7 @@ CFLAGS="$saved_cflags" +@@ -1333,7 +1342,7 @@ CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" @@ -75,7 +73,7 @@ index c280543..32da151 100644 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" -@@ -1364,7 +1373,7 @@ fi +@@ -1367,7 +1376,7 @@ fi PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) 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" @@ -85,7 +83,7 @@ index c280543..32da151 100644 GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" fi diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c -index c267706..b3bac86 100644 +index 3aba729..c6c79f7 100644 --- a/demos/gtk-demo/glarea.c +++ b/demos/gtk-demo/glarea.c @@ -5,7 +5,9 @@ @@ -207,10 +205,10 @@ index 932daf1..54239d6 100644 return info; diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c -index 892d6a7..8323768 100644 +index 6150ef7..2223629 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c -@@ -2285,7 +2285,9 @@ gboolean +@@ -2360,7 +2360,9 @@ gboolean gdk_display_make_gl_context_current (GdkDisplay *display, GdkGLContext *context) { @@ -222,7 +220,7 @@ index 892d6a7..8323768 100644 GdkRenderingMode diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c -index 85ce63d..d76e8dc 100644 +index e8ba770..ba7c84b 100644 --- a/gdk/gdkgl.c +++ b/gdk/gdkgl.c @@ -22,7 +22,9 @@ @@ -243,7 +241,7 @@ index 85ce63d..d76e8dc 100644 static const char * get_vertex_type_name (int type) { -@@ -205,6 +208,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) +@@ -254,6 +257,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) glUseProgram (paint_data->current_program->program); } } @@ -251,7 +249,7 @@ index 85ce63d..d76e8dc 100644 void gdk_gl_texture_quads (GdkGLContext *paint_context, -@@ -212,6 +216,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, +@@ -261,6 +265,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, int n_quads, GdkTexturedQuad *quads) { @@ -259,7 +257,7 @@ index 85ce63d..d76e8dc 100644 GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context); GdkGLContextProgram *program; GdkWindow *window = gdk_gl_context_get_window (paint_context); -@@ -275,6 +280,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, +@@ -324,6 +329,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, glDisableVertexAttribArray (program->position_location); glDisableVertexAttribArray (program->uv_location); @@ -267,7 +265,7 @@ index 85ce63d..d76e8dc 100644 } /* x,y,width,height describes a rectangle in the gl render buffer -@@ -323,6 +329,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, +@@ -372,6 +378,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, int width, int height) { @@ -275,7 +273,7 @@ index 85ce63d..d76e8dc 100644 GdkGLContext *paint_context; cairo_surface_t *image; cairo_matrix_t matrix; -@@ -643,6 +650,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, +@@ -692,6 +699,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, if (clip_region) cairo_region_destroy (clip_region); @@ -283,7 +281,7 @@ index 85ce63d..d76e8dc 100644 } /* This is always called with the paint context current */ -@@ -650,6 +658,7 @@ void +@@ -699,6 +707,7 @@ void gdk_gl_texture_from_surface (cairo_surface_t *surface, cairo_region_t *region) { @@ -291,14 +289,14 @@ index 85ce63d..d76e8dc 100644 GdkGLContext *paint_context; cairo_surface_t *image; double device_x_offset, device_y_offset; -@@ -750,4 +759,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, +@@ -799,4 +808,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, glDisable (GL_SCISSOR_TEST); glDeleteTextures (1, &texture_id); +#endif } diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c -index 4d71353..9bb55ef 100644 +index 00a33eb..bd8a793 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -85,7 +85,9 @@ @@ -311,7 +309,7 @@ index 4d71353..9bb55ef 100644 typedef struct { GdkDisplay *display; -@@ -238,6 +240,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, +@@ -239,6 +241,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, int height, guint texture_target) { @@ -319,7 +317,7 @@ index 4d71353..9bb55ef 100644 g_return_if_fail (GDK_IS_GL_CONTEXT (context)); glPixelStorei (GL_UNPACK_ALIGNMENT, 4); -@@ -245,6 +248,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, +@@ -246,6 +249,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, cairo_image_surface_get_data (image_surface)); glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); @@ -327,7 +325,7 @@ index 4d71353..9bb55ef 100644 } static void -@@ -586,6 +590,7 @@ gdk_gl_context_realize (GdkGLContext *context, +@@ -635,6 +639,7 @@ gdk_gl_context_realize (GdkGLContext *context, static void gdk_gl_context_check_extensions (GdkGLContext *context) { @@ -335,8 +333,8 @@ index 4d71353..9bb55ef 100644 GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); gboolean has_npot, has_texture_rectangle; -@@ -628,6 +633,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) - priv->use_texture_rectangle ? "yes" : "no")); +@@ -677,6 +682,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) + priv->use_texture_rectangle ? "yes" : "no")); priv->extensions_checked = TRUE; +#endif @@ -344,7 +342,7 @@ index 4d71353..9bb55ef 100644 /** diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c -index c34c113..3025e96 100644 +index 66ebb9d..74a0c3a 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -44,7 +44,9 @@ @@ -357,15 +355,7 @@ index c34c113..3025e96 100644 /* for the use of round() */ #include "fallback-c89.c" -@@ -1455,7 +1457,6 @@ gdk_window_new (GdkWindow *parent, - g_signal_connect (device_manager, "device-removed", - G_CALLBACK (device_removed_cb), window); - -- - if ((_gdk_gl_flags & (GDK_GL_ALWAYS | GDK_GL_DISABLE)) == GDK_GL_ALWAYS) - { - GError *error = NULL; -@@ -2761,6 +2762,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window, +@@ -2759,6 +2761,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window, { GError *internal_error = NULL; @@ -379,7 +369,7 @@ index c34c113..3025e96 100644 if (_gdk_gl_flags & GDK_GL_DISABLE) { g_set_error_literal (error, GDK_GL_ERROR, -@@ -2957,6 +2965,7 @@ gdk_window_begin_paint_region (GdkWindow *window, +@@ -2955,6 +2964,7 @@ gdk_window_begin_paint_region (GdkWindow *window, } else { @@ -387,7 +377,7 @@ index c34c113..3025e96 100644 gdk_gl_context_make_current (context); /* With gl we always need a surface to combine the gl drawing with the native drawing. */ -@@ -2971,6 +2980,7 @@ gdk_window_begin_paint_region (GdkWindow *window, +@@ -2969,6 +2979,7 @@ gdk_window_begin_paint_region (GdkWindow *window, glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glViewport (0, 0, ww, wh); @@ -395,7 +385,7 @@ index c34c113..3025e96 100644 } } -@@ -3119,6 +3129,7 @@ gdk_window_end_paint (GdkWindow *window) +@@ -3117,6 +3128,7 @@ gdk_window_end_paint (GdkWindow *window) gdk_gl_context_make_current (window->gl_paint_context); @@ -403,7 +393,7 @@ index c34c113..3025e96 100644 if (!cairo_region_is_empty (opaque_region)) gdk_gl_texture_from_surface (window->current_paint.surface, opaque_region); -@@ -3129,6 +3140,7 @@ gdk_window_end_paint (GdkWindow *window) +@@ -3127,6 +3139,7 @@ gdk_window_end_paint (GdkWindow *window) window->current_paint.need_blend_region); glDisable(GL_BLEND); } @@ -412,7 +402,7 @@ index c34c113..3025e96 100644 cairo_region_destroy (opaque_region); diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am -index c488a31..d0aa7ce 100644 +index c488a31..4ce3c07 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -39,8 +39,6 @@ libgdk_x11_la_SOURCES = \ @@ -424,7 +414,7 @@ index c488a31..d0aa7ce 100644 gdkkeys-x11.c \ gdkmain-x11.c \ gdkproperty-x11.c \ -@@ -53,14 +51,30 @@ libgdk_x11_la_SOURCES = \ +@@ -53,14 +51,32 @@ libgdk_x11_la_SOURCES = \ gdkwindow-x11.h \ gdkxftdefaults.c \ gdkxid.c \ @@ -450,13 +440,15 @@ index c488a31..d0aa7ce 100644 + +BUILT_SOURCES = gdkx.h + ++.PHONY: gdkx.h +gdkx.h: -+ $(AM_V_GEN) cd $(srcdir) && cp $(GDKX_HEADER) gdkx.h ++ $(AM_V_GEN) cd $(srcdir) \ ++ && (cmp -s $(GDKX_HEADER) gdkx.h || cp $(GDKX_HEADER) gdkx.h ) + libgdkx11include_HEADERS = \ gdkx-autocleanups.h \ gdkx11applaunchcontext.h \ -@@ -74,7 +88,6 @@ libgdkx11include_HEADERS = \ +@@ -74,7 +90,6 @@ libgdkx11include_HEADERS = \ gdkx11display.h \ gdkx11displaymanager.h \ gdkx11dnd.h \ @@ -464,7 +456,7 @@ index c488a31..d0aa7ce 100644 gdkx11keys.h \ gdkx11property.h \ gdkx11screen.h \ -@@ -83,9 +96,16 @@ libgdkx11include_HEADERS = \ +@@ -83,9 +98,16 @@ libgdkx11include_HEADERS = \ gdkx11visual.h \ gdkx11window.h @@ -482,7 +474,7 @@ index c488a31..d0aa7ce 100644 + -include $(top_srcdir)/git.mk diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c -index 5816d18..5d2dae6 100644 +index de91c64..42d50f6 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -37,7 +37,9 @@ @@ -495,19 +487,19 @@ index 5816d18..5d2dae6 100644 #include "gdk-private.h" #include <glib.h> -@@ -2989,8 +2991,8 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) - display_class->convert_selection = _gdk_x11_display_convert_selection; +@@ -2959,7 +2961,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list; display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target; -- + +- display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current; +#ifdef HAVE_OPENGL - display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current; -- ++ display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current; +#endif - _gdk_x11_windowing_init (); - } + + display_class->get_default_seat = gdk_x11_display_get_default_seat; + diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c -index 2bd7f28..30032e0 100644 +index 9d8ed20..bd46b00 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -1968,3 +1968,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) @@ -520,7 +512,7 @@ index 2bd7f28..30032e0 100644 +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} +#endif diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c -index d08cee0..d354628 100644 +index 9ed087a..30d6eb7 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -36,7 +36,9 @@ @@ -533,7 +525,7 @@ index d08cee0..d354628 100644 #include "gdkprivate-x11.h" #include "gdk-private.h" -@@ -5768,7 +5770,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) +@@ -5782,7 +5784,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; impl_class->show_window_menu = gdk_x11_window_show_window_menu; @@ -557,71 +549,10 @@ index edb0ea7..a317d61 100644 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref) -diff --git a/gdk/x11/gdkx-with-gl-context.h b/gdk/x11/gdkx-with-gl-context.h -new file mode 100644 -index 0000000..ae05fa6 ---- /dev/null -+++ b/gdk/x11/gdkx-with-gl-context.h -@@ -0,0 +1,59 @@ -+/* GDK - The GIMP Drawing Kit -+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see <http://www.gnu.org/licenses/>. -+ */ -+ -+/* -+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS -+ * file for a list of people on the GTK+ Team. See the ChangeLog -+ * files for a list of changes. These files are distributed with -+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. -+ */ -+ -+#ifndef __GDK_X_H__ -+#define __GDK_X_H__ -+ -+#include <gdk/gdk.h> -+ -+#include <X11/Xlib.h> -+#include <X11/Xutil.h> -+ -+#define __GDKX_H_INSIDE__ -+ -+#include <gdk/x11/gdkx11applaunchcontext.h> -+#include <gdk/x11/gdkx11cursor.h> -+#include <gdk/x11/gdkx11device.h> -+#include <gdk/x11/gdkx11device-core.h> -+#include <gdk/x11/gdkx11device-xi2.h> -+#include <gdk/x11/gdkx11devicemanager.h> -+#include <gdk/x11/gdkx11devicemanager-core.h> -+#include <gdk/x11/gdkx11devicemanager-xi2.h> -+#include <gdk/x11/gdkx11display.h> -+#include <gdk/x11/gdkx11displaymanager.h> -+#include <gdk/x11/gdkx11dnd.h> -+#include <gdk/x11/gdkx11glcontext.h> -+#include <gdk/x11/gdkx11keys.h> -+#include <gdk/x11/gdkx11property.h> -+#include <gdk/x11/gdkx11screen.h> -+#include <gdk/x11/gdkx11selection.h> -+#include <gdk/x11/gdkx11utils.h> -+#include <gdk/x11/gdkx11visual.h> -+#include <gdk/x11/gdkx11window.h> -+ -+#include <gdk/x11/gdkx-autocleanups.h> -+ -+#undef __GDKX_H_INSIDE__ -+ -+#endif /* __GDK_X_H__ */ +diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h +similarity index 100% +rename from gdk/x11/gdkx.h +rename to gdk/x11/gdkx-with-gl-context.h diff --git a/gdk/x11/gdkx-without-gl-context.h b/gdk/x11/gdkx-without-gl-context.h new file mode 100644 index 0000000..c9e2617 @@ -686,76 +617,11 @@ index 0000000..c9e2617 +#undef __GDKX_H_INSIDE__ + +#endif /* __GDK_X_H__ */ -diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h -deleted file mode 100644 -index ae05fa6..0000000 ---- a/gdk/x11/gdkx.h -+++ /dev/null -@@ -1,59 +0,0 @@ --/* GDK - The GIMP Drawing Kit -- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public -- * License along with this library. If not, see <http://www.gnu.org/licenses/>. -- */ -- --/* -- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS -- * file for a list of people on the GTK+ Team. See the ChangeLog -- * files for a list of changes. These files are distributed with -- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. -- */ -- --#ifndef __GDK_X_H__ --#define __GDK_X_H__ -- --#include <gdk/gdk.h> -- --#include <X11/Xlib.h> --#include <X11/Xutil.h> -- --#define __GDKX_H_INSIDE__ -- --#include <gdk/x11/gdkx11applaunchcontext.h> --#include <gdk/x11/gdkx11cursor.h> --#include <gdk/x11/gdkx11device.h> --#include <gdk/x11/gdkx11device-core.h> --#include <gdk/x11/gdkx11device-xi2.h> --#include <gdk/x11/gdkx11devicemanager.h> --#include <gdk/x11/gdkx11devicemanager-core.h> --#include <gdk/x11/gdkx11devicemanager-xi2.h> --#include <gdk/x11/gdkx11display.h> --#include <gdk/x11/gdkx11displaymanager.h> --#include <gdk/x11/gdkx11dnd.h> --#include <gdk/x11/gdkx11glcontext.h> --#include <gdk/x11/gdkx11keys.h> --#include <gdk/x11/gdkx11property.h> --#include <gdk/x11/gdkx11screen.h> --#include <gdk/x11/gdkx11selection.h> --#include <gdk/x11/gdkx11utils.h> --#include <gdk/x11/gdkx11visual.h> --#include <gdk/x11/gdkx11window.h> -- --#include <gdk/x11/gdkx-autocleanups.h> -- --#undef __GDKX_H_INSIDE__ -- --#endif /* __GDK_X_H__ */ diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 801c3a5..2d8839d 100644 +index 6a53a2b..49a35e6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am -@@ -1246,14 +1246,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. +@@ -1351,14 +1351,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. && cp xgen-gptbc gtkprivatetypebuiltins.c \ && rm -f xgen-gptbc @@ -772,7 +638,7 @@ index 801c3a5..2d8839d 100644 gtktestutils.c: gtktypefuncs.c diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c -index 4098409..45fa1d1 100644 +index 245fc6b..4214ad1 100644 --- a/gtk/gtkglarea.c +++ b/gtk/gtkglarea.c @@ -28,7 +28,9 @@ @@ -868,7 +734,7 @@ index 4098409..45fa1d1 100644 static gboolean diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c -index 0611373..4499a29 100644 +index 4eab3a7..c4e900e 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -33,8 +33,10 @@ @@ -882,7 +748,7 @@ index 0611373..4499a29 100644 #ifdef GDK_WINDOWING_WIN32 #include "win32/gdkwin32.h" -@@ -146,6 +148,7 @@ append_extension_row (GtkInspectorGeneral *gen, +@@ -147,6 +149,7 @@ append_extension_row (GtkInspectorGeneral *gen, gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label); } @@ -890,7 +756,7 @@ index 0611373..4499a29 100644 #ifdef GDK_WINDOWING_X11 static void append_glx_extension_row (GtkInspectorGeneral *gen, -@@ -155,6 +158,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, +@@ -156,6 +159,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, append_extension_row (gen, ext, epoxy_has_glx_extension (dpy, 0, ext)); } #endif @@ -898,27 +764,27 @@ index 0611373..4499a29 100644 #ifdef GDK_WINDOWING_WAYLAND static void -@@ -174,6 +178,7 @@ init_gl (GtkInspectorGeneral *gen) - - display = gdk_display_get_default (); - +@@ -171,6 +175,7 @@ append_egl_extension_row (GtkInspectorGeneral *gen, + static void + init_gl (GtkInspectorGeneral *gen) + { +#ifdef HAVE_OPENGL #ifdef GDK_WINDOWING_X11 - if (GDK_IS_X11_DISPLAY (display)) + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) { -@@ -199,6 +204,7 @@ init_gl (GtkInspectorGeneral *gen) +@@ -197,6 +202,7 @@ init_gl (GtkInspectorGeneral *gen) } else #endif +#endif #ifdef GDK_WINDOWING_WAYLAND - if (GDK_IS_WAYLAND_DISPLAY (display)) + if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) { diff --git a/tests/Makefile.am b/tests/Makefile.am -index 50f2986..3b39169 100644 +index 681807d..2941a36 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -78,8 +78,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ +@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ testfullscreen \ testgeometry \ testgiconpixbuf \ @@ -927,18 +793,19 @@ index 50f2986..3b39169 100644 testgrid \ testgtk \ testheaderbar \ -@@ -166,10 +164,16 @@ noinst_PROGRAMS = $(TEST_PROGS) \ +@@ -169,11 +167,17 @@ noinst_PROGRAMS = $(TEST_PROGS) \ testactionbar \ testwindowsize \ testpopover \ - gdkgears \ listmodel \ + testpopup \ $(NULL) +if HAVE_OPENGL +noinst_PROGRAMS += -+ testglarea \ -+ testglblending \ ++ testglarea \ ++ testglblending \ + gdkgears +endif + @@ -946,11 +813,11 @@ index 50f2986..3b39169 100644 noinst_PROGRAMS += testerrors endif diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c -index 3568505..682ea10 100644 +index e0ebee0..703643c 100644 --- a/testsuite/gtk/objects-finalize.c +++ b/testsuite/gtk/objects-finalize.c -@@ -114,8 +114,10 @@ main (int argc, char **argv) - all_types[i] != GDK_TYPE_X11_DISPLAY && +@@ -115,8 +115,10 @@ main (int argc, char **argv) + all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && +#ifdef HAVE_OPENGL @@ -961,5 +828,5 @@ index 3568505..682ea10 100644 all_types[i] != GDK_TYPE_PIXBUF_LOADER && all_types[i] != gdk_pixbuf_simple_anim_iter_get_type()) -- -2.8.1 +2.1.4 diff --git a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch new file mode 100644 index 0000000..634b3a4 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch @@ -0,0 +1,36 @@ +From 97b78e566634579bbae51be914aeaaa921137a8b Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Thu, 9 Jun 2016 11:21:36 +0300 +Subject: [PATCH 4/4] configure.ac: Fix wayland-protocols path + +The wayland-protocols directory is used during build: Fix the path +to point to sysroot specified in recipe. + +Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that +breaks multilib gtk+ as it would point to multilib sysroot when the +(allarch) wayland-protocols is actually in the machine sysroot. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a3e9beb..dde9dc5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -461,7 +461,7 @@ fi + if test "$enable_wayland_backend" = "yes"; then + # For the cairo image backend + cairo_backends="$cairo_backends cairo" +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) ++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) + GDK_BACKENDS="$GDK_BACKENDS wayland" + GDK_WINDOWING="$GDK_WINDOWING + #define GDK_WINDOWING_WAYLAND" +-- +2.1.4 + diff --git a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch deleted file mode 100644 index 32d8a84..0000000 --- a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch +++ /dev/null @@ -1,118 +0,0 @@ -window: Check if we can use CSD before enabling them - -Upstream-Status: Backport -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> - - -From c5e5ee67490e7e7af56052d8f8beb75db002c2f1 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <ebassi@gnome.org> -Date: Wed, 3 Jun 2015 14:07:29 +0100 -Subject: window: Check if we can use CSD before enabling them - -The change in 03213b9509fc1df16c66194ea168aed6c15110e9 changed the rules -as to when CSD can be enabled, but it also unconditionally enables CSD -with the implicit assumption that client-side shadows were the real -issue, and that we could work around that by drawing our own borders. -This also means that setting a titlebar for a GtkWindow will enable CSD -unconditionally. - -In reality, some window managers (like Matchbox) *only* support -server-side decorations, and will ignore all hints to the contrary, to -the point of drawing decorations at random locations on top of the -window. - -Since CSD are enabled unconditionally, the GTK_CSD environment variable -is also not a suitable escape hatch. - -In the grand tradition of asking ourselves if we should do something -just because we can, we should split the environment checks from the -checks on what the user requested; by doing that, we can also check -when enabling client-side decorations, and ideally bail out if needed. - -https://bugzilla.gnome.org/show_bug.cgi?id=750343 - -diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c -index 423c6bd..9fe882f 100644 ---- a/gtk/gtkwindow.c -+++ b/gtk/gtkwindow.c -@@ -4056,6 +4056,32 @@ gtk_window_supports_client_shadow (GtkWindow *window) - return TRUE; - } - -+static gboolean -+gtk_window_can_use_csd (GtkWindow *window) -+{ -+ const gchar *csd_env; -+ -+#ifdef GDK_WINDOWING_BROADWAY -+ if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) -+ return TRUE; -+#endif -+ -+#ifdef GDK_WINDOWING_WAYLAND -+ if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) -+ return TRUE; -+#endif -+ -+#ifdef GDK_WINDOWING_MIR -+ if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) -+ return TRUE; -+#endif -+ -+ csd_env = g_getenv ("GTK_CSD"); -+ -+ /* If GTK_CSD is unset we default to CSD support */ -+ return csd_env == NULL || (strcmp (csd_env, "1") == 0); -+} -+ - static void - gtk_window_enable_csd (GtkWindow *window) - { -@@ -4063,6 +4089,10 @@ gtk_window_enable_csd (GtkWindow *window) - GtkWidget *widget = GTK_WIDGET (window); - GdkVisual *visual; - -+ /* If the environment does not support CSD, then there's no point in enabling them */ -+ if (!gtk_window_can_use_csd (window)) -+ return; -+ - /* We need a visual with alpha for client shadows */ - if (priv->use_client_shadow) - { -@@ -5839,7 +5869,6 @@ static gboolean - gtk_window_should_use_csd (GtkWindow *window) - { - GtkWindowPrivate *priv = window->priv; -- const gchar *csd_env; - - if (priv->csd_requested) - return TRUE; -@@ -5850,24 +5879,7 @@ gtk_window_should_use_csd (GtkWindow *window) - if (priv->type == GTK_WINDOW_POPUP) - return FALSE; - --#ifdef GDK_WINDOWING_BROADWAY -- if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) -- return TRUE; --#endif -- --#ifdef GDK_WINDOWING_WAYLAND -- if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) -- return TRUE; --#endif -- --#ifdef GDK_WINDOWING_MIR -- if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) -- return TRUE; --#endif -- -- csd_env = g_getenv ("GTK_CSD"); -- -- return (g_strcmp0 (csd_env, "1") == 0); -+ return gtk_window_can_use_csd (window); - } - - static void --- -cgit v0.10.2 - diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb similarity index 57% rename from meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb rename to meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb index d776b6d..453a4e2 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb @@ -3,14 +3,13 @@ require gtk+3.inc MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ - file://hardcoded_libtool.patch \ - file://Dont-force-csd.patch \ - file://Do-not-try-to-initialize-GL-without-libGL.patch \ - file://0001-Add-disable-opengl-configure-option.patch \ + file://0001-Hardcoded-libtool.patch \ + file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ + file://0003-Add-disable-opengl-configure-option.patch \ + file://0004-configure.ac-Fix-wayland-protocols-path.patch \ " - -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" -SRC_URI[sha256sum] = "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" +SRC_URI[sha256sum] = "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" S = "${WORKDIR}/gtk+-${PV}" diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb similarity index 93% rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb index 793f14a..e870ba3 100644 --- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb +++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb @@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch" -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" -SRC_URI[sha256sum] = "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" +SRC_URI[sha256sum] = "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 2016-06-22 11:52 ` [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 Jussi Kukkonen @ 2016-07-05 13:09 ` Robert Yang 2016-07-05 14:08 ` Jussi Kukkonen 0 siblings, 1 reply; 19+ messages in thread From: Robert Yang @ 2016-07-05 13:09 UTC (permalink / raw) To: Jussi Kukkonen, openembedded-core Hi, I can't build it on Ubuntu 14.04: MACHINE = "qemux86" $ bitbake gtk+3 Making all in po-properties make[2]: Entering directory '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/po-properties' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/po-properties' Making all in gdk make[2]: Entering directory '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk' ( cd ../../gtk+-3.20.6/gdk && glib-mkenums --template gdkenumtypes.h.template \ gdk.h gdk-autocleanup.h gdkapplaunchcontext.h gdkcairo.h gdkcursor.h gdkdevice.h gdkdevicemanager.h gdkdisplay.h gdkdisplaymanager.h gdkdnd.h gdkevents.h gdkframetimings.h gdkglcontext.h gdkkeys.h gdkkeysyms.h gdkkeysyms-compat.h gdkmain.h gdkpango.h gdkframeclock.h gdkpixbuf.h gdkprivate.h gdkproperty.h gdkrectangle.h gdkrgba.h gdkscreen.h gdkseat.h gdkselection.h gdktestutils.h gdkthreads.h gdktypes.h gdkvisual.h gdkwindow.h deprecated/gdkcolor.h ) >> xgen-geth \ && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \ && rm -f xgen-geth \ && echo timestamp > stamp-gdkenumtypes.h cd .. && /bin/sh ./config.status gdk/gdkconfig.h \ && echo timestamp > gdk/stamp-gc-h config.status: executing gdk/gdkconfig.h commands config.status: gdk/gdkconfig.h is unchanged if test -f gdkconfig.h; then :; \ else rm -f stamp-gc-h; make stamp-gc-h; fi make all-recursive make[3]: Entering directory '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk' Making all in x11 make[4]: Entering directory '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk/x11' cd ../../../gtk+-3.20.6/gdk/x11 \ && (cmp -s gdkx-with-gl-context.h gdkx.h || cp gdkx-with-gl-context.h gdkx.h ) cp: cannot stat 'gdkx-with-gl-context.h': No such file or directory Makefile:1014: recipe for target 'gdkx.h' failed make[4]: *** [gdkx.h] Error 1 make[4]: Leaving directory '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk/x11' Makefile:1460: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk' Makefile:951: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk' Makefile:713: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build' Makefile:607: recipe for target 'all' failed make: *** [all] Error 2 // Robert On 06/22/2016 07:52 PM, Jussi Kukkonen wrote: > * Remove a patch that's no longer needed (as we don't > have a problem with client side decorations anymore) > * Wayland build now depends on wayland-protocols: > Use same WAYLAND_PROTOCOLS_SYSROOT_DIR trick as weston so > protocols are found and multilib build does not break > * Add new binary gtk-query-settings to -dev package > * Rebase patches > * Modify 0003-Add-disable-opengl-configure-option.patch so > that gdkx.h really is generated whenever it changes > > Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > --- > meta/recipes-gnome/gtk+/gtk+3.inc | 9 +- > ..._libtool.patch => 0001-Hardcoded-libtool.patch} | 26 +- > ...o-not-try-to-initialize-GL-without-libGL.patch} | 12 +- > ...0003-Add-disable-opengl-configure-option.patch} | 327 ++++++--------------- > ...4-configure.ac-Fix-wayland-protocols-path.patch | 36 +++ > meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch | 118 -------- > .../gtk+/{gtk+3_3.18.8.bb => gtk+3_3.20.6.bb} | 13 +- > ...e_3.18.8.bb => gtk-icon-utils-native_3.20.6.bb} | 4 +- > 8 files changed, 173 insertions(+), 372 deletions(-) > rename meta/recipes-gnome/gtk+/gtk+3/{hardcoded_libtool.patch => 0001-Hardcoded-libtool.patch} (70%) > rename meta/recipes-gnome/gtk+/gtk+3/{Do-not-try-to-initialize-GL-without-libGL.patch => 0002-Do-not-try-to-initialize-GL-without-libGL.patch} (86%) > rename meta/recipes-gnome/gtk+/gtk+3/{0001-Add-disable-opengl-configure-option.patch => 0003-Add-disable-opengl-configure-option.patch} (71%) > create mode 100644 meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch > delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch > rename meta/recipes-gnome/gtk+/{gtk+3_3.18.8.bb => gtk+3_3.20.6.bb} (57%) > rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.18.8.bb => gtk-icon-utils-native_3.20.6.bb} (93%) > > diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc > index 959fb44..0de114d 100644 > --- a/meta/recipes-gnome/gtk+/gtk+3.inc > +++ b/meta/recipes-gnome/gtk+/gtk+3.inc > @@ -31,7 +31,9 @@ EXTRA_OECONF += " \ > --enable-modules \ > --disable-cups \ > --disable-colord \ > -" > + WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ > + " > +EXTRA_OECONF[vardepsexclude] = "MACHINE" > > do_compile_prepend() { > export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" > @@ -46,7 +48,7 @@ PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fon > # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build > PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy" > PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" > -PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon virtual/mesa wayland-native" > +PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/mesa wayland-native" > > do_install_append() { > mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 > @@ -76,6 +78,7 @@ FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \ > FILES_${PN}-dev += " \ > ${datadir}/gtk-3.0/gtkbuilder.rng \ > ${datadir}/gtk-3.0/include \ > + ${datadir}/gettext/its \ > ${libdir}/gtk-3.0/include \ > ${libdir}/gtk-3.0/${LIBV}/loaders/*.la \ > ${libdir}/gtk-3.0/${LIBV}/immodules/*.la \ > @@ -85,6 +88,7 @@ FILES_${PN}-dev += " \ > ${bindir}/gtk-builder-convert \ > ${bindir}/gtk-encode-symbolic-svg \ > ${bindir}/gtk-builder-tool \ > + ${bindir}/gtk-query-settings \ > " > > GTKBASE_RRECOMMENDS ?= "liberation-fonts \ > @@ -99,6 +103,7 @@ GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" > > RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" > RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" > +RRECOMMENDS_${PN}-dev += "wayland-protocols" > > PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" > > diff --git a/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch > similarity index 70% > rename from meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch > rename to meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch > index 3b4beeb..0bda1f1 100644 > --- a/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch > +++ b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch > @@ -1,12 +1,21 @@ > +From 5a73a5b92566e314bbc8a1bd40f1ec204837c111 Mon Sep 17 00:00:00 2001 > +From: Jussi Kukkonen <jussi.kukkonen@intel.com> > +Date: Tue, 21 Jun 2016 14:53:56 +0300 > +Subject: [PATCH 1/4] Hardcoded libtool > + > Upstream-Status: Inappropriate [embedded specific] > > Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> > +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > +--- > + configure.ac | 6 +++--- > + 1 file changed, 3 insertions(+), 3 deletions(-) > > -Index: gtk+-3.8.2/configure.ac > -=================================================================== > ---- gtk+-3.8.2.orig/configure.ac > -+++ gtk+-3.8.2/configure.ac > -@@ -531,7 +531,7 @@ AC_MSG_CHECKING([Whether to write depend > +diff --git a/configure.ac b/configure.ac > +index 23d3077..b6931d6 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -610,7 +610,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc files]) > case $enable_explicit_deps in > auto) > export SED > @@ -15,7 +24,7 @@ Index: gtk+-3.8.2/configure.ac > if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then > enable_explicit_deps=yes > else > -@@ -793,7 +793,7 @@ else > +@@ -876,7 +876,7 @@ else > dnl Now we check to see if our libtool supports shared lib deps > dnl (in a rather ugly way even) > if $dynworks; then > @@ -24,7 +33,7 @@ Index: gtk+-3.8.2/configure.ac > module_deplibs_check=`$module_libtool_config | \ > grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ > sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` > -@@ -1528,7 +1528,7 @@ fi > +@@ -1630,7 +1630,7 @@ AC_SUBST(GTK_PRINT_BACKENDS) > # We are using gmodule-no-export now, but I'm leaving the stripping > # code in place for now, since pango and atk still require gmodule. > export SED > @@ -33,3 +42,6 @@ Index: gtk+-3.8.2/configure.ac > if test -n "$export_dynamic"; then > GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` > GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` > +-- > +2.1.4 > + > diff --git a/meta/recipes-gnome/gtk+/gtk+3/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 > similarity index 86% > rename from meta/recipes-gnome/gtk+/gtk+3/Do-not-try-to-initialize-GL-without-libGL.patch > rename to meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch > index c8c480c..989716e 100644 > --- a/meta/recipes-gnome/gtk+/gtk+3/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 @@ > -From fc22058a10db913534f11348f86681fe9e1838e5 Mon Sep 17 00:00:00 2001 > +From d63b926f8c8d8b5c9f9ec33d078b775f0409d88a Mon Sep 17 00:00:00 2001 > From: Jussi Kukkonen <jussi.kukkonen@intel.com> > Date: Fri, 16 Oct 2015 16:35:16 +0300 > -Subject: [PATCH] Do not try to initialize GL without libGL > +Subject: [PATCH 2/4] Do not try to initialize GL without libGL > > _gdk_x11_screen_update_visuals_for_gl() will end up calling epoxys > GLX api which will exit() if libGL.so.1 is not present. We do not > @@ -21,10 +21,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > 2 files changed, 12 insertions(+) > > diff --git a/configure.ac b/configure.ac > -index 729a62e..58cc1ac 100644 > +index b6931d6..e27da49 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -328,6 +328,13 @@ AC_ARG_ENABLE(mir-backend, > +@@ -342,6 +342,13 @@ AC_ARG_ENABLE(mir-backend, > [enable the Mir gdk backend])], > [backend_set=yes]) > > @@ -39,10 +39,10 @@ index 729a62e..58cc1ac 100644 > if test "$platform_win32" = yes; then > enable_win32_backend=yes > diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c > -index f3b062d..c8243f4 100644 > +index 81479d8..3c8c5c0 100644 > --- a/gdk/x11/gdkvisual-x11.c > +++ b/gdk/x11/gdkvisual-x11.c > -@@ -345,7 +345,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen) > +@@ -306,7 +306,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen) > /* If GL is available we want to pick better default/rgba visuals, > as we care about glx details such as alpha/depth/stencil depth, > stereo and double buffering */ > diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch > similarity index 71% > rename from meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch > rename to meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch > index a963334..8552f53 100644 > --- a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch > +++ b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch > @@ -1,7 +1,7 @@ > -From c77afa19881d955d759879aeae8bbd88613dd4fe Mon Sep 17 00:00:00 2001 > +From a8fa547fdc1416b330aced805f5343ad912932ae Mon Sep 17 00:00:00 2001 > From: Jussi Kukkonen <jussi.kukkonen@intel.com> > -Date: Thu, 16 Jun 2016 15:11:34 +0300 > -Subject: [PATCH] Add --disable-opengl configure option > +Date: Tue, 21 Jun 2016 15:11:39 +0300 > +Subject: [PATCH 3/4] Add --disable-opengl configure option > > --disable-opengl will remove the dependency on libepoxy and on the > OpenGL APIs. This is useful for those who want to keep using gtk+3 > @@ -20,37 +20,35 @@ Long-term it would be good to find an alternative solution to this > Upstream-Status: Inappropriate [Evil eye expected from upstream] > Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > --- > - configure.ac | 13 +++++++-- > - demos/gtk-demo/glarea.c | 13 +++++++++ > - docs/tools/Makefile.am | 9 ++++-- > - docs/tools/widgets.c | 4 ++- > - gdk/gdkdisplay.c | 4 ++- > - gdk/gdkgl.c | 10 +++++++ > - gdk/gdkglcontext.c | 6 ++++ > - gdk/gdkwindow.c | 14 +++++++++- > - gdk/x11/Makefile.am | 28 ++++++++++++++++--- > - gdk/x11/gdkdisplay-x11.c | 6 ++-- > - gdk/x11/gdkscreen-x11.c | 5 ++++ > - gdk/x11/gdkwindow-x11.c | 4 +++ > - gdk/x11/gdkx-autocleanups.h | 2 ++ > - gdk/x11/gdkx-with-gl-context.h | 59 +++++++++++++++++++++++++++++++++++++++ > - gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++++++++++ > - gdk/x11/gdkx.h | 59 --------------------------------------- > - gtk/Makefile.am | 3 +- > - gtk/gtkglarea.c | 20 ++++++++++++- > - gtk/inspector/general.c | 6 ++++ > - tests/Makefile.am | 10 +++++-- > - testsuite/gtk/objects-finalize.c | 2 ++ > - 21 files changed, 257 insertions(+), 78 deletions(-) > - create mode 100644 gdk/x11/gdkx-with-gl-context.h > + configure.ac | 13 +++++-- > + demos/gtk-demo/glarea.c | 13 +++++++ > + docs/tools/Makefile.am | 9 +++-- > + docs/tools/widgets.c | 4 ++- > + gdk/gdkdisplay.c | 4 ++- > + gdk/gdkgl.c | 10 ++++++ > + gdk/gdkglcontext.c | 6 ++++ > + gdk/gdkwindow.c | 13 +++++++ > + gdk/x11/Makefile.am | 30 +++++++++++++--- > + gdk/x11/gdkdisplay-x11.c | 6 +++- > + gdk/x11/gdkscreen-x11.c | 5 +++ > + gdk/x11/gdkwindow-x11.c | 4 +++ > + gdk/x11/gdkx-autocleanups.h | 2 ++ > + gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 0 > + gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++ > + gtk/Makefile.am | 3 +- > + gtk/gtkglarea.c | 20 ++++++++++- > + gtk/inspector/general.c | 6 ++++ > + tests/Makefile.am | 10 ++++-- > + testsuite/gtk/objects-finalize.c | 2 ++ > + 20 files changed, 201 insertions(+), 17 deletions(-) > + rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (100%) > create mode 100644 gdk/x11/gdkx-without-gl-context.h > - delete mode 100644 gdk/x11/gdkx.h > > diff --git a/configure.ac b/configure.ac > -index c280543..32da151 100644 > +index e27da49..a3e9beb 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -340,6 +340,15 @@ AC_ARG_ENABLE(mir-backend, > +@@ -342,6 +342,15 @@ AC_ARG_ENABLE(mir-backend, > [enable the Mir gdk backend])], > [backend_set=yes]) > > @@ -66,7 +64,7 @@ index c280543..32da151 100644 > AC_ARG_ENABLE(glx, > [AS_HELP_STRING([--enable-glx], > [When enabled Gdk will try to initialize GLX])]) > -@@ -1330,7 +1339,7 @@ CFLAGS="$saved_cflags" > +@@ -1333,7 +1342,7 @@ CFLAGS="$saved_cflags" > LDFLAGS="$saved_ldflags" > > GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" > @@ -75,7 +73,7 @@ index c280543..32da151 100644 > > PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) > GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" > -@@ -1364,7 +1373,7 @@ fi > +@@ -1367,7 +1376,7 @@ fi > PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) > > 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" > @@ -85,7 +83,7 @@ index c280543..32da151 100644 > GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" > fi > diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c > -index c267706..b3bac86 100644 > +index 3aba729..c6c79f7 100644 > --- a/demos/gtk-demo/glarea.c > +++ b/demos/gtk-demo/glarea.c > @@ -5,7 +5,9 @@ > @@ -207,10 +205,10 @@ index 932daf1..54239d6 100644 > > return info; > diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c > -index 892d6a7..8323768 100644 > +index 6150ef7..2223629 100644 > --- a/gdk/gdkdisplay.c > +++ b/gdk/gdkdisplay.c > -@@ -2285,7 +2285,9 @@ gboolean > +@@ -2360,7 +2360,9 @@ gboolean > gdk_display_make_gl_context_current (GdkDisplay *display, > GdkGLContext *context) > { > @@ -222,7 +220,7 @@ index 892d6a7..8323768 100644 > > GdkRenderingMode > diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c > -index 85ce63d..d76e8dc 100644 > +index e8ba770..ba7c84b 100644 > --- a/gdk/gdkgl.c > +++ b/gdk/gdkgl.c > @@ -22,7 +22,9 @@ > @@ -243,7 +241,7 @@ index 85ce63d..d76e8dc 100644 > static const char * > get_vertex_type_name (int type) > { > -@@ -205,6 +208,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) > +@@ -254,6 +257,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) > glUseProgram (paint_data->current_program->program); > } > } > @@ -251,7 +249,7 @@ index 85ce63d..d76e8dc 100644 > > void > gdk_gl_texture_quads (GdkGLContext *paint_context, > -@@ -212,6 +216,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, > +@@ -261,6 +265,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, > int n_quads, > GdkTexturedQuad *quads) > { > @@ -259,7 +257,7 @@ index 85ce63d..d76e8dc 100644 > GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context); > GdkGLContextProgram *program; > GdkWindow *window = gdk_gl_context_get_window (paint_context); > -@@ -275,6 +280,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, > +@@ -324,6 +329,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, > > glDisableVertexAttribArray (program->position_location); > glDisableVertexAttribArray (program->uv_location); > @@ -267,7 +265,7 @@ index 85ce63d..d76e8dc 100644 > } > > /* x,y,width,height describes a rectangle in the gl render buffer > -@@ -323,6 +329,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, > +@@ -372,6 +378,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, > int width, > int height) > { > @@ -275,7 +273,7 @@ index 85ce63d..d76e8dc 100644 > GdkGLContext *paint_context; > cairo_surface_t *image; > cairo_matrix_t matrix; > -@@ -643,6 +650,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, > +@@ -692,6 +699,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, > if (clip_region) > cairo_region_destroy (clip_region); > > @@ -283,7 +281,7 @@ index 85ce63d..d76e8dc 100644 > } > > /* This is always called with the paint context current */ > -@@ -650,6 +658,7 @@ void > +@@ -699,6 +707,7 @@ void > gdk_gl_texture_from_surface (cairo_surface_t *surface, > cairo_region_t *region) > { > @@ -291,14 +289,14 @@ index 85ce63d..d76e8dc 100644 > GdkGLContext *paint_context; > cairo_surface_t *image; > double device_x_offset, device_y_offset; > -@@ -750,4 +759,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, > +@@ -799,4 +808,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, > > glDisable (GL_SCISSOR_TEST); > glDeleteTextures (1, &texture_id); > +#endif > } > diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c > -index 4d71353..9bb55ef 100644 > +index 00a33eb..bd8a793 100644 > --- a/gdk/gdkglcontext.c > +++ b/gdk/gdkglcontext.c > @@ -85,7 +85,9 @@ > @@ -311,7 +309,7 @@ index 4d71353..9bb55ef 100644 > > typedef struct { > GdkDisplay *display; > -@@ -238,6 +240,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, > +@@ -239,6 +241,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, > int height, > guint texture_target) > { > @@ -319,7 +317,7 @@ index 4d71353..9bb55ef 100644 > g_return_if_fail (GDK_IS_GL_CONTEXT (context)); > > glPixelStorei (GL_UNPACK_ALIGNMENT, 4); > -@@ -245,6 +248,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, > +@@ -246,6 +249,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, > glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, > cairo_image_surface_get_data (image_surface)); > glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); > @@ -327,7 +325,7 @@ index 4d71353..9bb55ef 100644 > } > > static void > -@@ -586,6 +590,7 @@ gdk_gl_context_realize (GdkGLContext *context, > +@@ -635,6 +639,7 @@ gdk_gl_context_realize (GdkGLContext *context, > static void > gdk_gl_context_check_extensions (GdkGLContext *context) > { > @@ -335,8 +333,8 @@ index 4d71353..9bb55ef 100644 > GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); > gboolean has_npot, has_texture_rectangle; > > -@@ -628,6 +633,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) > - priv->use_texture_rectangle ? "yes" : "no")); > +@@ -677,6 +682,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) > + priv->use_texture_rectangle ? "yes" : "no")); > > priv->extensions_checked = TRUE; > +#endif > @@ -344,7 +342,7 @@ index 4d71353..9bb55ef 100644 > > /** > diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c > -index c34c113..3025e96 100644 > +index 66ebb9d..74a0c3a 100644 > --- a/gdk/gdkwindow.c > +++ b/gdk/gdkwindow.c > @@ -44,7 +44,9 @@ > @@ -357,15 +355,7 @@ index c34c113..3025e96 100644 > > /* for the use of round() */ > #include "fallback-c89.c" > -@@ -1455,7 +1457,6 @@ gdk_window_new (GdkWindow *parent, > - g_signal_connect (device_manager, "device-removed", > - G_CALLBACK (device_removed_cb), window); > - > -- > - if ((_gdk_gl_flags & (GDK_GL_ALWAYS | GDK_GL_DISABLE)) == GDK_GL_ALWAYS) > - { > - GError *error = NULL; > -@@ -2761,6 +2762,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window, > +@@ -2759,6 +2761,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window, > { > GError *internal_error = NULL; > > @@ -379,7 +369,7 @@ index c34c113..3025e96 100644 > if (_gdk_gl_flags & GDK_GL_DISABLE) > { > g_set_error_literal (error, GDK_GL_ERROR, > -@@ -2957,6 +2965,7 @@ gdk_window_begin_paint_region (GdkWindow *window, > +@@ -2955,6 +2964,7 @@ gdk_window_begin_paint_region (GdkWindow *window, > } > else > { > @@ -387,7 +377,7 @@ index c34c113..3025e96 100644 > gdk_gl_context_make_current (context); > /* With gl we always need a surface to combine the gl > drawing with the native drawing. */ > -@@ -2971,6 +2980,7 @@ gdk_window_begin_paint_region (GdkWindow *window, > +@@ -2969,6 +2979,7 @@ gdk_window_begin_paint_region (GdkWindow *window, > glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); > > glViewport (0, 0, ww, wh); > @@ -395,7 +385,7 @@ index c34c113..3025e96 100644 > } > } > > -@@ -3119,6 +3129,7 @@ gdk_window_end_paint (GdkWindow *window) > +@@ -3117,6 +3128,7 @@ gdk_window_end_paint (GdkWindow *window) > > gdk_gl_context_make_current (window->gl_paint_context); > > @@ -403,7 +393,7 @@ index c34c113..3025e96 100644 > if (!cairo_region_is_empty (opaque_region)) > gdk_gl_texture_from_surface (window->current_paint.surface, > opaque_region); > -@@ -3129,6 +3140,7 @@ gdk_window_end_paint (GdkWindow *window) > +@@ -3127,6 +3139,7 @@ gdk_window_end_paint (GdkWindow *window) > window->current_paint.need_blend_region); > glDisable(GL_BLEND); > } > @@ -412,7 +402,7 @@ index c34c113..3025e96 100644 > cairo_region_destroy (opaque_region); > > diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am > -index c488a31..d0aa7ce 100644 > +index c488a31..4ce3c07 100644 > --- a/gdk/x11/Makefile.am > +++ b/gdk/x11/Makefile.am > @@ -39,8 +39,6 @@ libgdk_x11_la_SOURCES = \ > @@ -424,7 +414,7 @@ index c488a31..d0aa7ce 100644 > gdkkeys-x11.c \ > gdkmain-x11.c \ > gdkproperty-x11.c \ > -@@ -53,14 +51,30 @@ libgdk_x11_la_SOURCES = \ > +@@ -53,14 +51,32 @@ libgdk_x11_la_SOURCES = \ > gdkwindow-x11.h \ > gdkxftdefaults.c \ > gdkxid.c \ > @@ -450,13 +440,15 @@ index c488a31..d0aa7ce 100644 > + > +BUILT_SOURCES = gdkx.h > + > ++.PHONY: gdkx.h > +gdkx.h: > -+ $(AM_V_GEN) cd $(srcdir) && cp $(GDKX_HEADER) gdkx.h > ++ $(AM_V_GEN) cd $(srcdir) \ > ++ && (cmp -s $(GDKX_HEADER) gdkx.h || cp $(GDKX_HEADER) gdkx.h ) > + > libgdkx11include_HEADERS = \ > gdkx-autocleanups.h \ > gdkx11applaunchcontext.h \ > -@@ -74,7 +88,6 @@ libgdkx11include_HEADERS = \ > +@@ -74,7 +90,6 @@ libgdkx11include_HEADERS = \ > gdkx11display.h \ > gdkx11displaymanager.h \ > gdkx11dnd.h \ > @@ -464,7 +456,7 @@ index c488a31..d0aa7ce 100644 > gdkx11keys.h \ > gdkx11property.h \ > gdkx11screen.h \ > -@@ -83,9 +96,16 @@ libgdkx11include_HEADERS = \ > +@@ -83,9 +98,16 @@ libgdkx11include_HEADERS = \ > gdkx11visual.h \ > gdkx11window.h > > @@ -482,7 +474,7 @@ index c488a31..d0aa7ce 100644 > + > -include $(top_srcdir)/git.mk > diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c > -index 5816d18..5d2dae6 100644 > +index de91c64..42d50f6 100644 > --- a/gdk/x11/gdkdisplay-x11.c > +++ b/gdk/x11/gdkdisplay-x11.c > @@ -37,7 +37,9 @@ > @@ -495,19 +487,19 @@ index 5816d18..5d2dae6 100644 > #include "gdk-private.h" > > #include <glib.h> > -@@ -2989,8 +2991,8 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) > - display_class->convert_selection = _gdk_x11_display_convert_selection; > +@@ -2959,7 +2961,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) > display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list; > display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target; > -- > + > +- display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current; > +#ifdef HAVE_OPENGL > - display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current; > -- > ++ display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current; > +#endif > - _gdk_x11_windowing_init (); > - } > + > + display_class->get_default_seat = gdk_x11_display_get_default_seat; > + > diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c > -index 2bd7f28..30032e0 100644 > +index 9d8ed20..bd46b00 100644 > --- a/gdk/x11/gdkscreen-x11.c > +++ b/gdk/x11/gdkscreen-x11.c > @@ -1968,3 +1968,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) > @@ -520,7 +512,7 @@ index 2bd7f28..30032e0 100644 > +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} > +#endif > diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c > -index d08cee0..d354628 100644 > +index 9ed087a..30d6eb7 100644 > --- a/gdk/x11/gdkwindow-x11.c > +++ b/gdk/x11/gdkwindow-x11.c > @@ -36,7 +36,9 @@ > @@ -533,7 +525,7 @@ index d08cee0..d354628 100644 > #include "gdkprivate-x11.h" > #include "gdk-private.h" > > -@@ -5768,7 +5770,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) > +@@ -5782,7 +5784,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) > impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; > impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; > impl_class->show_window_menu = gdk_x11_window_show_window_menu; > @@ -557,71 +549,10 @@ index edb0ea7..a317d61 100644 > G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref) > G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref) > G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref) > -diff --git a/gdk/x11/gdkx-with-gl-context.h b/gdk/x11/gdkx-with-gl-context.h > -new file mode 100644 > -index 0000000..ae05fa6 > ---- /dev/null > -+++ b/gdk/x11/gdkx-with-gl-context.h > -@@ -0,0 +1,59 @@ > -+/* GDK - The GIMP Drawing Kit > -+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald > -+ * > -+ * This library is free software; you can redistribute it and/or > -+ * modify it under the terms of the GNU Lesser General Public > -+ * License as published by the Free Software Foundation; either > -+ * version 2 of the License, or (at your option) any later version. > -+ * > -+ * This library is distributed in the hope that it will be useful, > -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -+ * Lesser General Public License for more details. > -+ * > -+ * You should have received a copy of the GNU Lesser General Public > -+ * License along with this library. If not, see <http://www.gnu.org/licenses/>. > -+ */ > -+ > -+/* > -+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS > -+ * file for a list of people on the GTK+ Team. See the ChangeLog > -+ * files for a list of changes. These files are distributed with > -+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. > -+ */ > -+ > -+#ifndef __GDK_X_H__ > -+#define __GDK_X_H__ > -+ > -+#include <gdk/gdk.h> > -+ > -+#include <X11/Xlib.h> > -+#include <X11/Xutil.h> > -+ > -+#define __GDKX_H_INSIDE__ > -+ > -+#include <gdk/x11/gdkx11applaunchcontext.h> > -+#include <gdk/x11/gdkx11cursor.h> > -+#include <gdk/x11/gdkx11device.h> > -+#include <gdk/x11/gdkx11device-core.h> > -+#include <gdk/x11/gdkx11device-xi2.h> > -+#include <gdk/x11/gdkx11devicemanager.h> > -+#include <gdk/x11/gdkx11devicemanager-core.h> > -+#include <gdk/x11/gdkx11devicemanager-xi2.h> > -+#include <gdk/x11/gdkx11display.h> > -+#include <gdk/x11/gdkx11displaymanager.h> > -+#include <gdk/x11/gdkx11dnd.h> > -+#include <gdk/x11/gdkx11glcontext.h> > -+#include <gdk/x11/gdkx11keys.h> > -+#include <gdk/x11/gdkx11property.h> > -+#include <gdk/x11/gdkx11screen.h> > -+#include <gdk/x11/gdkx11selection.h> > -+#include <gdk/x11/gdkx11utils.h> > -+#include <gdk/x11/gdkx11visual.h> > -+#include <gdk/x11/gdkx11window.h> > -+ > -+#include <gdk/x11/gdkx-autocleanups.h> > -+ > -+#undef __GDKX_H_INSIDE__ > -+ > -+#endif /* __GDK_X_H__ */ > +diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h > +similarity index 100% > +rename from gdk/x11/gdkx.h > +rename to gdk/x11/gdkx-with-gl-context.h > diff --git a/gdk/x11/gdkx-without-gl-context.h b/gdk/x11/gdkx-without-gl-context.h > new file mode 100644 > index 0000000..c9e2617 > @@ -686,76 +617,11 @@ index 0000000..c9e2617 > +#undef __GDKX_H_INSIDE__ > + > +#endif /* __GDK_X_H__ */ > -diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h > -deleted file mode 100644 > -index ae05fa6..0000000 > ---- a/gdk/x11/gdkx.h > -+++ /dev/null > -@@ -1,59 +0,0 @@ > --/* GDK - The GIMP Drawing Kit > -- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald > -- * > -- * This library is free software; you can redistribute it and/or > -- * modify it under the terms of the GNU Lesser General Public > -- * License as published by the Free Software Foundation; either > -- * version 2 of the License, or (at your option) any later version. > -- * > -- * This library is distributed in the hope that it will be useful, > -- * but WITHOUT ANY WARRANTY; without even the implied warranty of > -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -- * Lesser General Public License for more details. > -- * > -- * You should have received a copy of the GNU Lesser General Public > -- * License along with this library. If not, see <http://www.gnu.org/licenses/>. > -- */ > -- > --/* > -- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS > -- * file for a list of people on the GTK+ Team. See the ChangeLog > -- * files for a list of changes. These files are distributed with > -- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. > -- */ > -- > --#ifndef __GDK_X_H__ > --#define __GDK_X_H__ > -- > --#include <gdk/gdk.h> > -- > --#include <X11/Xlib.h> > --#include <X11/Xutil.h> > -- > --#define __GDKX_H_INSIDE__ > -- > --#include <gdk/x11/gdkx11applaunchcontext.h> > --#include <gdk/x11/gdkx11cursor.h> > --#include <gdk/x11/gdkx11device.h> > --#include <gdk/x11/gdkx11device-core.h> > --#include <gdk/x11/gdkx11device-xi2.h> > --#include <gdk/x11/gdkx11devicemanager.h> > --#include <gdk/x11/gdkx11devicemanager-core.h> > --#include <gdk/x11/gdkx11devicemanager-xi2.h> > --#include <gdk/x11/gdkx11display.h> > --#include <gdk/x11/gdkx11displaymanager.h> > --#include <gdk/x11/gdkx11dnd.h> > --#include <gdk/x11/gdkx11glcontext.h> > --#include <gdk/x11/gdkx11keys.h> > --#include <gdk/x11/gdkx11property.h> > --#include <gdk/x11/gdkx11screen.h> > --#include <gdk/x11/gdkx11selection.h> > --#include <gdk/x11/gdkx11utils.h> > --#include <gdk/x11/gdkx11visual.h> > --#include <gdk/x11/gdkx11window.h> > -- > --#include <gdk/x11/gdkx-autocleanups.h> > -- > --#undef __GDKX_H_INSIDE__ > -- > --#endif /* __GDK_X_H__ */ > diff --git a/gtk/Makefile.am b/gtk/Makefile.am > -index 801c3a5..2d8839d 100644 > +index 6a53a2b..49a35e6 100644 > --- a/gtk/Makefile.am > +++ b/gtk/Makefile.am > -@@ -1246,14 +1246,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. > +@@ -1351,14 +1351,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. > && cp xgen-gptbc gtkprivatetypebuiltins.c \ > && rm -f xgen-gptbc > > @@ -772,7 +638,7 @@ index 801c3a5..2d8839d 100644 > gtktestutils.c: gtktypefuncs.c > > diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c > -index 4098409..45fa1d1 100644 > +index 245fc6b..4214ad1 100644 > --- a/gtk/gtkglarea.c > +++ b/gtk/gtkglarea.c > @@ -28,7 +28,9 @@ > @@ -868,7 +734,7 @@ index 4098409..45fa1d1 100644 > > static gboolean > diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c > -index 0611373..4499a29 100644 > +index 4eab3a7..c4e900e 100644 > --- a/gtk/inspector/general.c > +++ b/gtk/inspector/general.c > @@ -33,8 +33,10 @@ > @@ -882,7 +748,7 @@ index 0611373..4499a29 100644 > > #ifdef GDK_WINDOWING_WIN32 > #include "win32/gdkwin32.h" > -@@ -146,6 +148,7 @@ append_extension_row (GtkInspectorGeneral *gen, > +@@ -147,6 +149,7 @@ append_extension_row (GtkInspectorGeneral *gen, > gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label); > } > > @@ -890,7 +756,7 @@ index 0611373..4499a29 100644 > #ifdef GDK_WINDOWING_X11 > static void > append_glx_extension_row (GtkInspectorGeneral *gen, > -@@ -155,6 +158,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, > +@@ -156,6 +159,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, > append_extension_row (gen, ext, epoxy_has_glx_extension (dpy, 0, ext)); > } > #endif > @@ -898,27 +764,27 @@ index 0611373..4499a29 100644 > > #ifdef GDK_WINDOWING_WAYLAND > static void > -@@ -174,6 +178,7 @@ init_gl (GtkInspectorGeneral *gen) > - > - display = gdk_display_get_default (); > - > +@@ -171,6 +175,7 @@ append_egl_extension_row (GtkInspectorGeneral *gen, > + static void > + init_gl (GtkInspectorGeneral *gen) > + { > +#ifdef HAVE_OPENGL > #ifdef GDK_WINDOWING_X11 > - if (GDK_IS_X11_DISPLAY (display)) > + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) > { > -@@ -199,6 +204,7 @@ init_gl (GtkInspectorGeneral *gen) > +@@ -197,6 +202,7 @@ init_gl (GtkInspectorGeneral *gen) > } > else > #endif > +#endif > #ifdef GDK_WINDOWING_WAYLAND > - if (GDK_IS_WAYLAND_DISPLAY (display)) > + if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) > { > diff --git a/tests/Makefile.am b/tests/Makefile.am > -index 50f2986..3b39169 100644 > +index 681807d..2941a36 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > -@@ -78,8 +78,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > +@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > testfullscreen \ > testgeometry \ > testgiconpixbuf \ > @@ -927,18 +793,19 @@ index 50f2986..3b39169 100644 > testgrid \ > testgtk \ > testheaderbar \ > -@@ -166,10 +164,16 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > +@@ -169,11 +167,17 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > testactionbar \ > testwindowsize \ > testpopover \ > - gdkgears \ > listmodel \ > + testpopup \ > $(NULL) > > +if HAVE_OPENGL > +noinst_PROGRAMS += > -+ testglarea \ > -+ testglblending \ > ++ testglarea \ > ++ testglblending \ > + gdkgears > +endif > + > @@ -946,11 +813,11 @@ index 50f2986..3b39169 100644 > noinst_PROGRAMS += testerrors > endif > diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c > -index 3568505..682ea10 100644 > +index e0ebee0..703643c 100644 > --- a/testsuite/gtk/objects-finalize.c > +++ b/testsuite/gtk/objects-finalize.c > -@@ -114,8 +114,10 @@ main (int argc, char **argv) > - all_types[i] != GDK_TYPE_X11_DISPLAY && > +@@ -115,8 +115,10 @@ main (int argc, char **argv) > + all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && > all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && > all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && > +#ifdef HAVE_OPENGL > @@ -961,5 +828,5 @@ index 3568505..682ea10 100644 > all_types[i] != GDK_TYPE_PIXBUF_LOADER && > all_types[i] != gdk_pixbuf_simple_anim_iter_get_type()) > -- > -2.8.1 > +2.1.4 > > diff --git a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch > new file mode 100644 > index 0000000..634b3a4 > --- /dev/null > +++ b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch > @@ -0,0 +1,36 @@ > +From 97b78e566634579bbae51be914aeaaa921137a8b Mon Sep 17 00:00:00 2001 > +From: Jussi Kukkonen <jussi.kukkonen@intel.com> > +Date: Thu, 9 Jun 2016 11:21:36 +0300 > +Subject: [PATCH 4/4] configure.ac: Fix wayland-protocols path > + > +The wayland-protocols directory is used during build: Fix the path > +to point to sysroot specified in recipe. > + > +Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that > +breaks multilib gtk+ as it would point to multilib sysroot when the > +(allarch) wayland-protocols is actually in the machine sysroot. > + > +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > +Upstream-Status: Inappropriate [embedded specific] > + > +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > +--- > + configure.ac | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac > +index a3e9beb..dde9dc5 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -461,7 +461,7 @@ fi > + if test "$enable_wayland_backend" = "yes"; then > + # For the cairo image backend > + cairo_backends="$cairo_backends cairo" > +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) > ++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) > + GDK_BACKENDS="$GDK_BACKENDS wayland" > + GDK_WINDOWING="$GDK_WINDOWING > + #define GDK_WINDOWING_WAYLAND" > +-- > +2.1.4 > + > diff --git a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch > deleted file mode 100644 > index 32d8a84..0000000 > --- a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch > +++ /dev/null > @@ -1,118 +0,0 @@ > -window: Check if we can use CSD before enabling them > - > -Upstream-Status: Backport > -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > - > - > -From c5e5ee67490e7e7af56052d8f8beb75db002c2f1 Mon Sep 17 00:00:00 2001 > -From: Emmanuele Bassi <ebassi@gnome.org> > -Date: Wed, 3 Jun 2015 14:07:29 +0100 > -Subject: window: Check if we can use CSD before enabling them > - > -The change in 03213b9509fc1df16c66194ea168aed6c15110e9 changed the rules > -as to when CSD can be enabled, but it also unconditionally enables CSD > -with the implicit assumption that client-side shadows were the real > -issue, and that we could work around that by drawing our own borders. > -This also means that setting a titlebar for a GtkWindow will enable CSD > -unconditionally. > - > -In reality, some window managers (like Matchbox) *only* support > -server-side decorations, and will ignore all hints to the contrary, to > -the point of drawing decorations at random locations on top of the > -window. > - > -Since CSD are enabled unconditionally, the GTK_CSD environment variable > -is also not a suitable escape hatch. > - > -In the grand tradition of asking ourselves if we should do something > -just because we can, we should split the environment checks from the > -checks on what the user requested; by doing that, we can also check > -when enabling client-side decorations, and ideally bail out if needed. > - > -https://bugzilla.gnome.org/show_bug.cgi?id=750343 > - > -diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c > -index 423c6bd..9fe882f 100644 > ---- a/gtk/gtkwindow.c > -+++ b/gtk/gtkwindow.c > -@@ -4056,6 +4056,32 @@ gtk_window_supports_client_shadow (GtkWindow *window) > - return TRUE; > - } > - > -+static gboolean > -+gtk_window_can_use_csd (GtkWindow *window) > -+{ > -+ const gchar *csd_env; > -+ > -+#ifdef GDK_WINDOWING_BROADWAY > -+ if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) > -+ return TRUE; > -+#endif > -+ > -+#ifdef GDK_WINDOWING_WAYLAND > -+ if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) > -+ return TRUE; > -+#endif > -+ > -+#ifdef GDK_WINDOWING_MIR > -+ if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) > -+ return TRUE; > -+#endif > -+ > -+ csd_env = g_getenv ("GTK_CSD"); > -+ > -+ /* If GTK_CSD is unset we default to CSD support */ > -+ return csd_env == NULL || (strcmp (csd_env, "1") == 0); > -+} > -+ > - static void > - gtk_window_enable_csd (GtkWindow *window) > - { > -@@ -4063,6 +4089,10 @@ gtk_window_enable_csd (GtkWindow *window) > - GtkWidget *widget = GTK_WIDGET (window); > - GdkVisual *visual; > - > -+ /* If the environment does not support CSD, then there's no point in enabling them */ > -+ if (!gtk_window_can_use_csd (window)) > -+ return; > -+ > - /* We need a visual with alpha for client shadows */ > - if (priv->use_client_shadow) > - { > -@@ -5839,7 +5869,6 @@ static gboolean > - gtk_window_should_use_csd (GtkWindow *window) > - { > - GtkWindowPrivate *priv = window->priv; > -- const gchar *csd_env; > - > - if (priv->csd_requested) > - return TRUE; > -@@ -5850,24 +5879,7 @@ gtk_window_should_use_csd (GtkWindow *window) > - if (priv->type == GTK_WINDOW_POPUP) > - return FALSE; > - > --#ifdef GDK_WINDOWING_BROADWAY > -- if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) > -- return TRUE; > --#endif > -- > --#ifdef GDK_WINDOWING_WAYLAND > -- if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) > -- return TRUE; > --#endif > -- > --#ifdef GDK_WINDOWING_MIR > -- if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) > -- return TRUE; > --#endif > -- > -- csd_env = g_getenv ("GTK_CSD"); > -- > -- return (g_strcmp0 (csd_env, "1") == 0); > -+ return gtk_window_can_use_csd (window); > - } > - > - static void > --- > -cgit v0.10.2 > - > diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb > similarity index 57% > rename from meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb > rename to meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb > index d776b6d..453a4e2 100644 > --- a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb > +++ b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb > @@ -3,14 +3,13 @@ require gtk+3.inc > MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" > > SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ > - file://hardcoded_libtool.patch \ > - file://Dont-force-csd.patch \ > - file://Do-not-try-to-initialize-GL-without-libGL.patch \ > - file://0001-Add-disable-opengl-configure-option.patch \ > + file://0001-Hardcoded-libtool.patch \ > + file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ > + file://0003-Add-disable-opengl-configure-option.patch \ > + file://0004-configure.ac-Fix-wayland-protocols-path.patch \ > " > - > -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" > -SRC_URI[sha256sum] = "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" > +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" > +SRC_URI[sha256sum] = "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" > > S = "${WORKDIR}/gtk+-${PV}" > > diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb > similarity index 93% > rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb > rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb > index 793f14a..e870ba3 100644 > --- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb > +++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb > @@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" > > SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ > file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch" > -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" > -SRC_URI[sha256sum] = "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" > +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" > +SRC_URI[sha256sum] = "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" > > LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ > file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 2016-07-05 13:09 ` Robert Yang @ 2016-07-05 14:08 ` Jussi Kukkonen 2016-07-06 3:09 ` Robert Yang 0 siblings, 1 reply; 19+ messages in thread From: Jussi Kukkonen @ 2016-07-05 14:08 UTC (permalink / raw) To: Robert Yang; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 52144 bytes --] On 5 July 2016 at 16:09, Robert Yang <liezhi.yang@windriver.com> wrote: > > Hi, > > I can't build it on Ubuntu 14.04: > I can't see from the log why the file would be be missing and can't reproduce that locally... Cleaning sstate should be a valid workaround but I'd be really interested in reproducing this: if you can reproduce (or remember if you did any distro feature or packageconfig changes) please let me know the details. In the meantime I'll take another look at the build system... Thanks, Jussi MACHINE = "qemux86" > > $ bitbake gtk+3 > > Making all in po-properties > make[2]: Entering directory > '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/po-properties' > make[2]: Nothing to be done for 'all'. > make[2]: Leaving directory > '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/po-properties' > Making all in gdk > make[2]: Entering directory > '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk' > ( cd ../../gtk+-3.20.6/gdk && glib-mkenums --template > gdkenumtypes.h.template \ > gdk.h gdk-autocleanup.h gdkapplaunchcontext.h gdkcairo.h gdkcursor.h > gdkdevice.h gdkdevicemanager.h gdkdisplay.h gdkdisplaymanager.h gdkdnd.h > gdkevents.h gdkframetimings.h gdkglcontext.h gdkkeys.h gdkkeysyms.h > gdkkeysyms-compat.h gdkmain.h gdkpango.h gdkframeclock.h gdkpixbuf.h > gdkprivate.h gdkproperty.h gdkrectangle.h gdkrgba.h gdkscreen.h gdkseat.h > gdkselection.h gdktestutils.h gdkthreads.h gdktypes.h gdkvisual.h > gdkwindow.h deprecated/gdkcolor.h ) >> xgen-geth \ > && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \ > && rm -f xgen-geth \ > && echo timestamp > stamp-gdkenumtypes.h > cd .. && /bin/sh ./config.status gdk/gdkconfig.h \ > && echo timestamp > gdk/stamp-gc-h > config.status: executing gdk/gdkconfig.h commands > config.status: gdk/gdkconfig.h is unchanged > if test -f gdkconfig.h; then :; \ > else rm -f stamp-gc-h; make stamp-gc-h; fi > make all-recursive > make[3]: Entering directory > '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk' > Making all in x11 > make[4]: Entering directory > '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk/x11' > cd ../../../gtk+-3.20.6/gdk/x11 \ > && (cmp -s gdkx-with-gl-context.h gdkx.h || cp gdkx-with-gl-context.h > gdkx.h ) > cp: cannot stat 'gdkx-with-gl-context.h': No such file or directory > Makefile:1014: recipe for target 'gdkx.h' failed > make[4]: *** [gdkx.h] Error 1 > make[4]: Leaving directory > '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk/x11' > Makefile:1460: recipe for target 'all-recursive' failed > make[3]: *** [all-recursive] Error 1 > make[3]: Leaving directory > '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk' > Makefile:951: recipe for target 'all' failed > make[2]: *** [all] Error 2 > make[2]: Leaving directory > '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build/gdk' > Makefile:713: recipe for target 'all-recursive' failed > make[1]: *** [all-recursive] Error 1 > make[1]: Leaving directory > '/buildarea/lyang1/test_qemux86/bitbake_build/tmp/work/i586-wrs-linux/gtk+3/3.20.6-r0/build' > Makefile:607: recipe for target 'all' failed > make: *** [all] Error 2 > > // Robert > > > On 06/22/2016 07:52 PM, Jussi Kukkonen wrote: > >> * Remove a patch that's no longer needed (as we don't >> have a problem with client side decorations anymore) >> * Wayland build now depends on wayland-protocols: >> Use same WAYLAND_PROTOCOLS_SYSROOT_DIR trick as weston so >> protocols are found and multilib build does not break >> * Add new binary gtk-query-settings to -dev package >> * Rebase patches >> * Modify 0003-Add-disable-opengl-configure-option.patch so >> that gdkx.h really is generated whenever it changes >> >> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> >> --- >> meta/recipes-gnome/gtk+/gtk+3.inc | 9 +- >> ..._libtool.patch => 0001-Hardcoded-libtool.patch} | 26 +- >> ...o-not-try-to-initialize-GL-without-libGL.patch} | 12 +- >> ...0003-Add-disable-opengl-configure-option.patch} | 327 >> ++++++--------------- >> ...4-configure.ac-Fix-wayland-protocols-path.patch | 36 +++ >> meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch | 118 -------- >> .../gtk+/{gtk+3_3.18.8.bb => gtk+3_3.20.6.bb} | 13 +- >> ...e_3.18.8.bb => gtk-icon-utils-native_3.20.6.bb} | 4 +- >> 8 files changed, 173 insertions(+), 372 deletions(-) >> rename meta/recipes-gnome/gtk+/gtk+3/{hardcoded_libtool.patch => >> 0001-Hardcoded-libtool.patch} (70%) >> rename >> meta/recipes-gnome/gtk+/gtk+3/{Do-not-try-to-initialize-GL-without-libGL.patch >> => 0002-Do-not-try-to-initialize-GL-without-libGL.patch} (86%) >> rename >> meta/recipes-gnome/gtk+/gtk+3/{0001-Add-disable-opengl-configure-option.patch >> => 0003-Add-disable-opengl-configure-option.patch} (71%) >> create mode 100644 >> meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch >> delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch >> rename meta/recipes-gnome/gtk+/{gtk+3_3.18.8.bb => gtk+3_3.20.6.bb} >> (57%) >> rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.18.8.bb => >> gtk-icon-utils-native_3.20.6.bb} (93%) >> >> diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc >> b/meta/recipes-gnome/gtk+/gtk+3.inc >> index 959fb44..0de114d 100644 >> --- a/meta/recipes-gnome/gtk+/gtk+3.inc >> +++ b/meta/recipes-gnome/gtk+/gtk+3.inc >> @@ -31,7 +31,9 @@ EXTRA_OECONF += " \ >> --enable-modules \ >> --disable-cups \ >> --disable-colord \ >> -" >> + WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} >> \ >> + " >> +EXTRA_OECONF[vardepsexclude] = "MACHINE" >> >> do_compile_prepend() { >> export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" >> @@ -46,7 +48,7 @@ PACKAGECONFIG[x11] = >> "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fon >> # this is provided by oe-core patch that removes epoxy/gl dependency >> from a X11 build >> PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy" >> PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" >> -PACKAGECONFIG[wayland] = >> "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon >> virtual/mesa wayland-native" >> +PACKAGECONFIG[wayland] = >> "--enable-wayland-backend,--disable-wayland-backend,wayland >> wayland-protocols libxkbcommon virtual/mesa wayland-native" >> >> do_install_append() { >> mv ${D}${bindir}/gtk-update-icon-cache >> ${D}${bindir}/gtk-update-icon-cache-3.0 >> @@ -76,6 +78,7 @@ FILES_${PN}_append = " >> ${bindir}/gtk-update-icon-cache-3.0 \ >> FILES_${PN}-dev += " \ >> ${datadir}/gtk-3.0/gtkbuilder.rng \ >> ${datadir}/gtk-3.0/include \ >> + ${datadir}/gettext/its \ >> ${libdir}/gtk-3.0/include \ >> ${libdir}/gtk-3.0/${LIBV}/loaders/*.la \ >> ${libdir}/gtk-3.0/${LIBV}/immodules/*.la \ >> @@ -85,6 +88,7 @@ FILES_${PN}-dev += " \ >> ${bindir}/gtk-builder-convert \ >> ${bindir}/gtk-encode-symbolic-svg \ >> ${bindir}/gtk-builder-tool \ >> + ${bindir}/gtk-query-settings \ >> " >> >> GTKBASE_RRECOMMENDS ?= "liberation-fonts \ >> @@ -99,6 +103,7 @@ GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} >> glibc-gconv-iso8859-1" >> >> RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" >> RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" >> +RRECOMMENDS_${PN}-dev += "wayland-protocols" >> >> PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" >> >> diff --git a/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch >> b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch >> similarity index 70% >> rename from meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch >> rename to meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch >> index 3b4beeb..0bda1f1 100644 >> --- a/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch >> +++ b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch >> @@ -1,12 +1,21 @@ >> +From 5a73a5b92566e314bbc8a1bd40f1ec204837c111 Mon Sep 17 00:00:00 2001 >> +From: Jussi Kukkonen <jussi.kukkonen@intel.com> >> +Date: Tue, 21 Jun 2016 14:53:56 +0300 >> +Subject: [PATCH 1/4] Hardcoded libtool >> + >> Upstream-Status: Inappropriate [embedded specific] >> >> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> >> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> >> +--- >> + configure.ac | 6 +++--- >> + 1 file changed, 3 insertions(+), 3 deletions(-) >> >> -Index: gtk+-3.8.2/configure.ac >> -=================================================================== >> ---- gtk+-3.8.2.orig/configure.ac >> -+++ gtk+-3.8.2/configure.ac >> -@@ -531,7 +531,7 @@ AC_MSG_CHECKING([Whether to write depend >> +diff --git a/configure.ac b/configure.ac >> +index 23d3077..b6931d6 100644 >> +--- a/configure.ac >> ++++ b/configure.ac >> +@@ -610,7 +610,7 @@ AC_MSG_CHECKING([whether to write dependencies into >> .pc files]) >> case $enable_explicit_deps in >> auto) >> export SED >> @@ -15,7 +24,7 @@ Index: gtk+-3.8.2/configure.ac >> if test "x$deplibs_check_method" != xpass_all || test >> "x$enable_static" = xyes ; then >> enable_explicit_deps=yes >> else >> -@@ -793,7 +793,7 @@ else >> +@@ -876,7 +876,7 @@ else >> dnl Now we check to see if our libtool supports shared lib deps >> dnl (in a rather ugly way even) >> if $dynworks; then >> @@ -24,7 +33,7 @@ Index: gtk+-3.8.2/configure.ac >> module_deplibs_check=`$module_libtool_config | \ >> grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ >> sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` >> -@@ -1528,7 +1528,7 @@ fi >> +@@ -1630,7 +1630,7 @@ AC_SUBST(GTK_PRINT_BACKENDS) >> # We are using gmodule-no-export now, but I'm leaving the stripping >> # code in place for now, since pango and atk still require gmodule. >> export SED >> @@ -33,3 +42,6 @@ Index: gtk+-3.8.2/configure.ac >> if test -n "$export_dynamic"; then >> GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` >> GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` >> +-- >> +2.1.4 >> + >> diff --git >> a/meta/recipes-gnome/gtk+/gtk+3/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 >> similarity index 86% >> rename from >> meta/recipes-gnome/gtk+/gtk+3/Do-not-try-to-initialize-GL-without-libGL.patch >> rename to >> meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch >> index c8c480c..989716e 100644 >> --- >> a/meta/recipes-gnome/gtk+/gtk+3/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 @@ >> -From fc22058a10db913534f11348f86681fe9e1838e5 Mon Sep 17 00:00:00 2001 >> +From d63b926f8c8d8b5c9f9ec33d078b775f0409d88a Mon Sep 17 00:00:00 2001 >> From: Jussi Kukkonen <jussi.kukkonen@intel.com> >> Date: Fri, 16 Oct 2015 16:35:16 +0300 >> -Subject: [PATCH] Do not try to initialize GL without libGL >> +Subject: [PATCH 2/4] Do not try to initialize GL without libGL >> >> _gdk_x11_screen_update_visuals_for_gl() will end up calling epoxys >> GLX api which will exit() if libGL.so.1 is not present. We do not >> @@ -21,10 +21,10 @@ Signed-off-by: Jussi Kukkonen < >> jussi.kukkonen@intel.com> >> 2 files changed, 12 insertions(+) >> >> diff --git a/configure.ac b/configure.ac >> -index 729a62e..58cc1ac 100644 >> +index b6931d6..e27da49 100644 >> --- a/configure.ac >> +++ b/configure.ac >> -@@ -328,6 +328,13 @@ AC_ARG_ENABLE(mir-backend, >> +@@ -342,6 +342,13 @@ AC_ARG_ENABLE(mir-backend, >> [enable the Mir gdk backend])], >> [backend_set=yes]) >> >> @@ -39,10 +39,10 @@ index 729a62e..58cc1ac 100644 >> if test "$platform_win32" = yes; then >> enable_win32_backend=yes >> diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c >> -index f3b062d..c8243f4 100644 >> +index 81479d8..3c8c5c0 100644 >> --- a/gdk/x11/gdkvisual-x11.c >> +++ b/gdk/x11/gdkvisual-x11.c >> -@@ -345,7 +345,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen) >> +@@ -306,7 +306,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen) >> /* If GL is available we want to pick better default/rgba visuals, >> as we care about glx details such as alpha/depth/stencil depth, >> stereo and double buffering */ >> diff --git >> a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch >> b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch >> similarity index 71% >> rename from >> meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch >> rename to >> meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch >> index a963334..8552f53 100644 >> --- >> a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch >> +++ >> b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch >> @@ -1,7 +1,7 @@ >> -From c77afa19881d955d759879aeae8bbd88613dd4fe Mon Sep 17 00:00:00 2001 >> +From a8fa547fdc1416b330aced805f5343ad912932ae Mon Sep 17 00:00:00 2001 >> From: Jussi Kukkonen <jussi.kukkonen@intel.com> >> -Date: Thu, 16 Jun 2016 15:11:34 +0300 >> -Subject: [PATCH] Add --disable-opengl configure option >> +Date: Tue, 21 Jun 2016 15:11:39 +0300 >> +Subject: [PATCH 3/4] Add --disable-opengl configure option >> >> --disable-opengl will remove the dependency on libepoxy and on the >> OpenGL APIs. This is useful for those who want to keep using gtk+3 >> @@ -20,37 +20,35 @@ Long-term it would be good to find an alternative >> solution to this >> Upstream-Status: Inappropriate [Evil eye expected from upstream] >> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> >> --- >> - configure.ac | 13 +++++++-- >> - demos/gtk-demo/glarea.c | 13 +++++++++ >> - docs/tools/Makefile.am | 9 ++++-- >> - docs/tools/widgets.c | 4 ++- >> - gdk/gdkdisplay.c | 4 ++- >> - gdk/gdkgl.c | 10 +++++++ >> - gdk/gdkglcontext.c | 6 ++++ >> - gdk/gdkwindow.c | 14 +++++++++- >> - gdk/x11/Makefile.am | 28 ++++++++++++++++--- >> - gdk/x11/gdkdisplay-x11.c | 6 ++-- >> - gdk/x11/gdkscreen-x11.c | 5 ++++ >> - gdk/x11/gdkwindow-x11.c | 4 +++ >> - gdk/x11/gdkx-autocleanups.h | 2 ++ >> - gdk/x11/gdkx-with-gl-context.h | 59 >> +++++++++++++++++++++++++++++++++++++++ >> - gdk/x11/gdkx-without-gl-context.h | 58 >> ++++++++++++++++++++++++++++++++++++++ >> - gdk/x11/gdkx.h | 59 >> --------------------------------------- >> - gtk/Makefile.am | 3 +- >> - gtk/gtkglarea.c | 20 ++++++++++++- >> - gtk/inspector/general.c | 6 ++++ >> - tests/Makefile.am | 10 +++++-- >> - testsuite/gtk/objects-finalize.c | 2 ++ >> - 21 files changed, 257 insertions(+), 78 deletions(-) >> - create mode 100644 gdk/x11/gdkx-with-gl-context.h >> + configure.ac | 13 +++++-- >> + demos/gtk-demo/glarea.c | 13 +++++++ >> + docs/tools/Makefile.am | 9 +++-- >> + docs/tools/widgets.c | 4 ++- >> + gdk/gdkdisplay.c | 4 ++- >> + gdk/gdkgl.c | 10 ++++++ >> + gdk/gdkglcontext.c | 6 ++++ >> + gdk/gdkwindow.c | 13 +++++++ >> + gdk/x11/Makefile.am | 30 +++++++++++++--- >> + gdk/x11/gdkdisplay-x11.c | 6 +++- >> + gdk/x11/gdkscreen-x11.c | 5 +++ >> + gdk/x11/gdkwindow-x11.c | 4 +++ >> + gdk/x11/gdkx-autocleanups.h | 2 ++ >> + gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 0 >> + gdk/x11/gdkx-without-gl-context.h | 58 >> ++++++++++++++++++++++++++++++ >> + gtk/Makefile.am | 3 +- >> + gtk/gtkglarea.c | 20 ++++++++++- >> + gtk/inspector/general.c | 6 ++++ >> + tests/Makefile.am | 10 ++++-- >> + testsuite/gtk/objects-finalize.c | 2 ++ >> + 20 files changed, 201 insertions(+), 17 deletions(-) >> + rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (100%) >> create mode 100644 gdk/x11/gdkx-without-gl-context.h >> - delete mode 100644 gdk/x11/gdkx.h >> >> diff --git a/configure.ac b/configure.ac >> -index c280543..32da151 100644 >> +index e27da49..a3e9beb 100644 >> --- a/configure.ac >> +++ b/configure.ac >> -@@ -340,6 +340,15 @@ AC_ARG_ENABLE(mir-backend, >> +@@ -342,6 +342,15 @@ AC_ARG_ENABLE(mir-backend, >> [enable the Mir gdk backend])], >> [backend_set=yes]) >> >> @@ -66,7 +64,7 @@ index c280543..32da151 100644 >> AC_ARG_ENABLE(glx, >> [AS_HELP_STRING([--enable-glx], >> [When enabled Gdk will try to initialize >> GLX])]) >> -@@ -1330,7 +1339,7 @@ CFLAGS="$saved_cflags" >> +@@ -1333,7 +1342,7 @@ CFLAGS="$saved_cflags" >> LDFLAGS="$saved_ldflags" >> >> GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= >> gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >> >= cairo_required_version" >> @@ -75,7 +73,7 @@ index c280543..32da151 100644 >> >> PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) >> GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" >> -@@ -1364,7 +1373,7 @@ fi >> +@@ -1367,7 +1376,7 @@ fi >> PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) >> >> 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" >> @@ -85,7 +83,7 @@ index c280543..32da151 100644 >> GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" >> fi >> diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c >> -index c267706..b3bac86 100644 >> +index 3aba729..c6c79f7 100644 >> --- a/demos/gtk-demo/glarea.c >> +++ b/demos/gtk-demo/glarea.c >> @@ -5,7 +5,9 @@ >> @@ -207,10 +205,10 @@ index 932daf1..54239d6 100644 >> >> return info; >> diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c >> -index 892d6a7..8323768 100644 >> +index 6150ef7..2223629 100644 >> --- a/gdk/gdkdisplay.c >> +++ b/gdk/gdkdisplay.c >> -@@ -2285,7 +2285,9 @@ gboolean >> +@@ -2360,7 +2360,9 @@ gboolean >> gdk_display_make_gl_context_current (GdkDisplay *display, >> GdkGLContext *context) >> { >> @@ -222,7 +220,7 @@ index 892d6a7..8323768 100644 >> >> GdkRenderingMode >> diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c >> -index 85ce63d..d76e8dc 100644 >> +index e8ba770..ba7c84b 100644 >> --- a/gdk/gdkgl.c >> +++ b/gdk/gdkgl.c >> @@ -22,7 +22,9 @@ >> @@ -243,7 +241,7 @@ index 85ce63d..d76e8dc 100644 >> static const char * >> get_vertex_type_name (int type) >> { >> -@@ -205,6 +208,7 @@ use_texture_rect_program (GdkGLContextPaintData >> *paint_data) >> +@@ -254,6 +257,7 @@ use_texture_rect_program (GdkGLContextPaintData >> *paint_data) >> glUseProgram (paint_data->current_program->program); >> } >> } >> @@ -251,7 +249,7 @@ index 85ce63d..d76e8dc 100644 >> >> void >> gdk_gl_texture_quads (GdkGLContext *paint_context, >> -@@ -212,6 +216,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, >> +@@ -261,6 +265,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, >> int n_quads, >> GdkTexturedQuad *quads) >> { >> @@ -259,7 +257,7 @@ index 85ce63d..d76e8dc 100644 >> GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data >> (paint_context); >> GdkGLContextProgram *program; >> GdkWindow *window = gdk_gl_context_get_window (paint_context); >> -@@ -275,6 +280,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, >> +@@ -324,6 +329,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, >> >> glDisableVertexAttribArray (program->position_location); >> glDisableVertexAttribArray (program->uv_location); >> @@ -267,7 +265,7 @@ index 85ce63d..d76e8dc 100644 >> } >> >> /* x,y,width,height describes a rectangle in the gl render buffer >> -@@ -323,6 +329,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, >> +@@ -372,6 +378,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, >> int width, >> int height) >> { >> @@ -275,7 +273,7 @@ index 85ce63d..d76e8dc 100644 >> GdkGLContext *paint_context; >> cairo_surface_t *image; >> cairo_matrix_t matrix; >> -@@ -643,6 +650,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, >> +@@ -692,6 +699,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, >> if (clip_region) >> cairo_region_destroy (clip_region); >> >> @@ -283,7 +281,7 @@ index 85ce63d..d76e8dc 100644 >> } >> >> /* This is always called with the paint context current */ >> -@@ -650,6 +658,7 @@ void >> +@@ -699,6 +707,7 @@ void >> gdk_gl_texture_from_surface (cairo_surface_t *surface, >> cairo_region_t *region) >> { >> @@ -291,14 +289,14 @@ index 85ce63d..d76e8dc 100644 >> GdkGLContext *paint_context; >> cairo_surface_t *image; >> double device_x_offset, device_y_offset; >> -@@ -750,4 +759,5 @@ gdk_gl_texture_from_surface (cairo_surface_t >> *surface, >> +@@ -799,4 +808,5 @@ gdk_gl_texture_from_surface (cairo_surface_t >> *surface, >> >> glDisable (GL_SCISSOR_TEST); >> glDeleteTextures (1, &texture_id); >> +#endif >> } >> diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c >> -index 4d71353..9bb55ef 100644 >> +index 00a33eb..bd8a793 100644 >> --- a/gdk/gdkglcontext.c >> +++ b/gdk/gdkglcontext.c >> @@ -85,7 +85,9 @@ >> @@ -311,7 +309,7 @@ index 4d71353..9bb55ef 100644 >> >> typedef struct { >> GdkDisplay *display; >> -@@ -238,6 +240,7 @@ gdk_gl_context_upload_texture (GdkGLContext >> *context, >> +@@ -239,6 +241,7 @@ gdk_gl_context_upload_texture (GdkGLContext >> *context, >> int height, >> guint texture_target) >> { >> @@ -319,7 +317,7 @@ index 4d71353..9bb55ef 100644 >> g_return_if_fail (GDK_IS_GL_CONTEXT (context)); >> >> glPixelStorei (GL_UNPACK_ALIGNMENT, 4); >> -@@ -245,6 +248,7 @@ gdk_gl_context_upload_texture (GdkGLContext >> *context, >> +@@ -246,6 +249,7 @@ gdk_gl_context_upload_texture (GdkGLContext >> *context, >> glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, GL_BGRA, >> GL_UNSIGNED_INT_8_8_8_8_REV, >> cairo_image_surface_get_data (image_surface)); >> glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); >> @@ -327,7 +325,7 @@ index 4d71353..9bb55ef 100644 >> } >> >> static void >> -@@ -586,6 +590,7 @@ gdk_gl_context_realize (GdkGLContext *context, >> +@@ -635,6 +639,7 @@ gdk_gl_context_realize (GdkGLContext *context, >> static void >> gdk_gl_context_check_extensions (GdkGLContext *context) >> { >> @@ -335,8 +333,8 @@ index 4d71353..9bb55ef 100644 >> GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private >> (context); >> gboolean has_npot, has_texture_rectangle; >> >> -@@ -628,6 +633,7 @@ gdk_gl_context_check_extensions (GdkGLContext >> *context) >> - priv->use_texture_rectangle ? "yes" : "no")); >> +@@ -677,6 +682,7 @@ gdk_gl_context_check_extensions (GdkGLContext >> *context) >> + priv->use_texture_rectangle ? "yes" : "no")); >> >> priv->extensions_checked = TRUE; >> +#endif >> @@ -344,7 +342,7 @@ index 4d71353..9bb55ef 100644 >> >> /** >> diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c >> -index c34c113..3025e96 100644 >> +index 66ebb9d..74a0c3a 100644 >> --- a/gdk/gdkwindow.c >> +++ b/gdk/gdkwindow.c >> @@ -44,7 +44,9 @@ >> @@ -357,15 +355,7 @@ index c34c113..3025e96 100644 >> >> /* for the use of round() */ >> #include "fallback-c89.c" >> -@@ -1455,7 +1457,6 @@ gdk_window_new (GdkWindow *parent, >> - g_signal_connect (device_manager, "device-removed", >> - G_CALLBACK (device_removed_cb), window); >> - >> -- >> - if ((_gdk_gl_flags & (GDK_GL_ALWAYS | GDK_GL_DISABLE)) == >> GDK_GL_ALWAYS) >> - { >> - GError *error = NULL; >> -@@ -2761,6 +2762,13 @@ gdk_window_get_paint_gl_context (GdkWindow >> *window, >> +@@ -2759,6 +2761,13 @@ gdk_window_get_paint_gl_context (GdkWindow >> *window, >> { >> GError *internal_error = NULL; >> >> @@ -379,7 +369,7 @@ index c34c113..3025e96 100644 >> if (_gdk_gl_flags & GDK_GL_DISABLE) >> { >> g_set_error_literal (error, GDK_GL_ERROR, >> -@@ -2957,6 +2965,7 @@ gdk_window_begin_paint_region (GdkWindow >> *window, >> +@@ -2955,6 +2964,7 @@ gdk_window_begin_paint_region (GdkWindow >> *window, >> } >> else >> { >> @@ -387,7 +377,7 @@ index c34c113..3025e96 100644 >> gdk_gl_context_make_current (context); >> /* With gl we always need a surface to combine the gl >> drawing with the native drawing. */ >> -@@ -2971,6 +2980,7 @@ gdk_window_begin_paint_region (GdkWindow >> *window, >> +@@ -2969,6 +2979,7 @@ gdk_window_begin_paint_region (GdkWindow >> *window, >> glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); >> >> glViewport (0, 0, ww, wh); >> @@ -395,7 +385,7 @@ index c34c113..3025e96 100644 >> } >> } >> >> -@@ -3119,6 +3129,7 @@ gdk_window_end_paint (GdkWindow *window) >> +@@ -3117,6 +3128,7 @@ gdk_window_end_paint (GdkWindow *window) >> >> gdk_gl_context_make_current (window->gl_paint_context); >> >> @@ -403,7 +393,7 @@ index c34c113..3025e96 100644 >> if (!cairo_region_is_empty (opaque_region)) >> gdk_gl_texture_from_surface (window->current_paint.surface, >> opaque_region); >> -@@ -3129,6 +3140,7 @@ gdk_window_end_paint (GdkWindow *window) >> +@@ -3127,6 +3139,7 @@ gdk_window_end_paint (GdkWindow *window) >> >> window->current_paint.need_blend_region); >> glDisable(GL_BLEND); >> } >> @@ -412,7 +402,7 @@ index c34c113..3025e96 100644 >> cairo_region_destroy (opaque_region); >> >> diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am >> -index c488a31..d0aa7ce 100644 >> +index c488a31..4ce3c07 100644 >> --- a/gdk/x11/Makefile.am >> +++ b/gdk/x11/Makefile.am >> @@ -39,8 +39,6 @@ libgdk_x11_la_SOURCES = \ >> @@ -424,7 +414,7 @@ index c488a31..d0aa7ce 100644 >> gdkkeys-x11.c \ >> gdkmain-x11.c \ >> gdkproperty-x11.c \ >> -@@ -53,14 +51,30 @@ libgdk_x11_la_SOURCES = \ >> +@@ -53,14 +51,32 @@ libgdk_x11_la_SOURCES = \ >> gdkwindow-x11.h \ >> gdkxftdefaults.c \ >> gdkxid.c \ >> @@ -450,13 +440,15 @@ index c488a31..d0aa7ce 100644 >> + >> +BUILT_SOURCES = gdkx.h >> + >> ++.PHONY: gdkx.h >> +gdkx.h: >> -+ $(AM_V_GEN) cd $(srcdir) && cp $(GDKX_HEADER) gdkx.h >> ++ $(AM_V_GEN) cd $(srcdir) \ >> ++ && (cmp -s $(GDKX_HEADER) gdkx.h || cp $(GDKX_HEADER) gdkx.h ) >> + >> libgdkx11include_HEADERS = \ >> gdkx-autocleanups.h \ >> gdkx11applaunchcontext.h \ >> -@@ -74,7 +88,6 @@ libgdkx11include_HEADERS = \ >> +@@ -74,7 +90,6 @@ libgdkx11include_HEADERS = \ >> gdkx11display.h \ >> gdkx11displaymanager.h \ >> gdkx11dnd.h \ >> @@ -464,7 +456,7 @@ index c488a31..d0aa7ce 100644 >> gdkx11keys.h \ >> gdkx11property.h \ >> gdkx11screen.h \ >> -@@ -83,9 +96,16 @@ libgdkx11include_HEADERS = \ >> +@@ -83,9 +98,16 @@ libgdkx11include_HEADERS = \ >> gdkx11visual.h \ >> gdkx11window.h >> >> @@ -482,7 +474,7 @@ index c488a31..d0aa7ce 100644 >> + >> -include $(top_srcdir)/git.mk >> diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c >> -index 5816d18..5d2dae6 100644 >> +index de91c64..42d50f6 100644 >> --- a/gdk/x11/gdkdisplay-x11.c >> +++ b/gdk/x11/gdkdisplay-x11.c >> @@ -37,7 +37,9 @@ >> @@ -495,19 +487,19 @@ index 5816d18..5d2dae6 100644 >> #include "gdk-private.h" >> >> #include <glib.h> >> -@@ -2989,8 +2991,8 @@ gdk_x11_display_class_init (GdkX11DisplayClass * >> class) >> - display_class->convert_selection = _gdk_x11_display_convert_selection; >> +@@ -2959,7 +2961,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * >> class) >> display_class->text_property_to_utf8_list = >> _gdk_x11_display_text_property_to_utf8_list; >> display_class->utf8_to_string_target = >> _gdk_x11_display_utf8_to_string_target; >> -- >> + >> +- display_class->make_gl_context_current = >> gdk_x11_display_make_gl_context_current; >> +#ifdef HAVE_OPENGL >> - display_class->make_gl_context_current = >> gdk_x11_display_make_gl_context_current; >> -- >> ++ display_class->make_gl_context_current = >> gdk_x11_display_make_gl_context_current; >> +#endif >> - _gdk_x11_windowing_init (); >> - } >> + >> + display_class->get_default_seat = gdk_x11_display_get_default_seat; >> + >> diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c >> -index 2bd7f28..30032e0 100644 >> +index 9d8ed20..bd46b00 100644 >> --- a/gdk/x11/gdkscreen-x11.c >> +++ b/gdk/x11/gdkscreen-x11.c >> @@ -1968,3 +1968,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen >> *screen) >> @@ -520,7 +512,7 @@ index 2bd7f28..30032e0 100644 >> +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} >> +#endif >> diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c >> -index d08cee0..d354628 100644 >> +index 9ed087a..30d6eb7 100644 >> --- a/gdk/x11/gdkwindow-x11.c >> +++ b/gdk/x11/gdkwindow-x11.c >> @@ -36,7 +36,9 @@ >> @@ -533,7 +525,7 @@ index d08cee0..d354628 100644 >> #include "gdkprivate-x11.h" >> #include "gdk-private.h" >> >> -@@ -5768,7 +5770,9 @@ gdk_window_impl_x11_class_init >> (GdkWindowImplX11Class *klass) >> +@@ -5782,7 +5784,9 @@ gdk_window_impl_x11_class_init >> (GdkWindowImplX11Class *klass) >> impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; >> impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; >> impl_class->show_window_menu = gdk_x11_window_show_window_menu; >> @@ -557,71 +549,10 @@ index edb0ea7..a317d61 100644 >> G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref) >> G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref) >> G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref) >> -diff --git a/gdk/x11/gdkx-with-gl-context.h >> b/gdk/x11/gdkx-with-gl-context.h >> -new file mode 100644 >> -index 0000000..ae05fa6 >> ---- /dev/null >> -+++ b/gdk/x11/gdkx-with-gl-context.h >> -@@ -0,0 +1,59 @@ >> -+/* GDK - The GIMP Drawing Kit >> -+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh >> MacDonald >> -+ * >> -+ * This library is free software; you can redistribute it and/or >> -+ * modify it under the terms of the GNU Lesser General Public >> -+ * License as published by the Free Software Foundation; either >> -+ * version 2 of the License, or (at your option) any later version. >> -+ * >> -+ * This library is distributed in the hope that it will be useful, >> -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >> -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> -+ * Lesser General Public License for more details. >> -+ * >> -+ * You should have received a copy of the GNU Lesser General Public >> -+ * License along with this library. If not, see < >> http://www.gnu.org/licenses/>. >> -+ */ >> -+ >> -+/* >> -+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS >> -+ * file for a list of people on the GTK+ Team. See the ChangeLog >> -+ * files for a list of changes. These files are distributed with >> -+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. >> -+ */ >> -+ >> -+#ifndef __GDK_X_H__ >> -+#define __GDK_X_H__ >> -+ >> -+#include <gdk/gdk.h> >> -+ >> -+#include <X11/Xlib.h> >> -+#include <X11/Xutil.h> >> -+ >> -+#define __GDKX_H_INSIDE__ >> -+ >> -+#include <gdk/x11/gdkx11applaunchcontext.h> >> -+#include <gdk/x11/gdkx11cursor.h> >> -+#include <gdk/x11/gdkx11device.h> >> -+#include <gdk/x11/gdkx11device-core.h> >> -+#include <gdk/x11/gdkx11device-xi2.h> >> -+#include <gdk/x11/gdkx11devicemanager.h> >> -+#include <gdk/x11/gdkx11devicemanager-core.h> >> -+#include <gdk/x11/gdkx11devicemanager-xi2.h> >> -+#include <gdk/x11/gdkx11display.h> >> -+#include <gdk/x11/gdkx11displaymanager.h> >> -+#include <gdk/x11/gdkx11dnd.h> >> -+#include <gdk/x11/gdkx11glcontext.h> >> -+#include <gdk/x11/gdkx11keys.h> >> -+#include <gdk/x11/gdkx11property.h> >> -+#include <gdk/x11/gdkx11screen.h> >> -+#include <gdk/x11/gdkx11selection.h> >> -+#include <gdk/x11/gdkx11utils.h> >> -+#include <gdk/x11/gdkx11visual.h> >> -+#include <gdk/x11/gdkx11window.h> >> -+ >> -+#include <gdk/x11/gdkx-autocleanups.h> >> -+ >> -+#undef __GDKX_H_INSIDE__ >> -+ >> -+#endif /* __GDK_X_H__ */ >> +diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h >> +similarity index 100% >> +rename from gdk/x11/gdkx.h >> +rename to gdk/x11/gdkx-with-gl-context.h >> diff --git a/gdk/x11/gdkx-without-gl-context.h >> b/gdk/x11/gdkx-without-gl-context.h >> new file mode 100644 >> index 0000000..c9e2617 >> @@ -686,76 +617,11 @@ index 0000000..c9e2617 >> +#undef __GDKX_H_INSIDE__ >> + >> +#endif /* __GDK_X_H__ */ >> -diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h >> -deleted file mode 100644 >> -index ae05fa6..0000000 >> ---- a/gdk/x11/gdkx.h >> -+++ /dev/null >> -@@ -1,59 +0,0 @@ >> --/* GDK - The GIMP Drawing Kit >> -- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh >> MacDonald >> -- * >> -- * This library is free software; you can redistribute it and/or >> -- * modify it under the terms of the GNU Lesser General Public >> -- * License as published by the Free Software Foundation; either >> -- * version 2 of the License, or (at your option) any later version. >> -- * >> -- * This library is distributed in the hope that it will be useful, >> -- * but WITHOUT ANY WARRANTY; without even the implied warranty of >> -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> -- * Lesser General Public License for more details. >> -- * >> -- * You should have received a copy of the GNU Lesser General Public >> -- * License along with this library. If not, see < >> http://www.gnu.org/licenses/>. >> -- */ >> -- >> --/* >> -- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS >> -- * file for a list of people on the GTK+ Team. See the ChangeLog >> -- * files for a list of changes. These files are distributed with >> -- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. >> -- */ >> -- >> --#ifndef __GDK_X_H__ >> --#define __GDK_X_H__ >> -- >> --#include <gdk/gdk.h> >> -- >> --#include <X11/Xlib.h> >> --#include <X11/Xutil.h> >> -- >> --#define __GDKX_H_INSIDE__ >> -- >> --#include <gdk/x11/gdkx11applaunchcontext.h> >> --#include <gdk/x11/gdkx11cursor.h> >> --#include <gdk/x11/gdkx11device.h> >> --#include <gdk/x11/gdkx11device-core.h> >> --#include <gdk/x11/gdkx11device-xi2.h> >> --#include <gdk/x11/gdkx11devicemanager.h> >> --#include <gdk/x11/gdkx11devicemanager-core.h> >> --#include <gdk/x11/gdkx11devicemanager-xi2.h> >> --#include <gdk/x11/gdkx11display.h> >> --#include <gdk/x11/gdkx11displaymanager.h> >> --#include <gdk/x11/gdkx11dnd.h> >> --#include <gdk/x11/gdkx11glcontext.h> >> --#include <gdk/x11/gdkx11keys.h> >> --#include <gdk/x11/gdkx11property.h> >> --#include <gdk/x11/gdkx11screen.h> >> --#include <gdk/x11/gdkx11selection.h> >> --#include <gdk/x11/gdkx11utils.h> >> --#include <gdk/x11/gdkx11visual.h> >> --#include <gdk/x11/gdkx11window.h> >> -- >> --#include <gdk/x11/gdkx-autocleanups.h> >> -- >> --#undef __GDKX_H_INSIDE__ >> -- >> --#endif /* __GDK_X_H__ */ >> diff --git a/gtk/Makefile.am b/gtk/Makefile.am >> -index 801c3a5..2d8839d 100644 >> +index 6a53a2b..49a35e6 100644 >> --- a/gtk/Makefile.am >> +++ b/gtk/Makefile.am >> -@@ -1246,14 +1246,13 @@ gtkprivatetypebuiltins.c: >> $(gtk_private_type_h_sources) gtkprivatetypebuiltins. >> +@@ -1351,14 +1351,13 @@ gtkprivatetypebuiltins.c: >> $(gtk_private_type_h_sources) gtkprivatetypebuiltins. >> && cp xgen-gptbc gtkprivatetypebuiltins.c \ >> && rm -f xgen-gptbc >> >> @@ -772,7 +638,7 @@ index 801c3a5..2d8839d 100644 >> gtktestutils.c: gtktypefuncs.c >> >> diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c >> -index 4098409..45fa1d1 100644 >> +index 245fc6b..4214ad1 100644 >> --- a/gtk/gtkglarea.c >> +++ b/gtk/gtkglarea.c >> @@ -28,7 +28,9 @@ >> @@ -868,7 +734,7 @@ index 4098409..45fa1d1 100644 >> >> static gboolean >> diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c >> -index 0611373..4499a29 100644 >> +index 4eab3a7..c4e900e 100644 >> --- a/gtk/inspector/general.c >> +++ b/gtk/inspector/general.c >> @@ -33,8 +33,10 @@ >> @@ -882,7 +748,7 @@ index 0611373..4499a29 100644 >> >> #ifdef GDK_WINDOWING_WIN32 >> #include "win32/gdkwin32.h" >> -@@ -146,6 +148,7 @@ append_extension_row (GtkInspectorGeneral *gen, >> +@@ -147,6 +149,7 @@ append_extension_row (GtkInspectorGeneral *gen, >> gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), >> label); >> } >> >> @@ -890,7 +756,7 @@ index 0611373..4499a29 100644 >> #ifdef GDK_WINDOWING_X11 >> static void >> append_glx_extension_row (GtkInspectorGeneral *gen, >> -@@ -155,6 +158,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, >> +@@ -156,6 +159,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, >> append_extension_row (gen, ext, epoxy_has_glx_extension (dpy, 0, >> ext)); >> } >> #endif >> @@ -898,27 +764,27 @@ index 0611373..4499a29 100644 >> >> #ifdef GDK_WINDOWING_WAYLAND >> static void >> -@@ -174,6 +178,7 @@ init_gl (GtkInspectorGeneral *gen) >> - >> - display = gdk_display_get_default (); >> - >> +@@ -171,6 +175,7 @@ append_egl_extension_row (GtkInspectorGeneral *gen, >> + static void >> + init_gl (GtkInspectorGeneral *gen) >> + { >> +#ifdef HAVE_OPENGL >> #ifdef GDK_WINDOWING_X11 >> - if (GDK_IS_X11_DISPLAY (display)) >> + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) >> { >> -@@ -199,6 +204,7 @@ init_gl (GtkInspectorGeneral *gen) >> +@@ -197,6 +202,7 @@ init_gl (GtkInspectorGeneral *gen) >> } >> else >> #endif >> +#endif >> #ifdef GDK_WINDOWING_WAYLAND >> - if (GDK_IS_WAYLAND_DISPLAY (display)) >> + if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) >> { >> diff --git a/tests/Makefile.am b/tests/Makefile.am >> -index 50f2986..3b39169 100644 >> +index 681807d..2941a36 100644 >> --- a/tests/Makefile.am >> +++ b/tests/Makefile.am >> -@@ -78,8 +78,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >> +@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >> testfullscreen \ >> testgeometry \ >> testgiconpixbuf \ >> @@ -927,18 +793,19 @@ index 50f2986..3b39169 100644 >> testgrid \ >> testgtk \ >> testheaderbar \ >> -@@ -166,10 +164,16 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >> +@@ -169,11 +167,17 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >> testactionbar \ >> testwindowsize \ >> testpopover \ >> - gdkgears \ >> listmodel \ >> + testpopup \ >> $(NULL) >> >> +if HAVE_OPENGL >> +noinst_PROGRAMS += >> -+ testglarea \ >> -+ testglblending \ >> ++ testglarea \ >> ++ testglblending \ >> + gdkgears >> +endif >> + >> @@ -946,11 +813,11 @@ index 50f2986..3b39169 100644 >> noinst_PROGRAMS += testerrors >> endif >> diff --git a/testsuite/gtk/objects-finalize.c >> b/testsuite/gtk/objects-finalize.c >> -index 3568505..682ea10 100644 >> +index e0ebee0..703643c 100644 >> --- a/testsuite/gtk/objects-finalize.c >> +++ b/testsuite/gtk/objects-finalize.c >> -@@ -114,8 +114,10 @@ main (int argc, char **argv) >> - all_types[i] != GDK_TYPE_X11_DISPLAY && >> +@@ -115,8 +115,10 @@ main (int argc, char **argv) >> + all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && >> all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && >> all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && >> +#ifdef HAVE_OPENGL >> @@ -961,5 +828,5 @@ index 3568505..682ea10 100644 >> all_types[i] != GDK_TYPE_PIXBUF_LOADER && >> all_types[i] != gdk_pixbuf_simple_anim_iter_get_type()) >> -- >> -2.8.1 >> +2.1.4 >> >> diff --git >> a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch >> b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch >> new file mode 100644 >> index 0000000..634b3a4 >> --- /dev/null >> +++ >> b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch >> @@ -0,0 +1,36 @@ >> +From 97b78e566634579bbae51be914aeaaa921137a8b Mon Sep 17 00:00:00 2001 >> +From: Jussi Kukkonen <jussi.kukkonen@intel.com> >> +Date: Thu, 9 Jun 2016 11:21:36 +0300 >> +Subject: [PATCH 4/4] configure.ac: Fix wayland-protocols path >> + >> +The wayland-protocols directory is used during build: Fix the path >> +to point to sysroot specified in recipe. >> + >> +Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that >> +breaks multilib gtk+ as it would point to multilib sysroot when the >> +(allarch) wayland-protocols is actually in the machine sysroot. >> + >> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> >> +Upstream-Status: Inappropriate [embedded specific] >> + >> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> >> +--- >> + configure.ac | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/configure.ac b/configure.ac >> +index a3e9beb..dde9dc5 100644 >> +--- a/configure.ac >> ++++ b/configure.ac >> +@@ -461,7 +461,7 @@ fi >> + if test "$enable_wayland_backend" = "yes"; then >> + # For the cairo image backend >> + cairo_backends="$cairo_backends cairo" >> +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG >> --variable=pkgdatadir wayland-protocols`) >> ++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, >> ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir >> wayland-protocols`) >> + GDK_BACKENDS="$GDK_BACKENDS wayland" >> + GDK_WINDOWING="$GDK_WINDOWING >> + #define GDK_WINDOWING_WAYLAND" >> +-- >> +2.1.4 >> + >> diff --git a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch >> b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch >> deleted file mode 100644 >> index 32d8a84..0000000 >> --- a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch >> +++ /dev/null >> @@ -1,118 +0,0 @@ >> -window: Check if we can use CSD before enabling them >> - >> -Upstream-Status: Backport >> -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> >> - >> - >> -From c5e5ee67490e7e7af56052d8f8beb75db002c2f1 Mon Sep 17 00:00:00 2001 >> -From: Emmanuele Bassi <ebassi@gnome.org> >> -Date: Wed, 3 Jun 2015 14:07:29 +0100 >> -Subject: window: Check if we can use CSD before enabling them >> - >> -The change in 03213b9509fc1df16c66194ea168aed6c15110e9 changed the rules >> -as to when CSD can be enabled, but it also unconditionally enables CSD >> -with the implicit assumption that client-side shadows were the real >> -issue, and that we could work around that by drawing our own borders. >> -This also means that setting a titlebar for a GtkWindow will enable CSD >> -unconditionally. >> - >> -In reality, some window managers (like Matchbox) *only* support >> -server-side decorations, and will ignore all hints to the contrary, to >> -the point of drawing decorations at random locations on top of the >> -window. >> - >> -Since CSD are enabled unconditionally, the GTK_CSD environment variable >> -is also not a suitable escape hatch. >> - >> -In the grand tradition of asking ourselves if we should do something >> -just because we can, we should split the environment checks from the >> -checks on what the user requested; by doing that, we can also check >> -when enabling client-side decorations, and ideally bail out if needed. >> - >> -https://bugzilla.gnome.org/show_bug.cgi?id=750343 >> - >> -diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c >> -index 423c6bd..9fe882f 100644 >> ---- a/gtk/gtkwindow.c >> -+++ b/gtk/gtkwindow.c >> -@@ -4056,6 +4056,32 @@ gtk_window_supports_client_shadow (GtkWindow >> *window) >> - return TRUE; >> - } >> - >> -+static gboolean >> -+gtk_window_can_use_csd (GtkWindow *window) >> -+{ >> -+ const gchar *csd_env; >> -+ >> -+#ifdef GDK_WINDOWING_BROADWAY >> -+ if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET >> (window)))) >> -+ return TRUE; >> -+#endif >> -+ >> -+#ifdef GDK_WINDOWING_WAYLAND >> -+ if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET >> (window)))) >> -+ return TRUE; >> -+#endif >> -+ >> -+#ifdef GDK_WINDOWING_MIR >> -+ if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) >> -+ return TRUE; >> -+#endif >> -+ >> -+ csd_env = g_getenv ("GTK_CSD"); >> -+ >> -+ /* If GTK_CSD is unset we default to CSD support */ >> -+ return csd_env == NULL || (strcmp (csd_env, "1") == 0); >> -+} >> -+ >> - static void >> - gtk_window_enable_csd (GtkWindow *window) >> - { >> -@@ -4063,6 +4089,10 @@ gtk_window_enable_csd (GtkWindow *window) >> - GtkWidget *widget = GTK_WIDGET (window); >> - GdkVisual *visual; >> - >> -+ /* If the environment does not support CSD, then there's no point in >> enabling them */ >> -+ if (!gtk_window_can_use_csd (window)) >> -+ return; >> -+ >> - /* We need a visual with alpha for client shadows */ >> - if (priv->use_client_shadow) >> - { >> -@@ -5839,7 +5869,6 @@ static gboolean >> - gtk_window_should_use_csd (GtkWindow *window) >> - { >> - GtkWindowPrivate *priv = window->priv; >> -- const gchar *csd_env; >> - >> - if (priv->csd_requested) >> - return TRUE; >> -@@ -5850,24 +5879,7 @@ gtk_window_should_use_csd (GtkWindow *window) >> - if (priv->type == GTK_WINDOW_POPUP) >> - return FALSE; >> - >> --#ifdef GDK_WINDOWING_BROADWAY >> -- if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET >> (window)))) >> -- return TRUE; >> --#endif >> -- >> --#ifdef GDK_WINDOWING_WAYLAND >> -- if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET >> (window)))) >> -- return TRUE; >> --#endif >> -- >> --#ifdef GDK_WINDOWING_MIR >> -- if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) >> -- return TRUE; >> --#endif >> -- >> -- csd_env = g_getenv ("GTK_CSD"); >> -- >> -- return (g_strcmp0 (csd_env, "1") == 0); >> -+ return gtk_window_can_use_csd (window); >> - } >> - >> - static void >> --- >> -cgit v0.10.2 >> - >> diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb >> b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb >> similarity index 57% >> rename from meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb >> rename to meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb >> index d776b6d..453a4e2 100644 >> --- a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb >> +++ b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb >> @@ -3,14 +3,13 @@ require gtk+3.inc >> MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" >> >> SRC_URI = " >> http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz >> <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> >> \ >> - file://hardcoded_libtool.patch \ >> - file://Dont-force-csd.patch \ >> - file://Do-not-try-to-initialize-GL-without-libGL.patch \ >> - file://0001-Add-disable-opengl-configure-option.patch \ >> + file://0001-Hardcoded-libtool.patch \ >> + file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ >> + file://0003-Add-disable-opengl-configure-option.patch \ >> + file://0004-configure.ac-Fix-wayland-protocols-path.patch \ >> " >> - >> -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" >> -SRC_URI[sha256sum] = >> "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" >> +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" >> +SRC_URI[sha256sum] = >> "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" >> >> S = "${WORKDIR}/gtk+-${PV}" >> >> diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb >> b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb >> similarity index 93% >> rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb >> rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb >> index 793f14a..e870ba3 100644 >> --- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb >> +++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb >> @@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" >> >> SRC_URI = " >> http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz >> <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> >> \ >> >> file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch" >> -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" >> -SRC_URI[sha256sum] = >> "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" >> +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" >> +SRC_URI[sha256sum] = >> "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" >> >> LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 >> \ >> >> file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ >> >> [-- Attachment #2: Type: text/html, Size: 62140 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 2016-07-05 14:08 ` Jussi Kukkonen @ 2016-07-06 3:09 ` Robert Yang 2016-07-06 3:21 ` Robert Yang 0 siblings, 1 reply; 19+ messages in thread From: Robert Yang @ 2016-07-06 3:09 UTC (permalink / raw) To: Jussi Kukkonen; +Cc: Patches and discussions about the oe-core layer On 07/05/2016 10:08 PM, Jussi Kukkonen wrote: > > > On 5 July 2016 at 16:09, Robert Yang <liezhi.yang@windriver.com > <mailto:liezhi.yang@windriver.com>> wrote: > > > Hi, > > I can't build it on Ubuntu 14.04: > > > I can't see from the log why the file would be be missing and can't reproduce > that locally... Cleaning sstate should be a valid workaround but I'd be really > interested in reproducing this: if you can reproduce (or remember if you did any > distro feature or packageconfig changes) please let me know the details. > > In the meantime I'll take another look at the build system... Please see below ... > +diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h > +similarity index 100% > +rename from gdk/x11/gdkx.h > +rename to gdk/x11/gdkx-with-gl-context.h Older patch tool such as patch 2.7.1 can't apply this patch, I will update it. // Robert > diff --git a/gdk/x11/gdkx-without-gl-context.h > b/gdk/x11/gdkx-without-gl-context.h > new file mode 100644 > index 0000000..c9e2617 > @@ -686,76 +617,11 @@ index 0000000..c9e2617 > +#undef __GDKX_H_INSIDE__ > + > +#endif /* __GDK_X_H__ */ > -diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h > -deleted file mode 100644 > -index ae05fa6..0000000 > ---- a/gdk/x11/gdkx.h > -+++ /dev/null > -@@ -1,59 +0,0 @@ > --/* GDK - The GIMP Drawing Kit > -- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh > MacDonald > -- * > -- * This library is free software; you can redistribute it and/or > -- * modify it under the terms of the GNU Lesser General Public > -- * License as published by the Free Software Foundation; either > -- * version 2 of the License, or (at your option) any later version. > -- * > -- * This library is distributed in the hope that it will be useful, > -- * but WITHOUT ANY WARRANTY; without even the implied warranty of > -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -- * Lesser General Public License for more details. > -- * > -- * You should have received a copy of the GNU Lesser General Public > -- * License along with this library. If not, see > <http://www.gnu.org/licenses/>. > -- */ > -- > --/* > -- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS > -- * file for a list of people on the GTK+ Team. See the ChangeLog > -- * files for a list of changes. These files are distributed with > -- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. > -- */ > -- > --#ifndef __GDK_X_H__ > --#define __GDK_X_H__ > -- > --#include <gdk/gdk.h> > -- > --#include <X11/Xlib.h> > --#include <X11/Xutil.h> > -- > --#define __GDKX_H_INSIDE__ > -- > --#include <gdk/x11/gdkx11applaunchcontext.h> > --#include <gdk/x11/gdkx11cursor.h> > --#include <gdk/x11/gdkx11device.h> > --#include <gdk/x11/gdkx11device-core.h> > --#include <gdk/x11/gdkx11device-xi2.h> > --#include <gdk/x11/gdkx11devicemanager.h> > --#include <gdk/x11/gdkx11devicemanager-core.h> > --#include <gdk/x11/gdkx11devicemanager-xi2.h> > --#include <gdk/x11/gdkx11display.h> > --#include <gdk/x11/gdkx11displaymanager.h> > --#include <gdk/x11/gdkx11dnd.h> > --#include <gdk/x11/gdkx11glcontext.h> > --#include <gdk/x11/gdkx11keys.h> > --#include <gdk/x11/gdkx11property.h> > --#include <gdk/x11/gdkx11screen.h> > --#include <gdk/x11/gdkx11selection.h> > --#include <gdk/x11/gdkx11utils.h> > --#include <gdk/x11/gdkx11visual.h> > --#include <gdk/x11/gdkx11window.h> > -- > --#include <gdk/x11/gdkx-autocleanups.h> > -- > --#undef __GDKX_H_INSIDE__ > -- > --#endif /* __GDK_X_H__ */ > diff --git a/gtk/Makefile.am b/gtk/Makefile.am > -index 801c3a5..2d8839d 100644 > +index 6a53a2b..49a35e6 100644 > --- a/gtk/Makefile.am > +++ b/gtk/Makefile.am > -@@ -1246,14 +1246,13 @@ gtkprivatetypebuiltins.c: > $(gtk_private_type_h_sources) gtkprivatetypebuiltins. > +@@ -1351,14 +1351,13 @@ gtkprivatetypebuiltins.c: > $(gtk_private_type_h_sources) gtkprivatetypebuiltins. > && cp xgen-gptbc gtkprivatetypebuiltins.c \ > && rm -f xgen-gptbc > > @@ -772,7 +638,7 @@ index 801c3a5..2d8839d 100644 > gtktestutils.c: gtktypefuncs.c > > diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c > -index 4098409..45fa1d1 100644 > +index 245fc6b..4214ad1 100644 > --- a/gtk/gtkglarea.c > +++ b/gtk/gtkglarea.c > @@ -28,7 +28,9 @@ > @@ -868,7 +734,7 @@ index 4098409..45fa1d1 100644 > > static gboolean > diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c > -index 0611373..4499a29 100644 > +index 4eab3a7..c4e900e 100644 > --- a/gtk/inspector/general.c > +++ b/gtk/inspector/general.c > @@ -33,8 +33,10 @@ > @@ -882,7 +748,7 @@ index 0611373..4499a29 100644 > > #ifdef GDK_WINDOWING_WIN32 > #include "win32/gdkwin32.h" > -@@ -146,6 +148,7 @@ append_extension_row (GtkInspectorGeneral *gen, > +@@ -147,6 +149,7 @@ append_extension_row (GtkInspectorGeneral *gen, > gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label); > } > > @@ -890,7 +756,7 @@ index 0611373..4499a29 100644 > #ifdef GDK_WINDOWING_X11 > static void > append_glx_extension_row (GtkInspectorGeneral *gen, > -@@ -155,6 +158,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, > +@@ -156,6 +159,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, > append_extension_row (gen, ext, epoxy_has_glx_extension (dpy, 0, > ext)); > } > #endif > @@ -898,27 +764,27 @@ index 0611373..4499a29 100644 > > #ifdef GDK_WINDOWING_WAYLAND > static void > -@@ -174,6 +178,7 @@ init_gl (GtkInspectorGeneral *gen) > - > - display = gdk_display_get_default (); > - > +@@ -171,6 +175,7 @@ append_egl_extension_row (GtkInspectorGeneral *gen, > + static void > + init_gl (GtkInspectorGeneral *gen) > + { > +#ifdef HAVE_OPENGL > #ifdef GDK_WINDOWING_X11 > - if (GDK_IS_X11_DISPLAY (display)) > + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) > { > -@@ -199,6 +204,7 @@ init_gl (GtkInspectorGeneral *gen) > +@@ -197,6 +202,7 @@ init_gl (GtkInspectorGeneral *gen) > } > else > #endif > +#endif > #ifdef GDK_WINDOWING_WAYLAND > - if (GDK_IS_WAYLAND_DISPLAY (display)) > + if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) > { > diff --git a/tests/Makefile.am b/tests/Makefile.am > -index 50f2986..3b39169 100644 > +index 681807d..2941a36 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > -@@ -78,8 +78,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > +@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > testfullscreen \ > testgeometry \ > testgiconpixbuf \ > @@ -927,18 +793,19 @@ index 50f2986..3b39169 100644 > testgrid \ > testgtk \ > testheaderbar \ > -@@ -166,10 +164,16 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > +@@ -169,11 +167,17 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > testactionbar \ > testwindowsize \ > testpopover \ > - gdkgears \ > listmodel \ > + testpopup \ > $(NULL) > > +if HAVE_OPENGL > +noinst_PROGRAMS += > -+ testglarea \ > -+ testglblending \ > ++ testglarea \ > ++ testglblending \ > + gdkgears > +endif > + > @@ -946,11 +813,11 @@ index 50f2986..3b39169 100644 > noinst_PROGRAMS += testerrors > endif > diff --git a/testsuite/gtk/objects-finalize.c > b/testsuite/gtk/objects-finalize.c > -index 3568505..682ea10 100644 > +index e0ebee0..703643c 100644 > --- a/testsuite/gtk/objects-finalize.c > +++ b/testsuite/gtk/objects-finalize.c > -@@ -114,8 +114,10 @@ main (int argc, char **argv) > - all_types[i] != GDK_TYPE_X11_DISPLAY && > +@@ -115,8 +115,10 @@ main (int argc, char **argv) > + all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && > all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && > all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && > +#ifdef HAVE_OPENGL > @@ -961,5 +828,5 @@ index 3568505..682ea10 100644 > all_types[i] != GDK_TYPE_PIXBUF_LOADER && > all_types[i] != gdk_pixbuf_simple_anim_iter_get_type()) > -- > -2.8.1 > +2.1.4 > > diff --git > a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch > b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch > new file mode 100644 > index 0000000..634b3a4 > --- /dev/null > +++ > b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch > @@ -0,0 +1,36 @@ > +From 97b78e566634579bbae51be914aeaaa921137a8b Mon Sep 17 00:00:00 2001 > +From: Jussi Kukkonen <jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com>> > +Date: Thu, 9 Jun 2016 11:21:36 +0300 > +Subject: [PATCH 4/4] configure.ac <http://configure.ac>: Fix > wayland-protocols path > + > +The wayland-protocols directory is used during build: Fix the path > +to point to sysroot specified in recipe. > + > +Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac > <http://configure.ac> but that > +breaks multilib gtk+ as it would point to multilib sysroot when the > +(allarch) wayland-protocols is actually in the machine sysroot. > + > +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com>> > +Upstream-Status: Inappropriate [embedded specific] > + > +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com>> > +--- > + configure.ac <http://configure.ac> | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/configure.ac <http://configure.ac> b/configure.ac > <http://configure.ac> > +index a3e9beb..dde9dc5 100644 > +--- a/configure.ac <http://configure.ac> > ++++ b/configure.ac <http://configure.ac> > +@@ -461,7 +461,7 @@ fi > + if test "$enable_wayland_backend" = "yes"; then > + # For the cairo image backend > + cairo_backends="$cairo_backends cairo" > +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG > --variable=pkgdatadir wayland-protocols`) > ++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, > ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir > wayland-protocols`) > + GDK_BACKENDS="$GDK_BACKENDS wayland" > + GDK_WINDOWING="$GDK_WINDOWING > + #define GDK_WINDOWING_WAYLAND" > +-- > +2.1.4 > + > diff --git a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch > b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch > deleted file mode 100644 > index 32d8a84..0000000 > --- a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch > +++ /dev/null > @@ -1,118 +0,0 @@ > -window: Check if we can use CSD before enabling them > - > -Upstream-Status: Backport > -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com>> > - > - > -From c5e5ee67490e7e7af56052d8f8beb75db002c2f1 Mon Sep 17 00:00:00 2001 > -From: Emmanuele Bassi <ebassi@gnome.org <mailto:ebassi@gnome.org>> > -Date: Wed, 3 Jun 2015 14:07:29 +0100 > -Subject: window: Check if we can use CSD before enabling them > - > -The change in 03213b9509fc1df16c66194ea168aed6c15110e9 changed the rules > -as to when CSD can be enabled, but it also unconditionally enables CSD > -with the implicit assumption that client-side shadows were the real > -issue, and that we could work around that by drawing our own borders. > -This also means that setting a titlebar for a GtkWindow will enable CSD > -unconditionally. > - > -In reality, some window managers (like Matchbox) *only* support > -server-side decorations, and will ignore all hints to the contrary, to > -the point of drawing decorations at random locations on top of the > -window. > - > -Since CSD are enabled unconditionally, the GTK_CSD environment variable > -is also not a suitable escape hatch. > - > -In the grand tradition of asking ourselves if we should do something > -just because we can, we should split the environment checks from the > -checks on what the user requested; by doing that, we can also check > -when enabling client-side decorations, and ideally bail out if needed. > - > -https://bugzilla.gnome.org/show_bug.cgi?id=750343 > - > -diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c > -index 423c6bd..9fe882f 100644 > ---- a/gtk/gtkwindow.c > -+++ b/gtk/gtkwindow.c > -@@ -4056,6 +4056,32 @@ gtk_window_supports_client_shadow (GtkWindow > *window) > - return TRUE; > - } > - > -+static gboolean > -+gtk_window_can_use_csd (GtkWindow *window) > -+{ > -+ const gchar *csd_env; > -+ > -+#ifdef GDK_WINDOWING_BROADWAY > -+ if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET > (window)))) > -+ return TRUE; > -+#endif > -+ > -+#ifdef GDK_WINDOWING_WAYLAND > -+ if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET > (window)))) > -+ return TRUE; > -+#endif > -+ > -+#ifdef GDK_WINDOWING_MIR > -+ if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) > -+ return TRUE; > -+#endif > -+ > -+ csd_env = g_getenv ("GTK_CSD"); > -+ > -+ /* If GTK_CSD is unset we default to CSD support */ > -+ return csd_env == NULL || (strcmp (csd_env, "1") == 0); > -+} > -+ > - static void > - gtk_window_enable_csd (GtkWindow *window) > - { > -@@ -4063,6 +4089,10 @@ gtk_window_enable_csd (GtkWindow *window) > - GtkWidget *widget = GTK_WIDGET (window); > - GdkVisual *visual; > - > -+ /* If the environment does not support CSD, then there's no point in > enabling them */ > -+ if (!gtk_window_can_use_csd (window)) > -+ return; > -+ > - /* We need a visual with alpha for client shadows */ > - if (priv->use_client_shadow) > - { > -@@ -5839,7 +5869,6 @@ static gboolean > - gtk_window_should_use_csd (GtkWindow *window) > - { > - GtkWindowPrivate *priv = window->priv; > -- const gchar *csd_env; > - > - if (priv->csd_requested) > - return TRUE; > -@@ -5850,24 +5879,7 @@ gtk_window_should_use_csd (GtkWindow *window) > - if (priv->type == GTK_WINDOW_POPUP) > - return FALSE; > - > --#ifdef GDK_WINDOWING_BROADWAY > -- if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET > (window)))) > -- return TRUE; > --#endif > -- > --#ifdef GDK_WINDOWING_WAYLAND > -- if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET > (window)))) > -- return TRUE; > --#endif > -- > --#ifdef GDK_WINDOWING_MIR > -- if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) > -- return TRUE; > --#endif > -- > -- csd_env = g_getenv ("GTK_CSD"); > -- > -- return (g_strcmp0 (csd_env, "1") == 0); > -+ return gtk_window_can_use_csd (window); > - } > - > - static void > --- > -cgit v0.10.2 > - > diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb > <http://3_3.18.8.bb> b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb > <http://3_3.20.6.bb> > similarity index 57% > rename from meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb <http://3_3.18.8.bb> > rename to meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb <http://3_3.20.6.bb> > index d776b6d..453a4e2 100644 > --- a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb <http://3_3.18.8.bb> > +++ b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb <http://3_3.20.6.bb> > @@ -3,14 +3,13 @@ require gtk+3.inc > MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" > > SRC_URI = > "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> > \ > - file://hardcoded_libtool.patch \ > - file://Dont-force-csd.patch \ > - file://Do-not-try-to-initialize-GL-without-libGL.patch \ > - file://0001-Add-disable-opengl-configure-option.patch \ > + file://0001-Hardcoded-libtool.patch \ > + file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ > + file://0003-Add-disable-opengl-configure-option.patch \ > + file://0004-configure.ac-Fix-wayland-protocols-path.patch \ > " > - > -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" > -SRC_URI[sha256sum] = > "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" > +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" > +SRC_URI[sha256sum] = > "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" > > S = "${WORKDIR}/gtk+-${PV}" > > diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb > <http://gtk-icon-utils-native_3.18.8.bb> > b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb > <http://gtk-icon-utils-native_3.20.6.bb> > similarity index 93% > rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb > <http://gtk-icon-utils-native_3.18.8.bb> > rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb > <http://gtk-icon-utils-native_3.20.6.bb> > index 793f14a..e870ba3 100644 > --- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb > <http://gtk-icon-utils-native_3.18.8.bb> > +++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb > <http://gtk-icon-utils-native_3.20.6.bb> > @@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" > > SRC_URI = > "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> > \ > > file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch" > -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" > -SRC_URI[sha256sum] = > "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" > +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" > +SRC_URI[sha256sum] = > "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" > > LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ > > file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ > > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 2016-07-06 3:09 ` Robert Yang @ 2016-07-06 3:21 ` Robert Yang 2016-07-06 7:08 ` Jussi Kukkonen 0 siblings, 1 reply; 19+ messages in thread From: Robert Yang @ 2016-07-06 3:21 UTC (permalink / raw) To: Jussi Kukkonen; +Cc: Patches and discussions about the oe-core layer On 07/06/2016 11:09 AM, Robert Yang wrote: > > > On 07/05/2016 10:08 PM, Jussi Kukkonen wrote: >> >> >> On 5 July 2016 at 16:09, Robert Yang <liezhi.yang@windriver.com >> <mailto:liezhi.yang@windriver.com>> wrote: >> >> >> Hi, >> >> I can't build it on Ubuntu 14.04: >> >> >> I can't see from the log why the file would be be missing and can't reproduce >> that locally... Cleaning sstate should be a valid workaround but I'd be really >> interested in reproducing this: if you can reproduce (or remember if you did any >> distro feature or packageconfig changes) please let me know the details. >> >> In the meantime I'll take another look at the build system... > > Please see below ... > > >> +diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h >> +similarity index 100% >> +rename from gdk/x11/gdkx.h >> +rename to gdk/x11/gdkx-with-gl-context.h > > Older patch tool such as patch 2.7.1 can't apply this patch, I will update it. Sorry, 2.6.1:-). // Robert > > // Robert > >> diff --git a/gdk/x11/gdkx-without-gl-context.h >> b/gdk/x11/gdkx-without-gl-context.h >> new file mode 100644 >> index 0000000..c9e2617 >> @@ -686,76 +617,11 @@ index 0000000..c9e2617 >> +#undef __GDKX_H_INSIDE__ >> + >> +#endif /* __GDK_X_H__ */ >> -diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h >> -deleted file mode 100644 >> -index ae05fa6..0000000 >> ---- a/gdk/x11/gdkx.h >> -+++ /dev/null >> -@@ -1,59 +0,0 @@ >> --/* GDK - The GIMP Drawing Kit >> -- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh >> MacDonald >> -- * >> -- * This library is free software; you can redistribute it and/or >> -- * modify it under the terms of the GNU Lesser General Public >> -- * License as published by the Free Software Foundation; either >> -- * version 2 of the License, or (at your option) any later version. >> -- * >> -- * This library is distributed in the hope that it will be useful, >> -- * but WITHOUT ANY WARRANTY; without even the implied warranty of >> -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> -- * Lesser General Public License for more details. >> -- * >> -- * You should have received a copy of the GNU Lesser General Public >> -- * License along with this library. If not, see >> <http://www.gnu.org/licenses/>. >> -- */ >> -- >> --/* >> -- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS >> -- * file for a list of people on the GTK+ Team. See the ChangeLog >> -- * files for a list of changes. These files are distributed with >> -- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. >> -- */ >> -- >> --#ifndef __GDK_X_H__ >> --#define __GDK_X_H__ >> -- >> --#include <gdk/gdk.h> >> -- >> --#include <X11/Xlib.h> >> --#include <X11/Xutil.h> >> -- >> --#define __GDKX_H_INSIDE__ >> -- >> --#include <gdk/x11/gdkx11applaunchcontext.h> >> --#include <gdk/x11/gdkx11cursor.h> >> --#include <gdk/x11/gdkx11device.h> >> --#include <gdk/x11/gdkx11device-core.h> >> --#include <gdk/x11/gdkx11device-xi2.h> >> --#include <gdk/x11/gdkx11devicemanager.h> >> --#include <gdk/x11/gdkx11devicemanager-core.h> >> --#include <gdk/x11/gdkx11devicemanager-xi2.h> >> --#include <gdk/x11/gdkx11display.h> >> --#include <gdk/x11/gdkx11displaymanager.h> >> --#include <gdk/x11/gdkx11dnd.h> >> --#include <gdk/x11/gdkx11glcontext.h> >> --#include <gdk/x11/gdkx11keys.h> >> --#include <gdk/x11/gdkx11property.h> >> --#include <gdk/x11/gdkx11screen.h> >> --#include <gdk/x11/gdkx11selection.h> >> --#include <gdk/x11/gdkx11utils.h> >> --#include <gdk/x11/gdkx11visual.h> >> --#include <gdk/x11/gdkx11window.h> >> -- >> --#include <gdk/x11/gdkx-autocleanups.h> >> -- >> --#undef __GDKX_H_INSIDE__ >> -- >> --#endif /* __GDK_X_H__ */ >> diff --git a/gtk/Makefile.am b/gtk/Makefile.am >> -index 801c3a5..2d8839d 100644 >> +index 6a53a2b..49a35e6 100644 >> --- a/gtk/Makefile.am >> +++ b/gtk/Makefile.am >> -@@ -1246,14 +1246,13 @@ gtkprivatetypebuiltins.c: >> $(gtk_private_type_h_sources) gtkprivatetypebuiltins. >> +@@ -1351,14 +1351,13 @@ gtkprivatetypebuiltins.c: >> $(gtk_private_type_h_sources) gtkprivatetypebuiltins. >> && cp xgen-gptbc gtkprivatetypebuiltins.c \ >> && rm -f xgen-gptbc >> >> @@ -772,7 +638,7 @@ index 801c3a5..2d8839d 100644 >> gtktestutils.c: gtktypefuncs.c >> >> diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c >> -index 4098409..45fa1d1 100644 >> +index 245fc6b..4214ad1 100644 >> --- a/gtk/gtkglarea.c >> +++ b/gtk/gtkglarea.c >> @@ -28,7 +28,9 @@ >> @@ -868,7 +734,7 @@ index 4098409..45fa1d1 100644 >> >> static gboolean >> diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c >> -index 0611373..4499a29 100644 >> +index 4eab3a7..c4e900e 100644 >> --- a/gtk/inspector/general.c >> +++ b/gtk/inspector/general.c >> @@ -33,8 +33,10 @@ >> @@ -882,7 +748,7 @@ index 0611373..4499a29 100644 >> >> #ifdef GDK_WINDOWING_WIN32 >> #include "win32/gdkwin32.h" >> -@@ -146,6 +148,7 @@ append_extension_row (GtkInspectorGeneral *gen, >> +@@ -147,6 +149,7 @@ append_extension_row (GtkInspectorGeneral *gen, >> gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), >> label); >> } >> >> @@ -890,7 +756,7 @@ index 0611373..4499a29 100644 >> #ifdef GDK_WINDOWING_X11 >> static void >> append_glx_extension_row (GtkInspectorGeneral *gen, >> -@@ -155,6 +158,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, >> +@@ -156,6 +159,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, >> append_extension_row (gen, ext, epoxy_has_glx_extension (dpy, 0, >> ext)); >> } >> #endif >> @@ -898,27 +764,27 @@ index 0611373..4499a29 100644 >> >> #ifdef GDK_WINDOWING_WAYLAND >> static void >> -@@ -174,6 +178,7 @@ init_gl (GtkInspectorGeneral *gen) >> - >> - display = gdk_display_get_default (); >> - >> +@@ -171,6 +175,7 @@ append_egl_extension_row (GtkInspectorGeneral *gen, >> + static void >> + init_gl (GtkInspectorGeneral *gen) >> + { >> +#ifdef HAVE_OPENGL >> #ifdef GDK_WINDOWING_X11 >> - if (GDK_IS_X11_DISPLAY (display)) >> + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) >> { >> -@@ -199,6 +204,7 @@ init_gl (GtkInspectorGeneral *gen) >> +@@ -197,6 +202,7 @@ init_gl (GtkInspectorGeneral *gen) >> } >> else >> #endif >> +#endif >> #ifdef GDK_WINDOWING_WAYLAND >> - if (GDK_IS_WAYLAND_DISPLAY (display)) >> + if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) >> { >> diff --git a/tests/Makefile.am b/tests/Makefile.am >> -index 50f2986..3b39169 100644 >> +index 681807d..2941a36 100644 >> --- a/tests/Makefile.am >> +++ b/tests/Makefile.am >> -@@ -78,8 +78,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >> +@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >> testfullscreen \ >> testgeometry \ >> testgiconpixbuf \ >> @@ -927,18 +793,19 @@ index 50f2986..3b39169 100644 >> testgrid \ >> testgtk \ >> testheaderbar \ >> -@@ -166,10 +164,16 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >> +@@ -169,11 +167,17 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >> testactionbar \ >> testwindowsize \ >> testpopover \ >> - gdkgears \ >> listmodel \ >> + testpopup \ >> $(NULL) >> >> +if HAVE_OPENGL >> +noinst_PROGRAMS += >> -+ testglarea \ >> -+ testglblending \ >> ++ testglarea \ >> ++ testglblending \ >> + gdkgears >> +endif >> + >> @@ -946,11 +813,11 @@ index 50f2986..3b39169 100644 >> noinst_PROGRAMS += testerrors >> endif >> diff --git a/testsuite/gtk/objects-finalize.c >> b/testsuite/gtk/objects-finalize.c >> -index 3568505..682ea10 100644 >> +index e0ebee0..703643c 100644 >> --- a/testsuite/gtk/objects-finalize.c >> +++ b/testsuite/gtk/objects-finalize.c >> -@@ -114,8 +114,10 @@ main (int argc, char **argv) >> - all_types[i] != GDK_TYPE_X11_DISPLAY && >> +@@ -115,8 +115,10 @@ main (int argc, char **argv) >> + all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && >> all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && >> all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && >> +#ifdef HAVE_OPENGL >> @@ -961,5 +828,5 @@ index 3568505..682ea10 100644 >> all_types[i] != GDK_TYPE_PIXBUF_LOADER && >> all_types[i] != gdk_pixbuf_simple_anim_iter_get_type()) >> -- >> -2.8.1 >> +2.1.4 >> >> diff --git >> >> a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch >> >> >> b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch >> >> new file mode 100644 >> index 0000000..634b3a4 >> --- /dev/null >> +++ >> >> b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch >> >> @@ -0,0 +1,36 @@ >> +From 97b78e566634579bbae51be914aeaaa921137a8b Mon Sep 17 00:00:00 2001 >> +From: Jussi Kukkonen <jussi.kukkonen@intel.com >> <mailto:jussi.kukkonen@intel.com>> >> +Date: Thu, 9 Jun 2016 11:21:36 +0300 >> +Subject: [PATCH 4/4] configure.ac <http://configure.ac>: Fix >> wayland-protocols path >> + >> +The wayland-protocols directory is used during build: Fix the path >> +to point to sysroot specified in recipe. >> + >> +Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac >> <http://configure.ac> but that >> +breaks multilib gtk+ as it would point to multilib sysroot when the >> +(allarch) wayland-protocols is actually in the machine sysroot. >> + >> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com >> <mailto:jussi.kukkonen@intel.com>> >> +Upstream-Status: Inappropriate [embedded specific] >> + >> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com >> <mailto:jussi.kukkonen@intel.com>> >> +--- >> + configure.ac <http://configure.ac> | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/configure.ac <http://configure.ac> b/configure.ac >> <http://configure.ac> >> +index a3e9beb..dde9dc5 100644 >> +--- a/configure.ac <http://configure.ac> >> ++++ b/configure.ac <http://configure.ac> >> +@@ -461,7 +461,7 @@ fi >> + if test "$enable_wayland_backend" = "yes"; then >> + # For the cairo image backend >> + cairo_backends="$cairo_backends cairo" >> +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG >> --variable=pkgdatadir wayland-protocols`) >> ++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, >> ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir >> wayland-protocols`) >> + GDK_BACKENDS="$GDK_BACKENDS wayland" >> + GDK_WINDOWING="$GDK_WINDOWING >> + #define GDK_WINDOWING_WAYLAND" >> +-- >> +2.1.4 >> + >> diff --git a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch >> b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch >> deleted file mode 100644 >> index 32d8a84..0000000 >> --- a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch >> +++ /dev/null >> @@ -1,118 +0,0 @@ >> -window: Check if we can use CSD before enabling them >> - >> -Upstream-Status: Backport >> -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com >> <mailto:jussi.kukkonen@intel.com>> >> - >> - >> -From c5e5ee67490e7e7af56052d8f8beb75db002c2f1 Mon Sep 17 00:00:00 2001 >> -From: Emmanuele Bassi <ebassi@gnome.org <mailto:ebassi@gnome.org>> >> -Date: Wed, 3 Jun 2015 14:07:29 +0100 >> -Subject: window: Check if we can use CSD before enabling them >> - >> -The change in 03213b9509fc1df16c66194ea168aed6c15110e9 changed the rules >> -as to when CSD can be enabled, but it also unconditionally enables CSD >> -with the implicit assumption that client-side shadows were the real >> -issue, and that we could work around that by drawing our own borders. >> -This also means that setting a titlebar for a GtkWindow will enable CSD >> -unconditionally. >> - >> -In reality, some window managers (like Matchbox) *only* support >> -server-side decorations, and will ignore all hints to the contrary, to >> -the point of drawing decorations at random locations on top of the >> -window. >> - >> -Since CSD are enabled unconditionally, the GTK_CSD environment variable >> -is also not a suitable escape hatch. >> - >> -In the grand tradition of asking ourselves if we should do something >> -just because we can, we should split the environment checks from the >> -checks on what the user requested; by doing that, we can also check >> -when enabling client-side decorations, and ideally bail out if needed. >> - >> -https://bugzilla.gnome.org/show_bug.cgi?id=750343 >> - >> -diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c >> -index 423c6bd..9fe882f 100644 >> ---- a/gtk/gtkwindow.c >> -+++ b/gtk/gtkwindow.c >> -@@ -4056,6 +4056,32 @@ gtk_window_supports_client_shadow (GtkWindow >> *window) >> - return TRUE; >> - } >> - >> -+static gboolean >> -+gtk_window_can_use_csd (GtkWindow *window) >> -+{ >> -+ const gchar *csd_env; >> -+ >> -+#ifdef GDK_WINDOWING_BROADWAY >> -+ if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET >> (window)))) >> -+ return TRUE; >> -+#endif >> -+ >> -+#ifdef GDK_WINDOWING_WAYLAND >> -+ if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET >> (window)))) >> -+ return TRUE; >> -+#endif >> -+ >> -+#ifdef GDK_WINDOWING_MIR >> -+ if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET >> (window)))) >> -+ return TRUE; >> -+#endif >> -+ >> -+ csd_env = g_getenv ("GTK_CSD"); >> -+ >> -+ /* If GTK_CSD is unset we default to CSD support */ >> -+ return csd_env == NULL || (strcmp (csd_env, "1") == 0); >> -+} >> -+ >> - static void >> - gtk_window_enable_csd (GtkWindow *window) >> - { >> -@@ -4063,6 +4089,10 @@ gtk_window_enable_csd (GtkWindow *window) >> - GtkWidget *widget = GTK_WIDGET (window); >> - GdkVisual *visual; >> - >> -+ /* If the environment does not support CSD, then there's no point in >> enabling them */ >> -+ if (!gtk_window_can_use_csd (window)) >> -+ return; >> -+ >> - /* We need a visual with alpha for client shadows */ >> - if (priv->use_client_shadow) >> - { >> -@@ -5839,7 +5869,6 @@ static gboolean >> - gtk_window_should_use_csd (GtkWindow *window) >> - { >> - GtkWindowPrivate *priv = window->priv; >> -- const gchar *csd_env; >> - >> - if (priv->csd_requested) >> - return TRUE; >> -@@ -5850,24 +5879,7 @@ gtk_window_should_use_csd (GtkWindow *window) >> - if (priv->type == GTK_WINDOW_POPUP) >> - return FALSE; >> - >> --#ifdef GDK_WINDOWING_BROADWAY >> -- if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET >> (window)))) >> -- return TRUE; >> --#endif >> -- >> --#ifdef GDK_WINDOWING_WAYLAND >> -- if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET >> (window)))) >> -- return TRUE; >> --#endif >> -- >> --#ifdef GDK_WINDOWING_MIR >> -- if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET >> (window)))) >> -- return TRUE; >> --#endif >> -- >> -- csd_env = g_getenv ("GTK_CSD"); >> -- >> -- return (g_strcmp0 (csd_env, "1") == 0); >> -+ return gtk_window_can_use_csd (window); >> - } >> - >> - static void >> --- >> -cgit v0.10.2 >> - >> diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb >> <http://3_3.18.8.bb> b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb >> <http://3_3.20.6.bb> >> similarity index 57% >> rename from meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb <http://3_3.18.8.bb> >> rename to meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb <http://3_3.20.6.bb> >> index d776b6d..453a4e2 100644 >> --- a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb <http://3_3.18.8.bb> >> +++ b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb <http://3_3.20.6.bb> >> @@ -3,14 +3,13 @@ require gtk+3.inc >> MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" >> >> SRC_URI = >> >> "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz >> <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> >> >> \ >> - file://hardcoded_libtool.patch \ >> - file://Dont-force-csd.patch \ >> - file://Do-not-try-to-initialize-GL-without-libGL.patch \ >> - file://0001-Add-disable-opengl-configure-option.patch \ >> + file://0001-Hardcoded-libtool.patch \ >> + file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ >> + file://0003-Add-disable-opengl-configure-option.patch \ >> + file://0004-configure.ac-Fix-wayland-protocols-path.patch \ >> " >> - >> -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" >> -SRC_URI[sha256sum] = >> "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" >> +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" >> +SRC_URI[sha256sum] = >> "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" >> >> S = "${WORKDIR}/gtk+-${PV}" >> >> diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb >> <http://gtk-icon-utils-native_3.18.8.bb> >> b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb >> <http://gtk-icon-utils-native_3.20.6.bb> >> similarity index 93% >> rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb >> <http://gtk-icon-utils-native_3.18.8.bb> >> rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb >> <http://gtk-icon-utils-native_3.20.6.bb> >> index 793f14a..e870ba3 100644 >> --- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb >> <http://gtk-icon-utils-native_3.18.8.bb> >> +++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb >> <http://gtk-icon-utils-native_3.20.6.bb> >> @@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" >> >> SRC_URI = >> >> "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz >> <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> >> >> \ >> >> file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch" >> -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" >> -SRC_URI[sha256sum] = >> "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" >> +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" >> +SRC_URI[sha256sum] = >> "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" >> >> LIC_FILES_CHKSUM = >> "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ >> >> file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ >> >> ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 2016-07-06 3:21 ` Robert Yang @ 2016-07-06 7:08 ` Jussi Kukkonen 2016-07-06 7:12 ` Robert Yang 0 siblings, 1 reply; 19+ messages in thread From: Jussi Kukkonen @ 2016-07-06 7:08 UTC (permalink / raw) To: Robert Yang; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 23740 bytes --] On 6 July 2016 at 06:21, Robert Yang <liezhi.yang@windriver.com> wrote: > On 07/06/2016 11:09 AM, Robert Yang wrote: > >> On 07/05/2016 10:08 PM, Jussi Kukkonen wrote: >> >>> On 5 July 2016 at 16:09, Robert Yang <liezhi.yang@windriver.com >>> <mailto:liezhi.yang@windriver.com>> wrote: >>> >>> >>> Hi, >>> >>> I can't build it on Ubuntu 14.04: >>> >>> >>> I can't see from the log why the file would be be missing and can't >>> reproduce >>> that locally... Cleaning sstate should be a valid workaround but I'd be >>> really >>> interested in reproducing this: if you can reproduce (or remember if you >>> did any >>> distro feature or packageconfig changes) please let me know the >>> details. >>> >>> In the meantime I'll take another look at the build system... >>> >> >> Please see below ... >> >> >> +diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h >>> +similarity index 100% >>> +rename from gdk/x11/gdkx.h >>> +rename to gdk/x11/gdkx-with-gl-context.h >>> >> >> Older patch tool such as patch 2.7.1 can't apply this patch, I will >> update it. >> > > Sorry, 2.6.1:-). > > Thanks for the follow up. Ubuntu 14.04 should not have gnu patch 2.6.1 though, or am I mistaken? Jussi > // Robert > > > >> // Robert >> >> diff --git a/gdk/x11/gdkx-without-gl-context.h >>> b/gdk/x11/gdkx-without-gl-context.h >>> new file mode 100644 >>> index 0000000..c9e2617 >>> @@ -686,76 +617,11 @@ index 0000000..c9e2617 >>> +#undef __GDKX_H_INSIDE__ >>> + >>> +#endif /* __GDK_X_H__ */ >>> -diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h >>> -deleted file mode 100644 >>> -index ae05fa6..0000000 >>> ---- a/gdk/x11/gdkx.h >>> -+++ /dev/null >>> -@@ -1,59 +0,0 @@ >>> --/* GDK - The GIMP Drawing Kit >>> -- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and >>> Josh >>> MacDonald >>> -- * >>> -- * This library is free software; you can redistribute it >>> and/or >>> -- * modify it under the terms of the GNU Lesser General Public >>> -- * License as published by the Free Software Foundation; either >>> -- * version 2 of the License, or (at your option) any later >>> version. >>> -- * >>> -- * This library is distributed in the hope that it will be >>> useful, >>> -- * but WITHOUT ANY WARRANTY; without even the implied warranty >>> of >>> -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See >>> the GNU >>> -- * Lesser General Public License for more details. >>> -- * >>> -- * You should have received a copy of the GNU Lesser General >>> Public >>> -- * License along with this library. If not, see >>> <http://www.gnu.org/licenses/>. >>> -- */ >>> -- >>> --/* >>> -- * Modified by the GTK+ Team and others 1997-2000. See the >>> AUTHORS >>> -- * file for a list of people on the GTK+ Team. See the >>> ChangeLog >>> -- * files for a list of changes. These files are distributed >>> with >>> -- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. >>> -- */ >>> -- >>> --#ifndef __GDK_X_H__ >>> --#define __GDK_X_H__ >>> -- >>> --#include <gdk/gdk.h> >>> -- >>> --#include <X11/Xlib.h> >>> --#include <X11/Xutil.h> >>> -- >>> --#define __GDKX_H_INSIDE__ >>> -- >>> --#include <gdk/x11/gdkx11applaunchcontext.h> >>> --#include <gdk/x11/gdkx11cursor.h> >>> --#include <gdk/x11/gdkx11device.h> >>> --#include <gdk/x11/gdkx11device-core.h> >>> --#include <gdk/x11/gdkx11device-xi2.h> >>> --#include <gdk/x11/gdkx11devicemanager.h> >>> --#include <gdk/x11/gdkx11devicemanager-core.h> >>> --#include <gdk/x11/gdkx11devicemanager-xi2.h> >>> --#include <gdk/x11/gdkx11display.h> >>> --#include <gdk/x11/gdkx11displaymanager.h> >>> --#include <gdk/x11/gdkx11dnd.h> >>> --#include <gdk/x11/gdkx11glcontext.h> >>> --#include <gdk/x11/gdkx11keys.h> >>> --#include <gdk/x11/gdkx11property.h> >>> --#include <gdk/x11/gdkx11screen.h> >>> --#include <gdk/x11/gdkx11selection.h> >>> --#include <gdk/x11/gdkx11utils.h> >>> --#include <gdk/x11/gdkx11visual.h> >>> --#include <gdk/x11/gdkx11window.h> >>> -- >>> --#include <gdk/x11/gdkx-autocleanups.h> >>> -- >>> --#undef __GDKX_H_INSIDE__ >>> -- >>> --#endif /* __GDK_X_H__ */ >>> diff --git a/gtk/Makefile.am b/gtk/Makefile.am >>> -index 801c3a5..2d8839d 100644 >>> +index 6a53a2b..49a35e6 100644 >>> --- a/gtk/Makefile.am >>> +++ b/gtk/Makefile.am >>> -@@ -1246,14 +1246,13 @@ gtkprivatetypebuiltins.c: >>> $(gtk_private_type_h_sources) gtkprivatetypebuiltins. >>> +@@ -1351,14 +1351,13 @@ gtkprivatetypebuiltins.c: >>> $(gtk_private_type_h_sources) gtkprivatetypebuiltins. >>> && cp xgen-gptbc gtkprivatetypebuiltins.c \ >>> && rm -f xgen-gptbc >>> >>> @@ -772,7 +638,7 @@ index 801c3a5..2d8839d 100644 >>> gtktestutils.c: gtktypefuncs.c >>> >>> diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c >>> -index 4098409..45fa1d1 100644 >>> +index 245fc6b..4214ad1 100644 >>> --- a/gtk/gtkglarea.c >>> +++ b/gtk/gtkglarea.c >>> @@ -28,7 +28,9 @@ >>> @@ -868,7 +734,7 @@ index 4098409..45fa1d1 100644 >>> >>> static gboolean >>> diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c >>> -index 0611373..4499a29 100644 >>> +index 4eab3a7..c4e900e 100644 >>> --- a/gtk/inspector/general.c >>> +++ b/gtk/inspector/general.c >>> @@ -33,8 +33,10 @@ >>> @@ -882,7 +748,7 @@ index 0611373..4499a29 100644 >>> >>> #ifdef GDK_WINDOWING_WIN32 >>> #include "win32/gdkwin32.h" >>> -@@ -146,6 +148,7 @@ append_extension_row (GtkInspectorGeneral >>> *gen, >>> +@@ -147,6 +149,7 @@ append_extension_row (GtkInspectorGeneral >>> *gen, >>> gtk_size_group_add_widget (GTK_SIZE_GROUP >>> (gen->priv->labels), >>> label); >>> } >>> >>> @@ -890,7 +756,7 @@ index 0611373..4499a29 100644 >>> #ifdef GDK_WINDOWING_X11 >>> static void >>> append_glx_extension_row (GtkInspectorGeneral *gen, >>> -@@ -155,6 +158,7 @@ append_glx_extension_row >>> (GtkInspectorGeneral *gen, >>> +@@ -156,6 +159,7 @@ append_glx_extension_row >>> (GtkInspectorGeneral *gen, >>> append_extension_row (gen, ext, epoxy_has_glx_extension >>> (dpy, 0, >>> ext)); >>> } >>> #endif >>> @@ -898,27 +764,27 @@ index 0611373..4499a29 100644 >>> >>> #ifdef GDK_WINDOWING_WAYLAND >>> static void >>> -@@ -174,6 +178,7 @@ init_gl (GtkInspectorGeneral *gen) >>> - >>> - display = gdk_display_get_default (); >>> - >>> +@@ -171,6 +175,7 @@ append_egl_extension_row >>> (GtkInspectorGeneral *gen, >>> + static void >>> + init_gl (GtkInspectorGeneral *gen) >>> + { >>> +#ifdef HAVE_OPENGL >>> #ifdef GDK_WINDOWING_X11 >>> - if (GDK_IS_X11_DISPLAY (display)) >>> + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) >>> { >>> -@@ -199,6 +204,7 @@ init_gl (GtkInspectorGeneral *gen) >>> +@@ -197,6 +202,7 @@ init_gl (GtkInspectorGeneral *gen) >>> } >>> else >>> #endif >>> +#endif >>> #ifdef GDK_WINDOWING_WAYLAND >>> - if (GDK_IS_WAYLAND_DISPLAY (display)) >>> + if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) >>> { >>> diff --git a/tests/Makefile.am b/tests/Makefile.am >>> -index 50f2986..3b39169 100644 >>> +index 681807d..2941a36 100644 >>> --- a/tests/Makefile.am >>> +++ b/tests/Makefile.am >>> -@@ -78,8 +78,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >>> +@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >>> testfullscreen \ >>> testgeometry \ >>> testgiconpixbuf \ >>> @@ -927,18 +793,19 @@ index 50f2986..3b39169 100644 >>> testgrid \ >>> testgtk \ >>> testheaderbar \ >>> -@@ -166,10 +164,16 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >>> +@@ -169,11 +167,17 @@ noinst_PROGRAMS = $(TEST_PROGS) \ >>> testactionbar \ >>> testwindowsize \ >>> testpopover \ >>> - gdkgears \ >>> listmodel \ >>> + testpopup \ >>> $(NULL) >>> >>> +if HAVE_OPENGL >>> +noinst_PROGRAMS += >>> -+ testglarea \ >>> -+ testglblending \ >>> ++ testglarea \ >>> ++ testglblending \ >>> + gdkgears >>> +endif >>> + >>> @@ -946,11 +813,11 @@ index 50f2986..3b39169 100644 >>> noinst_PROGRAMS += testerrors >>> endif >>> diff --git a/testsuite/gtk/objects-finalize.c >>> b/testsuite/gtk/objects-finalize.c >>> -index 3568505..682ea10 100644 >>> +index e0ebee0..703643c 100644 >>> --- a/testsuite/gtk/objects-finalize.c >>> +++ b/testsuite/gtk/objects-finalize.c >>> -@@ -114,8 +114,10 @@ main (int argc, char **argv) >>> - all_types[i] != GDK_TYPE_X11_DISPLAY && >>> +@@ -115,8 +115,10 @@ main (int argc, char **argv) >>> + all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && >>> all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && >>> all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && >>> +#ifdef HAVE_OPENGL >>> @@ -961,5 +828,5 @@ index 3568505..682ea10 100644 >>> all_types[i] != GDK_TYPE_PIXBUF_LOADER && >>> all_types[i] != >>> gdk_pixbuf_simple_anim_iter_get_type()) >>> -- >>> -2.8.1 >>> +2.1.4 >>> >>> diff --git >>> >>> >>> a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch >>> >>> >>> >>> b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch >>> >>> new file mode 100644 >>> index 0000000..634b3a4 >>> --- /dev/null >>> +++ >>> >>> >>> b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch >>> >>> @@ -0,0 +1,36 @@ >>> +From 97b78e566634579bbae51be914aeaaa921137a8b Mon Sep 17 >>> 00:00:00 2001 >>> +From: Jussi Kukkonen <jussi.kukkonen@intel.com >>> <mailto:jussi.kukkonen@intel.com>> >>> +Date: Thu, 9 Jun 2016 11:21:36 +0300 >>> +Subject: [PATCH 4/4] configure.ac <http://configure.ac>: Fix >>> wayland-protocols path >>> + >>> +The wayland-protocols directory is used during build: Fix the >>> path >>> +to point to sysroot specified in recipe. >>> + >>> +Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac >>> <http://configure.ac> but that >>> +breaks multilib gtk+ as it would point to multilib sysroot when >>> the >>> +(allarch) wayland-protocols is actually in the machine sysroot. >>> + >>> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com >>> <mailto:jussi.kukkonen@intel.com>> >>> +Upstream-Status: Inappropriate [embedded specific] >>> + >>> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com >>> <mailto:jussi.kukkonen@intel.com>> >>> +--- >>> + configure.ac <http://configure.ac> | 2 +- >>> + 1 file changed, 1 insertion(+), 1 deletion(-) >>> + >>> +diff --git a/configure.ac <http://configure.ac> b/configure.ac >>> <http://configure.ac> >>> +index a3e9beb..dde9dc5 100644 >>> +--- a/configure.ac <http://configure.ac> >>> ++++ b/configure.ac <http://configure.ac> >>> +@@ -461,7 +461,7 @@ fi >>> + if test "$enable_wayland_backend" = "yes"; then >>> + # For the cairo image backend >>> + cairo_backends="$cairo_backends cairo" >>> +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG >>> --variable=pkgdatadir wayland-protocols`) >>> ++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, >>> ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG >>> --variable=pkgdatadir >>> wayland-protocols`) >>> + GDK_BACKENDS="$GDK_BACKENDS wayland" >>> + GDK_WINDOWING="$GDK_WINDOWING >>> + #define GDK_WINDOWING_WAYLAND" >>> +-- >>> +2.1.4 >>> + >>> diff --git a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch >>> b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch >>> deleted file mode 100644 >>> index 32d8a84..0000000 >>> --- a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch >>> +++ /dev/null >>> @@ -1,118 +0,0 @@ >>> -window: Check if we can use CSD before enabling them >>> - >>> -Upstream-Status: Backport >>> -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com >>> <mailto:jussi.kukkonen@intel.com>> >>> - >>> - >>> -From c5e5ee67490e7e7af56052d8f8beb75db002c2f1 Mon Sep 17 >>> 00:00:00 2001 >>> -From: Emmanuele Bassi <ebassi@gnome.org <mailto: >>> ebassi@gnome.org>> >>> -Date: Wed, 3 Jun 2015 14:07:29 +0100 >>> -Subject: window: Check if we can use CSD before enabling them >>> - >>> -The change in 03213b9509fc1df16c66194ea168aed6c15110e9 changed >>> the rules >>> -as to when CSD can be enabled, but it also unconditionally >>> enables CSD >>> -with the implicit assumption that client-side shadows were the >>> real >>> -issue, and that we could work around that by drawing our own >>> borders. >>> -This also means that setting a titlebar for a GtkWindow will >>> enable CSD >>> -unconditionally. >>> - >>> -In reality, some window managers (like Matchbox) *only* support >>> -server-side decorations, and will ignore all hints to the >>> contrary, to >>> -the point of drawing decorations at random locations on top of >>> the >>> -window. >>> - >>> -Since CSD are enabled unconditionally, the GTK_CSD environment >>> variable >>> -is also not a suitable escape hatch. >>> - >>> -In the grand tradition of asking ourselves if we should do >>> something >>> -just because we can, we should split the environment checks >>> from the >>> -checks on what the user requested; by doing that, we can also >>> check >>> -when enabling client-side decorations, and ideally bail out if >>> needed. >>> - >>> -https://bugzilla.gnome.org/show_bug.cgi?id=750343 >>> - >>> -diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c >>> -index 423c6bd..9fe882f 100644 >>> ---- a/gtk/gtkwindow.c >>> -+++ b/gtk/gtkwindow.c >>> -@@ -4056,6 +4056,32 @@ gtk_window_supports_client_shadow >>> (GtkWindow >>> *window) >>> - return TRUE; >>> - } >>> - >>> -+static gboolean >>> -+gtk_window_can_use_csd (GtkWindow *window) >>> -+{ >>> -+ const gchar *csd_env; >>> -+ >>> -+#ifdef GDK_WINDOWING_BROADWAY >>> -+ if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display >>> (GTK_WIDGET >>> (window)))) >>> -+ return TRUE; >>> -+#endif >>> -+ >>> -+#ifdef GDK_WINDOWING_WAYLAND >>> -+ if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display >>> (GTK_WIDGET >>> (window)))) >>> -+ return TRUE; >>> -+#endif >>> -+ >>> -+#ifdef GDK_WINDOWING_MIR >>> -+ if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET >>> (window)))) >>> -+ return TRUE; >>> -+#endif >>> -+ >>> -+ csd_env = g_getenv ("GTK_CSD"); >>> -+ >>> -+ /* If GTK_CSD is unset we default to CSD support */ >>> -+ return csd_env == NULL || (strcmp (csd_env, "1") == 0); >>> -+} >>> -+ >>> - static void >>> - gtk_window_enable_csd (GtkWindow *window) >>> - { >>> -@@ -4063,6 +4089,10 @@ gtk_window_enable_csd (GtkWindow *window) >>> - GtkWidget *widget = GTK_WIDGET (window); >>> - GdkVisual *visual; >>> - >>> -+ /* If the environment does not support CSD, then there's no >>> point in >>> enabling them */ >>> -+ if (!gtk_window_can_use_csd (window)) >>> -+ return; >>> -+ >>> - /* We need a visual with alpha for client shadows */ >>> - if (priv->use_client_shadow) >>> - { >>> -@@ -5839,7 +5869,6 @@ static gboolean >>> - gtk_window_should_use_csd (GtkWindow *window) >>> - { >>> - GtkWindowPrivate *priv = window->priv; >>> -- const gchar *csd_env; >>> - >>> - if (priv->csd_requested) >>> - return TRUE; >>> -@@ -5850,24 +5879,7 @@ gtk_window_should_use_csd (GtkWindow >>> *window) >>> - if (priv->type == GTK_WINDOW_POPUP) >>> - return FALSE; >>> - >>> --#ifdef GDK_WINDOWING_BROADWAY >>> -- if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display >>> (GTK_WIDGET >>> (window)))) >>> -- return TRUE; >>> --#endif >>> -- >>> --#ifdef GDK_WINDOWING_WAYLAND >>> -- if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display >>> (GTK_WIDGET >>> (window)))) >>> -- return TRUE; >>> --#endif >>> -- >>> --#ifdef GDK_WINDOWING_MIR >>> -- if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET >>> (window)))) >>> -- return TRUE; >>> --#endif >>> -- >>> -- csd_env = g_getenv ("GTK_CSD"); >>> -- >>> -- return (g_strcmp0 (csd_env, "1") == 0); >>> -+ return gtk_window_can_use_csd (window); >>> - } >>> - >>> - static void >>> --- >>> -cgit v0.10.2 >>> - >>> diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb >>> <http://3_3.18.8.bb> b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb >>> <http://3_3.20.6.bb> >>> similarity index 57% >>> rename from meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb < >>> http://3_3.18.8.bb> >>> rename to meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb < >>> http://3_3.20.6.bb> >>> index d776b6d..453a4e2 100644 >>> --- a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb < >>> http://3_3.18.8.bb> >>> +++ b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb < >>> http://3_3.20.6.bb> >>> @@ -3,14 +3,13 @@ require gtk+3.inc >>> MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" >>> >>> SRC_URI = >>> >>> " >>> http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz >>> <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> >>> < >>> http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz >>> > >>> >>> \ >>> - file://hardcoded_libtool.patch \ >>> - file://Dont-force-csd.patch \ >>> - >>> file://Do-not-try-to-initialize-GL-without-libGL.patch \ >>> - >>> file://0001-Add-disable-opengl-configure-option.patch \ >>> + file://0001-Hardcoded-libtool.patch \ >>> + >>> file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ >>> + >>> file://0003-Add-disable-opengl-configure-option.patch \ >>> + >>> file://0004-configure.ac-Fix-wayland-protocols-path.patch \ >>> " >>> - >>> -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" >>> -SRC_URI[sha256sum] = >>> >>> "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" >>> +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" >>> +SRC_URI[sha256sum] = >>> >>> "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" >>> >>> S = "${WORKDIR}/gtk+-${PV}" >>> >>> diff --git a/meta/recipes-gnome/gtk+/ >>> gtk-icon-utils-native_3.18.8.bb >>> <http://gtk-icon-utils-native_3.18.8.bb> >>> b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb >>> <http://gtk-icon-utils-native_3.20.6.bb> >>> similarity index 93% >>> rename from meta/recipes-gnome/gtk+/ >>> gtk-icon-utils-native_3.18.8.bb >>> <http://gtk-icon-utils-native_3.18.8.bb> >>> rename to meta/recipes-gnome/gtk+/ >>> gtk-icon-utils-native_3.20.6.bb >>> <http://gtk-icon-utils-native_3.20.6.bb> >>> index 793f14a..e870ba3 100644 >>> --- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb >>> <http://gtk-icon-utils-native_3.18.8.bb> >>> +++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb >>> <http://gtk-icon-utils-native_3.20.6.bb> >>> @@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", >>> 2)}" >>> >>> SRC_URI = >>> >>> " >>> http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz >>> <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> >>> < >>> http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz >>> > >>> >>> \ >>> >>> file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch" >>> -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" >>> -SRC_URI[sha256sum] = >>> >>> "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" >>> +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" >>> +SRC_URI[sha256sum] = >>> >>> "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" >>> >>> LIC_FILES_CHKSUM = >>> "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ >>> >>> file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 >>> \ >>> >>> >>> [-- Attachment #2: Type: text/html, Size: 31844 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 2016-07-06 7:08 ` Jussi Kukkonen @ 2016-07-06 7:12 ` Robert Yang 0 siblings, 0 replies; 19+ messages in thread From: Robert Yang @ 2016-07-06 7:12 UTC (permalink / raw) To: Jussi Kukkonen; +Cc: Patches and discussions about the oe-core layer On 07/06/2016 03:08 PM, Jussi Kukkonen wrote: > On 6 July 2016 at 06:21, Robert Yang <liezhi.yang@windriver.com > <mailto:liezhi.yang@windriver.com>> wrote: > > On 07/06/2016 11:09 AM, Robert Yang wrote: > > On 07/05/2016 10:08 PM, Jussi Kukkonen wrote: > > On 5 July 2016 at 16:09, Robert Yang <liezhi.yang@windriver.com > <mailto:liezhi.yang@windriver.com> > <mailto:liezhi.yang@windriver.com > <mailto:liezhi.yang@windriver.com>>> wrote: > > > Hi, > > I can't build it on Ubuntu 14.04: > > > I can't see from the log why the file would be be missing and can't > reproduce > that locally... Cleaning sstate should be a valid workaround but I'd > be really > interested in reproducing this: if you can reproduce (or remember if > you did any > distro feature or packageconfig changes) please let me know the > details. > > In the meantime I'll take another look at the build system... > > > Please see below ... > > > +diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h > +similarity index 100% > +rename from gdk/x11/gdkx.h > +rename to gdk/x11/gdkx-with-gl-context.h > > > Older patch tool such as patch 2.7.1 can't apply this patch, I will > update it. > > > Sorry, 2.6.1:-). > > > > Thanks for the follow up. Ubuntu 14.04 should not have gnu patch 2.6.1 though, > or am I mistaken? You are right, I mixed myself, I have a Ubuntu 1404 and 1204, and I use screen to connect them, it should be 1204, it will be upgraded to 1404 or 1604 later. // Robert > > Jussi > > // Robert > > > > // Robert > > diff --git a/gdk/x11/gdkx-without-gl-context.h > b/gdk/x11/gdkx-without-gl-context.h > new file mode 100644 > index 0000000..c9e2617 > @@ -686,76 +617,11 @@ index 0000000..c9e2617 > +#undef __GDKX_H_INSIDE__ > + > +#endif /* __GDK_X_H__ */ > -diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h > -deleted file mode 100644 > -index ae05fa6..0000000 > ---- a/gdk/x11/gdkx.h > -+++ /dev/null > -@@ -1,59 +0,0 @@ > --/* GDK - The GIMP Drawing Kit > -- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball > and Josh > MacDonald > -- * > -- * This library is free software; you can redistribute it > and/or > -- * modify it under the terms of the GNU Lesser General Public > -- * License as published by the Free Software Foundation; > either > -- * version 2 of the License, or (at your option) any > later version. > -- * > -- * This library is distributed in the hope that it will > be useful, > -- * but WITHOUT ANY WARRANTY; without even the implied > warranty of > -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. > See the GNU > -- * Lesser General Public License for more details. > -- * > -- * You should have received a copy of the GNU Lesser > General Public > -- * License along with this library. If not, see > <http://www.gnu.org/licenses/>. > -- */ > -- > --/* > -- * Modified by the GTK+ Team and others 1997-2000. See > the AUTHORS > -- * file for a list of people on the GTK+ Team. See the > ChangeLog > -- * files for a list of changes. These files are > distributed with > -- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. > -- */ > -- > --#ifndef __GDK_X_H__ > --#define __GDK_X_H__ > -- > --#include <gdk/gdk.h> > -- > --#include <X11/Xlib.h> > --#include <X11/Xutil.h> > -- > --#define __GDKX_H_INSIDE__ > -- > --#include <gdk/x11/gdkx11applaunchcontext.h> > --#include <gdk/x11/gdkx11cursor.h> > --#include <gdk/x11/gdkx11device.h> > --#include <gdk/x11/gdkx11device-core.h> > --#include <gdk/x11/gdkx11device-xi2.h> > --#include <gdk/x11/gdkx11devicemanager.h> > --#include <gdk/x11/gdkx11devicemanager-core.h> > --#include <gdk/x11/gdkx11devicemanager-xi2.h> > --#include <gdk/x11/gdkx11display.h> > --#include <gdk/x11/gdkx11displaymanager.h> > --#include <gdk/x11/gdkx11dnd.h> > --#include <gdk/x11/gdkx11glcontext.h> > --#include <gdk/x11/gdkx11keys.h> > --#include <gdk/x11/gdkx11property.h> > --#include <gdk/x11/gdkx11screen.h> > --#include <gdk/x11/gdkx11selection.h> > --#include <gdk/x11/gdkx11utils.h> > --#include <gdk/x11/gdkx11visual.h> > --#include <gdk/x11/gdkx11window.h> > -- > --#include <gdk/x11/gdkx-autocleanups.h> > -- > --#undef __GDKX_H_INSIDE__ > -- > --#endif /* __GDK_X_H__ */ > diff --git a/gtk/Makefile.am b/gtk/Makefile.am > -index 801c3a5..2d8839d 100644 > +index 6a53a2b..49a35e6 100644 > --- a/gtk/Makefile.am > +++ b/gtk/Makefile.am > -@@ -1246,14 +1246,13 @@ gtkprivatetypebuiltins.c: > $(gtk_private_type_h_sources) gtkprivatetypebuiltins. > +@@ -1351,14 +1351,13 @@ gtkprivatetypebuiltins.c: > $(gtk_private_type_h_sources) gtkprivatetypebuiltins. > && cp xgen-gptbc gtkprivatetypebuiltins.c \ > && rm -f xgen-gptbc > > @@ -772,7 +638,7 @@ index 801c3a5..2d8839d 100644 > gtktestutils.c: gtktypefuncs.c > > diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c > -index 4098409..45fa1d1 100644 > +index 245fc6b..4214ad1 100644 > --- a/gtk/gtkglarea.c > +++ b/gtk/gtkglarea.c > @@ -28,7 +28,9 @@ > @@ -868,7 +734,7 @@ index 4098409..45fa1d1 100644 > > static gboolean > diff --git a/gtk/inspector/general.c > b/gtk/inspector/general.c > -index 0611373..4499a29 100644 > +index 4eab3a7..c4e900e 100644 > --- a/gtk/inspector/general.c > +++ b/gtk/inspector/general.c > @@ -33,8 +33,10 @@ > @@ -882,7 +748,7 @@ index 0611373..4499a29 100644 > > #ifdef GDK_WINDOWING_WIN32 > #include "win32/gdkwin32.h" > -@@ -146,6 +148,7 @@ append_extension_row > (GtkInspectorGeneral *gen, > +@@ -147,6 +149,7 @@ append_extension_row > (GtkInspectorGeneral *gen, > gtk_size_group_add_widget (GTK_SIZE_GROUP > (gen->priv->labels), > label); > } > > @@ -890,7 +756,7 @@ index 0611373..4499a29 100644 > #ifdef GDK_WINDOWING_X11 > static void > append_glx_extension_row (GtkInspectorGeneral *gen, > -@@ -155,6 +158,7 @@ append_glx_extension_row > (GtkInspectorGeneral *gen, > +@@ -156,6 +159,7 @@ append_glx_extension_row > (GtkInspectorGeneral *gen, > append_extension_row (gen, ext, > epoxy_has_glx_extension (dpy, 0, > ext)); > } > #endif > @@ -898,27 +764,27 @@ index 0611373..4499a29 100644 > > #ifdef GDK_WINDOWING_WAYLAND > static void > -@@ -174,6 +178,7 @@ init_gl (GtkInspectorGeneral *gen) > - > - display = gdk_display_get_default (); > - > +@@ -171,6 +175,7 @@ append_egl_extension_row > (GtkInspectorGeneral *gen, > + static void > + init_gl (GtkInspectorGeneral *gen) > + { > +#ifdef HAVE_OPENGL > #ifdef GDK_WINDOWING_X11 > - if (GDK_IS_X11_DISPLAY (display)) > + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) > { > -@@ -199,6 +204,7 @@ init_gl (GtkInspectorGeneral *gen) > +@@ -197,6 +202,7 @@ init_gl (GtkInspectorGeneral *gen) > } > else > #endif > +#endif > #ifdef GDK_WINDOWING_WAYLAND > - if (GDK_IS_WAYLAND_DISPLAY (display)) > + if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) > { > diff --git a/tests/Makefile.am b/tests/Makefile.am > -index 50f2986..3b39169 100644 > +index 681807d..2941a36 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > -@@ -78,8 +78,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > +@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > testfullscreen \ > testgeometry \ > testgiconpixbuf \ > @@ -927,18 +793,19 @@ index 50f2986..3b39169 100644 > testgrid \ > testgtk \ > testheaderbar \ > -@@ -166,10 +164,16 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > +@@ -169,11 +167,17 @@ noinst_PROGRAMS = $(TEST_PROGS) \ > testactionbar \ > testwindowsize \ > testpopover \ > - gdkgears \ > listmodel \ > + testpopup \ > $(NULL) > > +if HAVE_OPENGL > +noinst_PROGRAMS += > -+ testglarea \ > -+ testglblending \ > ++ testglarea \ > ++ testglblending \ > + gdkgears > +endif > + > @@ -946,11 +813,11 @@ index 50f2986..3b39169 100644 > noinst_PROGRAMS += testerrors > endif > diff --git a/testsuite/gtk/objects-finalize.c > b/testsuite/gtk/objects-finalize.c > -index 3568505..682ea10 100644 > +index e0ebee0..703643c 100644 > --- a/testsuite/gtk/objects-finalize.c > +++ b/testsuite/gtk/objects-finalize.c > -@@ -114,8 +114,10 @@ main (int argc, char **argv) > - all_types[i] != GDK_TYPE_X11_DISPLAY && > +@@ -115,8 +115,10 @@ main (int argc, char **argv) > + all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && > all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && > all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && > +#ifdef HAVE_OPENGL > @@ -961,5 +828,5 @@ index 3568505..682ea10 100644 > all_types[i] != GDK_TYPE_PIXBUF_LOADER && > all_types[i] != > gdk_pixbuf_simple_anim_iter_get_type()) > -- > -2.8.1 > +2.1.4 > > diff --git > > a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch > > > b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch > > new file mode 100644 > index 0000000..634b3a4 > --- /dev/null > +++ > > b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch > > @@ -0,0 +1,36 @@ > +From 97b78e566634579bbae51be914aeaaa921137a8b Mon Sep 17 > 00:00:00 2001 > +From: Jussi Kukkonen <jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com> > <mailto:jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com>>> > +Date: Thu, 9 Jun 2016 11:21:36 +0300 > +Subject: [PATCH 4/4] configure.ac <http://configure.ac> > <http://configure.ac>: Fix > wayland-protocols path > + > +The wayland-protocols directory is used during build: Fix > the path > +to point to sysroot specified in recipe. > + > +Normally PKG_CONFIG_SYSROOT_DIR could be used in > configure.ac <http://configure.ac> > <http://configure.ac> but that > +breaks multilib gtk+ as it would point to multilib sysroot > when the > +(allarch) wayland-protocols is actually in the machine > sysroot. > + > +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com> > <mailto:jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com>>> > +Upstream-Status: Inappropriate [embedded specific] > + > +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com> > <mailto:jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com>>> > +--- > + configure.ac <http://configure.ac> <http://configure.ac> > | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/configure.ac <http://configure.ac> > <http://configure.ac> b/configure.ac <http://configure.ac> > <http://configure.ac> > +index a3e9beb..dde9dc5 100644 > +--- a/configure.ac <http://configure.ac> <http://configure.ac> > ++++ b/configure.ac <http://configure.ac> <http://configure.ac> > +@@ -461,7 +461,7 @@ fi > + if test "$enable_wayland_backend" = "yes"; then > + # For the cairo image backend > + cairo_backends="$cairo_backends cairo" > +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG > --variable=pkgdatadir wayland-protocols`) > ++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, > ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG > --variable=pkgdatadir > wayland-protocols`) > + GDK_BACKENDS="$GDK_BACKENDS wayland" > + GDK_WINDOWING="$GDK_WINDOWING > + #define GDK_WINDOWING_WAYLAND" > +-- > +2.1.4 > + > diff --git a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch > b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch > deleted file mode 100644 > index 32d8a84..0000000 > --- a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch > +++ /dev/null > @@ -1,118 +0,0 @@ > -window: Check if we can use CSD before enabling them > - > -Upstream-Status: Backport > -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com> > <mailto:jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com>>> > - > - > -From c5e5ee67490e7e7af56052d8f8beb75db002c2f1 Mon Sep 17 > 00:00:00 2001 > -From: Emmanuele Bassi <ebassi@gnome.org > <mailto:ebassi@gnome.org> <mailto:ebassi@gnome.org > <mailto:ebassi@gnome.org>>> > -Date: Wed, 3 Jun 2015 14:07:29 +0100 > -Subject: window: Check if we can use CSD before enabling them > - > -The change in 03213b9509fc1df16c66194ea168aed6c15110e9 > changed the rules > -as to when CSD can be enabled, but it also unconditionally > enables CSD > -with the implicit assumption that client-side shadows were > the real > -issue, and that we could work around that by drawing our > own borders. > -This also means that setting a titlebar for a GtkWindow > will enable CSD > -unconditionally. > - > -In reality, some window managers (like Matchbox) *only* > support > -server-side decorations, and will ignore all hints to the > contrary, to > -the point of drawing decorations at random locations on > top of the > -window. > - > -Since CSD are enabled unconditionally, the GTK_CSD > environment variable > -is also not a suitable escape hatch. > - > -In the grand tradition of asking ourselves if we should do > something > -just because we can, we should split the environment > checks from the > -checks on what the user requested; by doing that, we can > also check > -when enabling client-side decorations, and ideally bail > out if needed. > - > -https://bugzilla.gnome.org/show_bug.cgi?id=750343 > - > -diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c > -index 423c6bd..9fe882f 100644 > ---- a/gtk/gtkwindow.c > -+++ b/gtk/gtkwindow.c > -@@ -4056,6 +4056,32 @@ gtk_window_supports_client_shadow > (GtkWindow > *window) > - return TRUE; > - } > - > -+static gboolean > -+gtk_window_can_use_csd (GtkWindow *window) > -+{ > -+ const gchar *csd_env; > -+ > -+#ifdef GDK_WINDOWING_BROADWAY > -+ if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display > (GTK_WIDGET > (window)))) > -+ return TRUE; > -+#endif > -+ > -+#ifdef GDK_WINDOWING_WAYLAND > -+ if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display > (GTK_WIDGET > (window)))) > -+ return TRUE; > -+#endif > -+ > -+#ifdef GDK_WINDOWING_MIR > -+ if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET > (window)))) > -+ return TRUE; > -+#endif > -+ > -+ csd_env = g_getenv ("GTK_CSD"); > -+ > -+ /* If GTK_CSD is unset we default to CSD support */ > -+ return csd_env == NULL || (strcmp (csd_env, "1") == 0); > -+} > -+ > - static void > - gtk_window_enable_csd (GtkWindow *window) > - { > -@@ -4063,6 +4089,10 @@ gtk_window_enable_csd (GtkWindow > *window) > - GtkWidget *widget = GTK_WIDGET (window); > - GdkVisual *visual; > - > -+ /* If the environment does not support CSD, then > there's no point in > enabling them */ > -+ if (!gtk_window_can_use_csd (window)) > -+ return; > -+ > - /* We need a visual with alpha for client shadows */ > - if (priv->use_client_shadow) > - { > -@@ -5839,7 +5869,6 @@ static gboolean > - gtk_window_should_use_csd (GtkWindow *window) > - { > - GtkWindowPrivate *priv = window->priv; > -- const gchar *csd_env; > - > - if (priv->csd_requested) > - return TRUE; > -@@ -5850,24 +5879,7 @@ gtk_window_should_use_csd > (GtkWindow *window) > - if (priv->type == GTK_WINDOW_POPUP) > - return FALSE; > - > --#ifdef GDK_WINDOWING_BROADWAY > -- if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display > (GTK_WIDGET > (window)))) > -- return TRUE; > --#endif > -- > --#ifdef GDK_WINDOWING_WAYLAND > -- if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display > (GTK_WIDGET > (window)))) > -- return TRUE; > --#endif > -- > --#ifdef GDK_WINDOWING_MIR > -- if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET > (window)))) > -- return TRUE; > --#endif > -- > -- csd_env = g_getenv ("GTK_CSD"); > -- > -- return (g_strcmp0 (csd_env, "1") == 0); > -+ return gtk_window_can_use_csd (window); > - } > - > - static void > --- > -cgit v0.10.2 > - > diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb > <http://3_3.18.8.bb> > <http://3_3.18.8.bb> > b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb <http://3_3.20.6.bb> > <http://3_3.20.6.bb> > similarity index 57% > rename from meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb > <http://3_3.18.8.bb> <http://3_3.18.8.bb> > rename to meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb > <http://3_3.20.6.bb> <http://3_3.20.6.bb> > index d776b6d..453a4e2 100644 > --- a/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb > <http://3_3.18.8.bb> <http://3_3.18.8.bb> > +++ b/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb > <http://3_3.20.6.bb> <http://3_3.20.6.bb> > @@ -3,14 +3,13 @@ require gtk+3.inc > MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" > > SRC_URI = > > "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz > <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> > <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> > > \ > - file://hardcoded_libtool.patch \ > - file://Dont-force-csd.patch \ > - > file://Do-not-try-to-initialize-GL-without-libGL.patch \ > - > file://0001-Add-disable-opengl-configure-option.patch \ > + file://0001-Hardcoded-libtool.patch \ > + > file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ > + > file://0003-Add-disable-opengl-configure-option.patch \ > + > file://0004-configure.ac-Fix-wayland-protocols-path.patch \ > " > - > -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" > -SRC_URI[sha256sum] = > > "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" > +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" > +SRC_URI[sha256sum] = > > "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" > > S = "${WORKDIR}/gtk+-${PV}" > > diff --git > a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb > <http://gtk-icon-utils-native_3.18.8.bb> > <http://gtk-icon-utils-native_3.18.8.bb> > b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb > <http://gtk-icon-utils-native_3.20.6.bb> > <http://gtk-icon-utils-native_3.20.6.bb> > similarity index 93% > rename from > meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb > <http://gtk-icon-utils-native_3.18.8.bb> > <http://gtk-icon-utils-native_3.18.8.bb> > rename to > meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb > <http://gtk-icon-utils-native_3.20.6.bb> > <http://gtk-icon-utils-native_3.20.6.bb> > index 793f14a..e870ba3 100644 > --- > a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.8.bb > <http://gtk-icon-utils-native_3.18.8.bb> > <http://gtk-icon-utils-native_3.18.8.bb> > +++ > b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb > <http://gtk-icon-utils-native_3.20.6.bb> > <http://gtk-icon-utils-native_3.20.6.bb> > @@ -10,8 +10,8 @@ MAJ_VER = > "${@oe.utils.trim_version("${PV}", 2)}" > > SRC_URI = > > "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz > <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> > <http://ftp.gnome.org/pub/gnome/sources/gtk+/$%7BMAJ_VER%7D/gtk+-$%7BPV%7D.tar.xz> > > \ > > > file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch" > -SRC_URI[md5sum] = "9671acb41dc13561d19233f1a75cf184" > -SRC_URI[sha256sum] = > > "1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8" > +SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954" > +SRC_URI[sha256sum] = > > "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2" > > LIC_FILES_CHKSUM = > "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ > > > file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ > > > ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 02/10] atk: Upgrade 2.18.0 -> 2.20.0 2016-06-22 11:51 [PATCH 00/10] Upgrades and misc. fixes Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 Jussi Kukkonen @ 2016-06-22 11:52 ` Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 03/10] at-spi2-core: Upgrade 2.18.3 -> 2.20.2 Jussi Kukkonen ` (7 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Jussi Kukkonen @ 2016-06-22 11:52 UTC (permalink / raw) To: openembedded-core Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- meta/recipes-support/atk/{atk_2.18.0.bb => atk_2.20.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/atk/{atk_2.18.0.bb => atk_2.20.0.bb} (69%) diff --git a/meta/recipes-support/atk/atk_2.18.0.bb b/meta/recipes-support/atk/atk_2.20.0.bb similarity index 69% rename from meta/recipes-support/atk/atk_2.18.0.bb rename to meta/recipes-support/atk/atk_2.20.0.bb index 3c0e82d..0422354 100644 --- a/meta/recipes-support/atk/atk_2.18.0.bb +++ b/meta/recipes-support/atk/atk_2.20.0.bb @@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ DEPENDS = "glib-2.0" -inherit gnomebase gtk-doc upstream-version-is-even gobject-introspection +inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "fd3678f35004b4c92e3da39356996054" -SRC_URI[archive.sha256sum] = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b" +SRC_URI[archive.md5sum] = "5187b0972f4d3905f285540b31395e20" +SRC_URI[archive.sha256sum] = "493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0" BBCLASSEXTEND = "native" -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 03/10] at-spi2-core: Upgrade 2.18.3 -> 2.20.2 2016-06-22 11:51 [PATCH 00/10] Upgrades and misc. fixes Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 02/10] atk: Upgrade 2.18.0 -> 2.20.0 Jussi Kukkonen @ 2016-06-22 11:52 ` Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 04/10] at-spi2-atk: Upgrade 2.18.1 -> 2.20.1 Jussi Kukkonen ` (6 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Jussi Kukkonen @ 2016-06-22 11:52 UTC (permalink / raw) To: openembedded-core Add systemd unit, patch in a configure flag to set the correct dir. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- .../0001-build-Add-with-systemduserunitdir.patch | 49 ++++++++++++++++++++++ ...-spi2-core_2.18.3.bb => at-spi2-core_2.20.2.bb} | 18 +++++--- 2 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch rename meta/recipes-support/atk/{at-spi2-core_2.18.3.bb => at-spi2-core_2.20.2.bb} (49%) diff --git a/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch b/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch new file mode 100644 index 0000000..4103eaa --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch @@ -0,0 +1,49 @@ +From 2f47c975ebe52b6916a45ade023ae3bac21bb0e0 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 21 Jun 2016 16:00:02 +0300 +Subject: [PATCH] build: Add --with-systemduserunitdir + +Default to "pkg-config --variable=systemduserunitdir systemd" but +allow overriding the value. + +Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + bus/Makefile.am | 2 +- + configure.ac | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/bus/Makefile.am b/bus/Makefile.am +index b189e02..52fbb0b 100644 +--- a/bus/Makefile.am ++++ b/bus/Makefile.am +@@ -26,7 +26,7 @@ dbusservice_DATA = org.a11y.Bus.service + org.a11y.Bus.service: org.a11y.Bus.service.in + sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ + +-systemd_userdir = $(prefix)/lib/systemd/user ++systemd_userdir = $(systemduserunitdir) + systemd_user_DATA = at-spi-dbus-bus.service + at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile + sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ +diff --git a/configure.ac b/configure.ac +index f9061c2..2b8eeed 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -183,6 +183,13 @@ else + fi + AC_SUBST(DBUS_SERVICES_DIR) + ++AC_ARG_WITH([systemduserunitdir], ++ AS_HELP_STRING([--with-systemduserunitdir=DIR], ++ [Directory for systemd service files]), ++ [], ++ [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)]) ++AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) ++ + AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) + + GOBJECT_INTROSPECTION_CHECK([0.9.6]) +-- +2.1.4 + diff --git a/meta/recipes-support/atk/at-spi2-core_2.18.3.bb b/meta/recipes-support/atk/at-spi2-core_2.20.2.bb similarity index 49% rename from meta/recipes-support/atk/at-spi2-core_2.18.3.bb rename to meta/recipes-support/atk/at-spi2-core_2.20.2.bb index eced597..199243a 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.18.3.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.20.2.bb @@ -6,18 +6,24 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ + file://0001-build-Add-with-systemduserunitdir.patch \ " -SRC_URI[md5sum] = "fc18801e56f6ce6914126f837d42f556" -SRC_URI[sha256sum] = "ada26add94155f97d0f601a20cb7a0e3fd3ba1588c3520b7288316494027d629" +SRC_URI[md5sum] = "f6f6303da2e72317f881703f40bf0c62" +SRC_URI[sha256sum] = "88a4de9d43139f13cca531b47b901bc1b56e0ab06ba899126644abd4ac16a143" -DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native" +DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native" -inherit autotools gtk-doc pkgconfig distro_features_check upstream-version-is-even gobject-introspection +inherit autotools gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -EXTRA_OECONF = "--disable-xevie --with-dbus-daemondir=${bindir}" +EXTRA_OECONF = "--disable-xevie \ + --with-systemduserunitdir=${systemd_user_unitdir} \ + --with-dbus-daemondir=${bindir}" FILES_${PN} += "${datadir}/dbus-1/services/*.service \ - ${datadir}/dbus-1/accessibility-services/*.service" + ${datadir}/dbus-1/accessibility-services/*.service \ + ${datadir}/defaults/at-spi2 \ + ${systemd_user_unitdir}/at-spi-dbus-bus.service \ + " -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 04/10] at-spi2-atk: Upgrade 2.18.1 -> 2.20.1 2016-06-22 11:51 [PATCH 00/10] Upgrades and misc. fixes Jussi Kukkonen ` (2 preceding siblings ...) 2016-06-22 11:52 ` [PATCH 03/10] at-spi2-core: Upgrade 2.18.3 -> 2.20.2 Jussi Kukkonen @ 2016-06-22 11:52 ` Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 05/10] clutter-gtk-1.0: Upgrade 1.6.6 -> 1.8.0 Jussi Kukkonen ` (5 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Jussi Kukkonen @ 2016-06-22 11:52 UTC (permalink / raw) To: openembedded-core Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- .../atk/{at-spi2-atk_2.18.1.bb => at-spi2-atk_2.20.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/atk/{at-spi2-atk_2.18.1.bb => at-spi2-atk_2.20.1.bb} (81%) diff --git a/meta/recipes-support/atk/at-spi2-atk_2.18.1.bb b/meta/recipes-support/atk/at-spi2-atk_2.20.1.bb similarity index 81% rename from meta/recipes-support/atk/at-spi2-atk_2.18.1.bb rename to meta/recipes-support/atk/at-spi2-atk_2.20.1.bb index b8a93f3..d4120b6 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.18.1.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.20.1.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "d7040a55df975865ab0d74a4b325afb5" -SRC_URI[sha256sum] = "c4b15f9386d34d464ddad5f6cc85669742c016df87141ceee93513245979c12d" +SRC_URI[md5sum] = "23309b6f8e1623871ace6347fb734dce" +SRC_URI[sha256sum] = "2358a794e918e8f47ce0c7370eee8fc8a6207ff1afe976ec9ff547a03277bf8e" DEPENDS = "dbus glib-2.0 atk at-spi2-core" -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 05/10] clutter-gtk-1.0: Upgrade 1.6.6 -> 1.8.0 2016-06-22 11:51 [PATCH 00/10] Upgrades and misc. fixes Jussi Kukkonen ` (3 preceding siblings ...) 2016-06-22 11:52 ` [PATCH 04/10] at-spi2-atk: Upgrade 2.18.1 -> 2.20.1 Jussi Kukkonen @ 2016-06-22 11:52 ` Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 06/10] puzzles: Keep building even with deprecation warnings Jussi Kukkonen ` (4 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Jussi Kukkonen @ 2016-06-22 11:52 UTC (permalink / raw) To: openembedded-core Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb | 6 ------ meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.0.bb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.0.bb diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb deleted file mode 100644 index 23257bb..0000000 --- a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb +++ /dev/null @@ -1,6 +0,0 @@ -require clutter-gtk-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI[archive.md5sum] = "79dc3d7a8645f87d83a9ccca8a08aa8e" -SRC_URI[archive.sha256sum] = "9440a68600f58d00fe0af35383738943e8ead9907f4cf507a102d96822434a28" diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.0.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.0.bb new file mode 100644 index 0000000..675365c --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.0.bb @@ -0,0 +1,6 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI[archive.md5sum] = "351cf9229cf941d36b441ede2236d742" +SRC_URI[archive.sha256sum] = "742ef9d68ece36cbb1b2e1a4a6fbdad932f6645360be7e6de75abbb140dfbf1d" -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 06/10] puzzles: Keep building even with deprecation warnings 2016-06-22 11:51 [PATCH 00/10] Upgrades and misc. fixes Jussi Kukkonen ` (4 preceding siblings ...) 2016-06-22 11:52 ` [PATCH 05/10] clutter-gtk-1.0: Upgrade 1.6.6 -> 1.8.0 Jussi Kukkonen @ 2016-06-22 11:52 ` Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 07/10] cairo: inherit upstream-version-is-even Jussi Kukkonen ` (3 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Jussi Kukkonen @ 2016-06-22 11:52 UTC (permalink / raw) To: openembedded-core Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- meta/recipes-sato/puzzles/puzzles_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index a9daacd..882ee44 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -23,6 +23,8 @@ S = "${WORKDIR}/git" inherit autotools-brokensep distro_features_check pkgconfig +CFLAGS_append = " -Wno-deprecated-declarations" + PACKAGECONFIG ??= "gtk3" PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+," PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3," -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 07/10] cairo: inherit upstream-version-is-even 2016-06-22 11:51 [PATCH 00/10] Upgrades and misc. fixes Jussi Kukkonen ` (5 preceding siblings ...) 2016-06-22 11:52 ` [PATCH 06/10] puzzles: Keep building even with deprecation warnings Jussi Kukkonen @ 2016-06-22 11:52 ` Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 08/10] gsettings-desktop-schemas: " Jussi Kukkonen ` (2 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Jussi Kukkonen @ 2016-06-22 11:52 UTC (permalink / raw) To: openembedded-core Even versions are releases, odd are "snapshots". Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- meta/recipes-graphics/cairo/cairo.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index c7e686d..e5fe308 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -36,7 +36,7 @@ EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} \ --enable-tee \ " -inherit autotools pkgconfig +inherit autotools pkgconfig upstream-version-is-even # We don't depend on binutils so we need to disable this export ac_cv_lib_bfd_bfd_openr="no" -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 08/10] gsettings-desktop-schemas: inherit upstream-version-is-even 2016-06-22 11:51 [PATCH 00/10] Upgrades and misc. fixes Jussi Kukkonen ` (6 preceding siblings ...) 2016-06-22 11:52 ` [PATCH 07/10] cairo: inherit upstream-version-is-even Jussi Kukkonen @ 2016-06-22 11:52 ` Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 09/10] vte: don't build test app Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 10/10] connman-gnome: StatusIcon adapts to size changes Jussi Kukkonen 9 siblings, 0 replies; 19+ messages in thread From: Jussi Kukkonen @ 2016-06-22 11:52 UTC (permalink / raw) To: openembedded-core Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- .../gsettings-desktop-schemas/gsettings-desktop-schemas_3.20.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.20.0.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.20.0.bb index 49a701f..bb924ce 100644 --- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.20.0.bb +++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.20.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "glib-2.0 intltool-native" -inherit gnomebase gsettings gettext gobject-introspection +inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-even SRC_URI[archive.md5sum] = "c5d87ea480aa9bf66b134ddb5b8ea0f8" SRC_URI[archive.sha256sum] = "55a41b533c0ab955e0a36a84d73829451c88b027d8d719955d8f695c35c6d9c1" -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 09/10] vte: don't build test app 2016-06-22 11:51 [PATCH 00/10] Upgrades and misc. fixes Jussi Kukkonen ` (7 preceding siblings ...) 2016-06-22 11:52 ` [PATCH 08/10] gsettings-desktop-schemas: " Jussi Kukkonen @ 2016-06-22 11:52 ` Jussi Kukkonen 2016-06-22 14:35 ` Burton, Ross 2016-06-22 11:52 ` [PATCH 10/10] connman-gnome: StatusIcon adapts to size changes Jussi Kukkonen 9 siblings, 1 reply; 19+ messages in thread From: Jussi Kukkonen @ 2016-06-22 11:52 UTC (permalink / raw) To: openembedded-core Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- meta/recipes-support/vte/vte_0.44.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/vte/vte_0.44.1.bb b/meta/recipes-support/vte/vte_0.44.1.bb index ecbf58a..f3baa1e 100644 --- a/meta/recipes-support/vte/vte_0.44.1.bb +++ b/meta/recipes-support/vte/vte_0.44.1.bb @@ -18,7 +18,7 @@ PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" CFLAGS += "-D_GNU_SOURCE" # Enable vala only if gobject-introspection is enabled -EXTRA_OECONF = "--enable-vala=auto" +EXTRA_OECONF = "--enable-vala=auto --disable-test-application" # libtool adds "-nostdlib" when g++ is used. This breaks PIE builds. # Use libtool-cross (which has a hack to prevent that) instead. -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 09/10] vte: don't build test app 2016-06-22 11:52 ` [PATCH 09/10] vte: don't build test app Jussi Kukkonen @ 2016-06-22 14:35 ` Burton, Ross 2016-06-23 10:13 ` Jussi Kukkonen 0 siblings, 1 reply; 19+ messages in thread From: Burton, Ross @ 2016-06-22 14:35 UTC (permalink / raw) To: Jussi Kukkonen; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 1650 bytes --] The patch should explain why we're disabling the test application. If we don't build the test app then the "vte" package is pretty pointless: libvte: /usr/lib/libvte-2.91.so.0 /usr/lib/libvte-2.91.so.0.4400.1 vte: /etc/profile.d/vte.sh /usr/lib/girepository-1.0/Vte-2.91.typelib The typelib should be with the library, and that sh fragment is fairly pointless. Should libvte and vte be merged (ie package the library into $PN and let the renamer do its job)? Ross On 22 June 2016 at 12:52, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote: > Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > --- > meta/recipes-support/vte/vte_0.44.1.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-support/vte/vte_0.44.1.bb > b/meta/recipes-support/vte/vte_0.44.1.bb > index ecbf58a..f3baa1e 100644 > --- a/meta/recipes-support/vte/vte_0.44.1.bb > +++ b/meta/recipes-support/vte/vte_0.44.1.bb > @@ -18,7 +18,7 @@ PACKAGECONFIG[gnutls] = > "--with-gnutls,--without-gnutls,gnutls" > CFLAGS += "-D_GNU_SOURCE" > > # Enable vala only if gobject-introspection is enabled > -EXTRA_OECONF = "--enable-vala=auto" > +EXTRA_OECONF = "--enable-vala=auto --disable-test-application" > > # libtool adds "-nostdlib" when g++ is used. This breaks PIE builds. > # Use libtool-cross (which has a hack to prevent that) instead. > -- > 2.1.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 2848 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 09/10] vte: don't build test app 2016-06-22 14:35 ` Burton, Ross @ 2016-06-23 10:13 ` Jussi Kukkonen 0 siblings, 0 replies; 19+ messages in thread From: Jussi Kukkonen @ 2016-06-23 10:13 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 2626 bytes --] On 22 June 2016 at 17:35, Burton, Ross <ross.burton@intel.com> wrote: > The patch should explain why we're disabling the test application. > > If we don't build the test app then the "vte" package is pretty pointless: > > libvte: > /usr/lib/libvte-2.91.so.0 > /usr/lib/libvte-2.91.so.0.4400.1 > vte: > /etc/profile.d/vte.sh > /usr/lib/girepository-1.0/Vte-2.91.typelib > > The typelib should be with the library, and that sh fragment is fairly > pointless. Should libvte and vte be merged (ie package the library into > $PN and let the renamer do its job)? > Yes, that seems like the right move -- I actually thought vte package was empty already but on double checking found the same files you did... I'll resend this patch with changes you suggested . The reason for disabling was that we aren't using the test application for anything: matchbox-terminal serves the same purpose. Jussi Ross > > On 22 June 2016 at 12:52, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote: > >> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> >> --- >> meta/recipes-support/vte/vte_0.44.1.bb | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/recipes-support/vte/vte_0.44.1.bb >> b/meta/recipes-support/vte/vte_0.44.1.bb >> index ecbf58a..f3baa1e 100644 >> --- a/meta/recipes-support/vte/vte_0.44.1.bb >> +++ b/meta/recipes-support/vte/vte_0.44.1.bb >> @@ -18,7 +18,7 @@ PACKAGECONFIG[gnutls] = >> "--with-gnutls,--without-gnutls,gnutls" >> CFLAGS += "-D_GNU_SOURCE" >> >> # Enable vala only if gobject-introspection is enabled >> -EXTRA_OECONF = "--enable-vala=auto" >> +EXTRA_OECONF = "--enable-vala=auto --disable-test-application" >> >> # libtool adds "-nostdlib" when g++ is used. This breaks PIE builds. >> # Use libtool-cross (which has a hack to prevent that) instead. >> -- >> 2.1.4 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > > --------------------------------------------------------------------- > Intel Corporation (UK) Limited > Registered No. 1134945 (England) > Registered Office: Pipers Way, Swindon SN3 1RJ > VAT No: 860 2173 47 > > This e-mail and any attachments may contain confidential material for > the sole use of the intended recipient(s). Any review or distribution > by others is strictly prohibited. If you are not the intended > recipient, please contact the sender and delete all copies. > [-- Attachment #2: Type: text/html, Size: 4371 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 10/10] connman-gnome: StatusIcon adapts to size changes 2016-06-22 11:51 [PATCH 00/10] Upgrades and misc. fixes Jussi Kukkonen ` (8 preceding siblings ...) 2016-06-22 11:52 ` [PATCH 09/10] vte: don't build test app Jussi Kukkonen @ 2016-06-22 11:52 ` Jussi Kukkonen 9 siblings, 0 replies; 19+ messages in thread From: Jussi Kukkonen @ 2016-06-22 11:52 UTC (permalink / raw) To: openembedded-core Update the Gtk3 patch to make the StatusIcon load pixbufs at (more) correct sizes -- Gtk3 does not seem to reliably position the icon otherwise. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- .../connman/connman-gnome/0001-Port-to-Gtk3.patch | 136 ++++++++++++++++++--- 1 file changed, 121 insertions(+), 15 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch b/meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch index c93e9b4..279ca05 100644 --- a/meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch +++ b/meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch @@ -1,10 +1,11 @@ -From a59b0fac02e74a971ac3f08bf28c17ce361a9526 Mon Sep 17 00:00:00 2001 +From 092fe0793b39c6feb6464bfbd568b050960d62c0 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Wed, 2 Mar 2016 15:47:49 +0200 Subject: [PATCH] Port to Gtk3 Some unused (or not useful) code was removed, functionality should stay -the same. +the same, although applet now loads icons based on actual size available +to it. Code still contains quite a few uses of deprecated API. @@ -12,13 +13,13 @@ Upstream-Status: Submitted Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- applet/agent.c | 3 +-- - applet/main.c | 43 ------------------------------------------- - applet/status.c | 8 -------- + applet/main.c | 43 ------------------------------ + applet/status.c | 74 +++++++++++++++++++++++++++++++++------------------ configure.ac | 3 +-- - properties/ethernet.c | 14 +++++++------- + properties/ethernet.c | 14 +++++----- properties/main.c | 2 +- - properties/wifi.c | 12 ++++++------ - 7 files changed, 16 insertions(+), 69 deletions(-) + properties/wifi.c | 12 ++++----- + 7 files changed, 64 insertions(+), 87 deletions(-) diff --git a/applet/agent.c b/applet/agent.c index 65bed08..04fe86a 100644 @@ -42,7 +43,7 @@ index 65bed08..04fe86a 100644 label = gtk_label_new(_("Please provide some network information:")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0); diff --git a/applet/main.c b/applet/main.c -index f12d371..cd16285 100644 +index c7b3c7f..f2ce46b 100644 --- a/applet/main.c +++ b/applet/main.c @@ -157,46 +157,6 @@ static void name_owner_changed(DBusGProxy *proxy, const char *name, @@ -103,10 +104,26 @@ index f12d371..cd16285 100644 "copyright", "Copyright \xc2\xa9 2008 Intel Corporation", "comments", _("A connection manager for the GNOME desktop"), diff --git a/applet/status.c b/applet/status.c -index aed6f1e..015ff29 100644 +index aed6f1e..6ecbf3a 100644 --- a/applet/status.c +++ b/applet/status.c -@@ -102,8 +102,6 @@ static void icon_animation_start(IconAnimation *animation, +@@ -30,13 +30,14 @@ + static gboolean available = FALSE; + + static GtkStatusIcon *statusicon = NULL; ++static gint icon_size = 0; + + static GdkPixbuf *pixbuf_load(GtkIconTheme *icontheme, const gchar *name) + { + GdkPixbuf *pixbuf; + GError *error = NULL; + +- pixbuf = gtk_icon_theme_load_icon(icontheme, name, 22, 0, &error); ++ pixbuf = gtk_icon_theme_load_icon(icontheme, name, icon_size, 0, &error); + + if (pixbuf == NULL) { + g_warning("Missing icon %s: %s", name, error->message); +@@ -102,8 +103,6 @@ static void icon_animation_start(IconAnimation *animation, { available = TRUE; @@ -115,7 +132,7 @@ index aed6f1e..015ff29 100644 animation->start = start; animation->end = (end == 0) ? animation->count - 1 : end; -@@ -120,8 +118,6 @@ static void icon_animation_stop(IconAnimation *animation) +@@ -120,8 +119,6 @@ static void icon_animation_stop(IconAnimation *animation) { available = TRUE; @@ -124,7 +141,96 @@ index aed6f1e..015ff29 100644 if (animation->id > 0) g_source_remove(animation->id); -@@ -251,8 +247,6 @@ void status_unavailable(void) +@@ -190,6 +187,42 @@ static GdkPixbuf *pixbuf_none; + static GdkPixbuf *pixbuf_wired; + static GdkPixbuf *pixbuf_signal[5]; + ++static void ++load_icons (gint size) ++{ ++ // educated guess to preload correct size ++ if (size == 0) ++ size = 34; ++ ++ if (icon_size == size) ++ return; ++ ++ icon_size = size; ++ ++ if(pixbuf_none) ++ status_cleanup(); ++ ++ g_debug ("Loading icons at size %d", icon_size); ++ animation = icon_animation_load(icontheme, "connman-connecting", 33); ++ pixbuf_signal[0] = pixbuf_load(icontheme, "connman-signal-01"); ++ pixbuf_signal[1] = pixbuf_load(icontheme, "connman-signal-02"); ++ pixbuf_signal[2] = pixbuf_load(icontheme, "connman-signal-03"); ++ pixbuf_signal[3] = pixbuf_load(icontheme, "connman-signal-04"); ++ pixbuf_signal[4] = pixbuf_load(icontheme, "connman-signal-05"); ++ ++ pixbuf_none = pixbuf_load(icontheme, "connman-type-none"); ++ pixbuf_wired = pixbuf_load(icontheme, "connman-type-wired"); ++ pixbuf_notifier = pixbuf_load(icontheme, "connman-notifier-unavailable"); ++} ++ ++static gboolean ++size_changed_cb (GtkStatusIcon *statusicon, ++ gint size, ++ gpointer user_data) ++{ ++ load_icons (size); ++} ++ + int status_init(StatusCallback activate, GtkWidget *popup) + { + GdkScreen *screen; +@@ -204,17 +237,9 @@ int status_init(StatusCallback activate, GtkWidget *popup) + + gtk_icon_theme_append_search_path(icontheme, ICONDIR); + +- animation = icon_animation_load(icontheme, "connman-connecting", 33); +- +- pixbuf_signal[0] = pixbuf_load(icontheme, "connman-signal-01"); +- pixbuf_signal[1] = pixbuf_load(icontheme, "connman-signal-02"); +- pixbuf_signal[2] = pixbuf_load(icontheme, "connman-signal-03"); +- pixbuf_signal[3] = pixbuf_load(icontheme, "connman-signal-04"); +- pixbuf_signal[4] = pixbuf_load(icontheme, "connman-signal-05"); +- +- pixbuf_none = pixbuf_load(icontheme, "connman-type-none"); +- pixbuf_wired = pixbuf_load(icontheme, "connman-type-wired"); +- pixbuf_notifier = pixbuf_load(icontheme, "connman-notifier-unavailable"); ++ g_signal_connect (statusicon, "size-changed", ++ G_CALLBACK(size_changed_cb), NULL); ++ load_icons (gtk_status_icon_get_size (statusicon)); + + if (activate != NULL) + g_signal_connect(statusicon, "activate", +@@ -231,17 +256,18 @@ void status_cleanup(void) + int i; + + icon_animation_free(animation); ++ animation = NULL; + + for (i = 0; i < 5; i++) +- g_object_unref(pixbuf_signal[i]); ++ g_clear_object(&pixbuf_signal[i]); + +- g_object_unref(pixbuf_none); +- g_object_unref(pixbuf_wired); +- g_object_unref(pixbuf_notifier); ++ g_clear_object(&pixbuf_none); ++ g_clear_object(&pixbuf_wired); ++ g_clear_object(&pixbuf_notifier); + +- g_object_unref(icontheme); ++ g_clear_object(&icontheme); + +- g_object_unref(statusicon); ++ g_clear_object(&statusicon); + } + + void status_unavailable(void) +@@ -251,8 +277,6 @@ void status_unavailable(void) available = FALSE; gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_notifier); @@ -133,7 +239,7 @@ index aed6f1e..015ff29 100644 gtk_status_icon_set_visible(statusicon, TRUE); } -@@ -299,7 +293,6 @@ static void set_ready(gint signal) +@@ -299,7 +323,6 @@ static void set_ready(gint signal) if (signal < 0) { gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_wired); @@ -141,7 +247,7 @@ index aed6f1e..015ff29 100644 return; } -@@ -311,7 +304,6 @@ static void set_ready(gint signal) +@@ -311,7 +334,6 @@ static void set_ready(gint signal) index = 4; gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_signal[index]); @@ -273,5 +379,5 @@ index bd325ef..a5827e0 100644 } break; -- -2.8.1 +2.1.4 -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2016-07-06 7:12 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-06-22 11:51 [PATCH 00/10] Upgrades and misc. fixes Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 01/10] gtk+3: Upgrade 3.18.8 -> 3.20.6 Jussi Kukkonen 2016-07-05 13:09 ` Robert Yang 2016-07-05 14:08 ` Jussi Kukkonen 2016-07-06 3:09 ` Robert Yang 2016-07-06 3:21 ` Robert Yang 2016-07-06 7:08 ` Jussi Kukkonen 2016-07-06 7:12 ` Robert Yang 2016-06-22 11:52 ` [PATCH 02/10] atk: Upgrade 2.18.0 -> 2.20.0 Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 03/10] at-spi2-core: Upgrade 2.18.3 -> 2.20.2 Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 04/10] at-spi2-atk: Upgrade 2.18.1 -> 2.20.1 Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 05/10] clutter-gtk-1.0: Upgrade 1.6.6 -> 1.8.0 Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 06/10] puzzles: Keep building even with deprecation warnings Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 07/10] cairo: inherit upstream-version-is-even Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 08/10] gsettings-desktop-schemas: " Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 09/10] vte: don't build test app Jussi Kukkonen 2016-06-22 14:35 ` Burton, Ross 2016-06-23 10:13 ` Jussi Kukkonen 2016-06-22 11:52 ` [PATCH 10/10] connman-gnome: StatusIcon adapts to size changes Jussi Kukkonen
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.