[3/3] gtk+3: update 3.24.5 -> 3.24.8

Submitted by Alexander Kanavin on June 7, 2019, 12:19 p.m. | Patch ID: 162034

Details

Message ID 20190607121954.116898-3-alex.kanavin@gmail.com
State Master Next
Commit e534b4209f8e90c157ab62bb94e5abc59080d8ee
Headers show

Commit Message

Alexander Kanavin June 7, 2019, 12:19 p.m.
Rebase 0003-Add-disable-opengl-configure-option.patch

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...-Add-disable-opengl-configure-option.patch | 41 ++++++++++---------
 .../gtk+/{gtk+3_3.24.5.bb => gtk+3_3.24.8.bb} |  4 +-
 2 files changed, 23 insertions(+), 22 deletions(-)
 rename meta/recipes-gnome/gtk+/{gtk+3_3.24.5.bb => gtk+3_3.24.8.bb} (84%)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
index e5a67d098e7..e09748893ff 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
+++ b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
@@ -1,4 +1,4 @@ 
-From 9e243474eea4330b593e0f6dd418b61b79699d8b Mon Sep 17 00:00:00 2001
+From 1b317122180a8108f253028379976701c4abd30e Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen <jussi.kukkonen@intel.com>
 Date: Tue, 21 Jun 2016 15:11:39 +0300
 Subject: [PATCH] Add --disable-opengl configure option
@@ -46,10 +46,10 @@  Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
  create mode 100644 gdk/x11/gdkx-without-gl-context.h
 
 diff --git a/configure.ac b/configure.ac
-index a91b29c..561d3b5 100644
+index 2c4733b..18ae66c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -351,6 +351,15 @@ AC_ARG_ENABLE(cloudproviders,
+@@ -352,6 +352,15 @@ AC_ARG_ENABLE(cloudproviders,
                [AS_HELP_STRING([--enable-cloudproviders],
                                [enable libcloudproviders integration])],
                                [cloudproviders_set=yes])
@@ -65,21 +65,21 @@  index a91b29c..561d3b5 100644
  AC_ARG_ENABLE(glx,
                [AS_HELP_STRING([--enable-glx],
                                [When enabled Gdk will try to initialize GLX])])
-@@ -1381,7 +1390,7 @@ CFLAGS="$saved_cflags"
+@@ -1370,7 +1379,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"
--GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES"
-+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends $EPOXY_PACKAGES $CLOUDPROVIDER_PACKAGES"
+-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES fribidi >= fribidi_required_version"
++GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends $EPOXY_PACKAGES $CLOUDPROVIDER_PACKAGES fribidi >= fribidi_required_version"
  
  PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
  GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
-@@ -1415,7 +1424,7 @@ fi
+@@ -1404,7 +1413,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"
--GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version"
-+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $EPOXY_PACKAGES"
+-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version"
++GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $EPOXY_PACKAGES fribidi >= fribidi_required_version"
  if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
    GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
  fi
@@ -209,10 +209,10 @@  index 932daf1..54239d6 100644
  
    return info;
 diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
-index 40225e9..c55e1de 100644
+index 06d4187..832711c 100644
 --- a/gdk/gdkdisplay.c
 +++ b/gdk/gdkdisplay.c
-@@ -2406,7 +2406,9 @@ gboolean
+@@ -2416,7 +2416,9 @@ gboolean
  gdk_display_make_gl_context_current (GdkDisplay   *display,
                                       GdkGLContext *context)
  {
@@ -346,7 +346,7 @@  index dfbed63..556f0a3 100644
  
  /**
 diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
-index 6b231f0..904b86d 100644
+index 1416409..e3b5630 100644
 --- a/gdk/gdkwindow.c
 +++ b/gdk/gdkwindow.c
 @@ -45,7 +45,9 @@
@@ -478,7 +478,7 @@  index 6289f3a..cbbac79 100644
 +
  -include $(top_srcdir)/git.mk
 diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
-index 659b9fa..b15536b 100644
+index 5b95196..9a2f2a2 100644
 --- a/gdk/x11/gdkdisplay-x11.c
 +++ b/gdk/x11/gdkdisplay-x11.c
 @@ -37,7 +37,9 @@
@@ -491,7 +491,7 @@  index 659b9fa..b15536b 100644
  #include "gdk-private.h"
  
  #include <glib.h>
-@@ -3194,7 +3196,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
+@@ -3184,7 +3186,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;
  
@@ -516,7 +516,7 @@  index 272cecd..2bb34ac 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 c6205e4..df2334f 100644
+index f92a146..89f900a 100644
 --- a/gdk/x11/gdkwindow-x11.c
 +++ b/gdk/x11/gdkwindow-x11.c
 @@ -36,7 +36,9 @@
@@ -529,7 +529,7 @@  index c6205e4..df2334f 100644
  #include "gdkprivate-x11.h"
  #include "gdk-private.h"
  
-@@ -5804,7 +5806,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
+@@ -5839,7 +5841,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;
@@ -633,17 +633,18 @@  index 0000000..c9e2617
 +
 +#endif /* __GDK_X_H__ */
 diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 5594429..2259bb3 100644
+index e556e9d..ce912d7 100644
 --- a/gtk/Makefile.am
 +++ b/gtk/Makefile.am
-@@ -1434,14 +1434,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.
+@@ -1441,7 +1441,6 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.
  	&& cp xgen-gptbc gtkprivatetypebuiltins.c  \
  	&& rm -f xgen-gptbc
  
 -
  gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile
- 	$(AM_V_GEN) (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtkx.h>') > xgen-gtfsrc.c && \
- 	  echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \
+ 	$(AM_V_GEN) export LC_ALL=C ; \
+ 	  (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtkx.h>') > xgen-gtfsrc.c && \
+@@ -1449,7 +1448,7 @@ gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_src
  	  ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
  	  $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
  	  sort | uniq | \
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb
similarity index 84%
rename from meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb
index 92c9a3ebfb5..d79b18bee03 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb
@@ -8,8 +8,8 @@  SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
            file://0003-Add-disable-opengl-configure-option.patch \
            file://link_fribidi.patch \
           "
-SRC_URI[md5sum] = "32862355c08f6af3e7848c695cd4081b"
-SRC_URI[sha256sum] = "0be5fb0d302bc3de26ab58c32990d895831e2b7c7418d0ffea1206d6a3ddb02f"
+SRC_URI[md5sum] = "eeedde01856238114dcf4df3ebc942a5"
+SRC_URI[sha256sum] = "666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799"
 
 S = "${WORKDIR}/gtk+-${PV}"
 

Comments

Richard Purdie June 8, 2019, 9:05 a.m.
On Fri, 2019-06-07 at 14:19 +0200, Alexander Kanavin wrote:
> Rebase 0003-Add-disable-opengl-configure-option.patch
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  ...-Add-disable-opengl-configure-option.patch | 41 ++++++++++-------
> --
>  .../gtk+/{gtk+3_3.24.5.bb => gtk+3_3.24.8.bb} |  4 +-
>  2 files changed, 23 insertions(+), 22 deletions(-)
>  rename meta/recipes-gnome/gtk+/{gtk+3_3.24.5.bb => gtk+3_3.24.8.bb}
> (84%)

I retested with the date/time on the workers fixed and this series
present. We saw:

https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/693

so I think there might be something not quite right with opengl
disabled (the main difference to nodistro I can think of?)

Cheers,

Richard
Richard Purdie June 10, 2019, 11:47 a.m.
On Sat, 2019-06-08 at 10:05 +0100, Richard Purdie wrote:
> On Fri, 2019-06-07 at 14:19 +0200, Alexander Kanavin wrote:
> > Rebase 0003-Add-disable-opengl-configure-option.patch
> > 
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> >  ...-Add-disable-opengl-configure-option.patch | 41 ++++++++++-----
> > --
> > --
> >  .../gtk+/{gtk+3_3.24.5.bb => gtk+3_3.24.8.bb} |  4 +-
> >  2 files changed, 23 insertions(+), 22 deletions(-)
> >  rename meta/recipes-gnome/gtk+/{gtk+3_3.24.5.bb =>
> > gtk+3_3.24.8.bb}
> > (84%)
> 
> I retested with the date/time on the workers fixed and this series
> present. We saw:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/693
> 
> so I think there might be something not quite right with opengl
> disabled (the main difference to nodistro I can think of?)

Its now in master:

https://autobuilder.yoctoproject.org/typhoon/#/builders/76/builds/687

so I think there is some kind of parallel make race in the new gtk+?

The autobuilder is proving very tricky to read at the moment and
intermittent bugs are making it into master :(

Cheers,

Richard
Richard Purdie June 10, 2019, 12:32 p.m.
On Mon, 2019-06-10 at 12:47 +0100, Richard Purdie wrote:
> On Sat, 2019-06-08 at 10:05 +0100, Richard Purdie wrote:
> > On Fri, 2019-06-07 at 14:19 +0200, Alexander Kanavin wrote:
> > > Rebase 0003-Add-disable-opengl-configure-option.patch
> > > 
> > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > ---
> > >  ...-Add-disable-opengl-configure-option.patch | 41 ++++++++++---
> > > --
> > > --
> > > --
> > >  .../gtk+/{gtk+3_3.24.5.bb => gtk+3_3.24.8.bb} |  4 +-
> > >  2 files changed, 23 insertions(+), 22 deletions(-)
> > >  rename meta/recipes-gnome/gtk+/{gtk+3_3.24.5.bb =>
> > > gtk+3_3.24.8.bb}
> > > (84%)
> > 
> > I retested with the date/time on the workers fixed and this series
> > present. We saw:
> > 
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/693
> > 
> > so I think there might be something not quite right with opengl
> > disabled (the main difference to nodistro I can think of?)
> 
> Its now in master:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/76/builds/687
> 
> so I think there is some kind of parallel make race in the new gtk+?
> 
> The autobuilder is proving very tricky to read at the moment and
> intermittent bugs are making it into master :(

I've realised the error wasn't:

Failed to open file “./gdk.gresource.xml”: No such file or directory

but

| glib-compile-resources --target=bloatpad-gresources.c --
sourcedir=../../../gtk+-3.24.5/examples/bp --generate-source
../../../gtk+-3.24.5/examples/bp/bloatpad.gresources.xml
| 
| (glib-compile-resources:91029): GLib-ERROR **: 02:42:13.583: creating
thread 'gmain': Error creating thread: Resource temporarily unavailable
| make[3]: *** [bloatpad-gresources.c] Trace/breakpoint trap

which sounds like a parallelism issue :/. Question is which resource
we're running out of...

Cheers,

Richard
Richard Purdie June 10, 2019, 12:57 p.m.
On Mon, 2019-06-10 at 13:32 +0100, Richard Purdie wrote:
> On Mon, 2019-06-10 at 12:47 +0100, Richard Purdie wrote:
> > On Sat, 2019-06-08 at 10:05 +0100, Richard Purdie wrote:
> > > On Fri, 2019-06-07 at 14:19 +0200, Alexander Kanavin wrote:
> > > > Rebase 0003-Add-disable-opengl-configure-option.patch
> > > > 
> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > > ---
> > > >  ...-Add-disable-opengl-configure-option.patch | 41 ++++++++++-
> > > > --
> > > > --
> > > > --
> > > > --
> > > >  .../gtk+/{gtk+3_3.24.5.bb => gtk+3_3.24.8.bb} |  4 +-
> > > >  2 files changed, 23 insertions(+), 22 deletions(-)
> > > >  rename meta/recipes-gnome/gtk+/{gtk+3_3.24.5.bb =>
> > > > gtk+3_3.24.8.bb}
> > > > (84%)
> > > 
> > > I retested with the date/time on the workers fixed and this
> > > series
> > > present. We saw:
> > > 
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/693
> > > 
> > > so I think there might be something not quite right with opengl
> > > disabled (the main difference to nodistro I can think of?)
> > 
> > Its now in master:
> > 
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/76/builds/687
> > 
> > so I think there is some kind of parallel make race in the new
> > gtk+?
> > 
> > The autobuilder is proving very tricky to read at the moment and
> > intermittent bugs are making it into master :(
> 
> I've realised the error wasn't:
> 
> Failed to open file “./gdk.gresource.xml”: No such file or directory
> 
> but
> 
> > glib-compile-resources --target=bloatpad-gresources.c --
> sourcedir=../../../gtk+-3.24.5/examples/bp --generate-source
> ../../../gtk+-3.24.5/examples/bp/bloatpad.gresources.xml
> > (glib-compile-resources:91029): GLib-ERROR **: 02:42:13.583:
> > creating
> thread 'gmain': Error creating thread: Resource temporarily
> unavailable
> > make[3]: *** [bloatpad-gresources.c] Trace/breakpoint trap
> 
> which sounds like a parallelism issue :/. Question is which resource
> we're running out of...

Looking at that machine, max user processes is 4096 which I think we've
had issues with in the past.

Cc'ing Michael.

Cheers,

Richard
Ying-Chun Liu (PaulLiu) June 10, 2019, 7:46 p.m.
Dear openembedded-core developers,


I need some help about using OE toolchain from different arch.


For example, on RPi3, we build the rootfs using armhf architecture.

(require  conf/machine/include/arm/arch-armv6.inc)

That means the whole rootfs is built by arm-linux-gnueabihf-*


But when adding TF-A and OPTEE. On RPi3, TF-A and OPTEE runs in 64-bit
mode. And TF-A will then load u-boot (BL33) and runs it in 32-bit mode.
So the rest of the systems still run on 32-bit mode.


The problem is now we want to build TF-A and OPTEE. So we need to
compile it by aarch64 toolchains. That is we should use
CROSS_COMPILE=aarch64-oe-linux-* from aarch64. But however it seems to
me that I cannot do that. I tried to make a recipe for TF-A by chainging
architecture of that recipe but I still don't have aarch64-oe-linux-*
available. Is there a proper way of doing this?

BTW, this is not about ilp32 because we still want the whole system runs
in armhf for compatibility.

Yours,
Paul