Skip to contentSkip to conversation

glib-2.0: udpate 2.58.3 -> 2.60.3

PATCH In review Alexander Kanavin 4 participants 12 messages Jun 7, 2019 – Jul 31, 2019

lore
Share & tools
lore

Alexander Kanavin

author
#0 lore raw

PATCH 1/3 glib-2.0: udpate 2.58.3 -> 2.60.3

Drop autotools-specific parts from patches, as all autotools files have been removed upstream (meson is now the only option).

Remove autotools-specific 0001-Revert-Use-absolute-paths-in-pkg-config-files.patch

Remove backported fix-nl-abaltmon.patch

Add a hunk to Enable-more-tests-while-cross-compiling.patch which comments out the part of the tests that hard-codes native ld for building.

Signed-off-by Alexander Kanavin <[email protected]>
---
 ...-gio-querymodules-as-libexec_PROGRAM.patch |  23 +---
 ...e-absolute-paths-in-pkg-config-files.patch |  64 ---------
 ...-correctly-when-building-with-mingw3.patch |  61 ++++-----
 ...ble-more-tests-while-cross-compiling.patch | 126 ++++++++----------
 .../glib-2.0/glib-2.0/fix-nl-abaltmon.patch   | 104 ---------------
 .../glib-2.0/glib-2.0/relocate-modules.patch  |   6 +-
 ...{glib-2.0_2.58.3.bb => glib-2.0_2.60.3.bb} |   6 +-
 meta/recipes-core/glib-2.0/glib.inc           |   2 +-
 8 files changed, 92 insertions(+), 300 deletions(-)
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.58.3.bb => glib-2.0_2.60.3.bb} (79%)
meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +4 -19
index f246254942e..a3d71f2b7aa 100644
@@ -1,4 +1,4 @@
-From 17fc9230fb932432d8faaaabf8c56fdc4845495e Mon Sep 17 00:00:00 2001
+From d29dfba67b1808eea6d428085f95b6e42cf2d1e4 Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen <[email protected]>
 Date: Tue, 22 Mar 2016 15:14:58 +0200
 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM

@@ -10,29 +10,14 @@ Signed-off-by: Jussi Kukkonen <[email protected]>
 Upstream-Status: Inappropriate [OE specific]
 
 ---
- gio/Makefile.am | 3 ++-
  gio/meson.build | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+)
 
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index e14cad2..bf2bcc7 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -835,7 +835,8 @@ gio.def: libgio-2.0.la
- gio-2.0.lib: libgio-2.0.la gio.def
- 	$(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@
- 
--bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop
-+bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop
-+libexec_PROGRAMS = gio-querymodules
- 
- glib_compile_resources_LDADD = libgio-2.0.la 		\
- 	$(top_builddir)/gobject/libgobject-2.0.la	\
 diff --git a/gio/meson.build b/gio/meson.build
-index b83d8f5..85d8b14 100644
+index 4e5e021..90a741a 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -925,6 +925,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
+@@ -940,6 +940,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
    c_args : gio_c_args,
    # intl.lib is not compatible with SAFESEH
    link_args : noseh_link_args,
meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch deleted +0 -64

64 lines not on this page · raw message

meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +26 -35

115 lines not on this page · raw message

meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +56 -70

173 lines not on this page · raw message

meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch deleted +0 -104

104 lines not on this page · raw message

meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +3 -3
index a4e0c9201f2..2d698a67c8e 100644
@@ -1,4 +1,4 @@
-From 9d985803c50cfb99253c757934985f937da34822 Mon Sep 17 00:00:00 2001
+From 17ca85e329bf39c004b73a02e94b597dac41ddfe Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Fri, 11 Mar 2016 15:35:55 +0000
 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds

@@ -19,7 +19,7 @@ Signed-off-by: Jussi Kukkonen <[email protected]>
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index 36c0cef..912e490 100644
+index b92162d..fce9933 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
 @@ -40,6 +40,8 @@

@@ -31,7 +31,7 @@ index 36c0cef..912e490 100644
  #endif
  #include <glib/gstdio.h>
  
-@@ -1099,7 +1101,15 @@ get_gio_module_dir (void)
+@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
  #endif
        g_free (install_dir);
  #else
meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb +2 -4
similarity index 79%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb
index d749be34ee8..f4ade098ef1 100644
@@ -12,16 +12,14 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
            file://0001-Do-not-ignore-return-value-of-write.patch \
            file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
-           file://0001-Revert-Use-absolute-paths-in-pkg-config-files.patch \
            file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \
            file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
            file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \
            file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \
-           file://fix-nl-abaltmon.patch \
            file://glib-meson.cross \
            "
 
 SRC_URI_append_class-native = " file://relocate-modules.patch"
 
-SRC_URI[md5sum] = "8058c7bde846dcffe5fa453eca366d73"
-SRC_URI[sha256sum] = "8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481"
+SRC_URI[md5sum] = "112a850caa8d2c21e24d4c9844e8b1fe"
+SRC_URI[sha256sum] = "04ab0d560d45790d055f50db2d69974eab8b693a77390075462c56e652b760b9"
meta/recipes-core/glib-2.0/glib.inc +1 -1
index 385596c7544..3ae22f5e807 100644
@@ -48,7 +48,7 @@ PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native"
 PACKAGECONFIG[libelf] = ",,elfutils"
 PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus"
 
-EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=false"
+EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=disabled"
 EXTRA_OEMESON_append_class-target = " --cross-file ${WORKDIR}/glib-meson.cross"
 
 do_configure_prepend() {
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/3 gdk-pixbuf: update 2.38.0 -> 2.38.1

Remove 0001-loaders.cache-depend-on-loaders-being-fully-build.patch as upstream has fixed the issue.

Add a patch to revert upstream's decision to not cross-compile thumbnailer or tests.

Signed-off-by Alexander Kanavin <[email protected]>
---
 ...f-decisions-around-cross-compilation.patch | 50 ++++++++----------
 ...-depend-on-loaders-being-fully-build.patch | 51 -------------------
 ...-around-thumbnailer-cross-compile-fa.patch |  8 ++-
 ...ailer-and-tests-also-in-cross-builds.patch | 28 ++++++++++
 ...-pixbuf_2.38.0.bb => gdk-pixbuf_2.38.1.bb} |  6 +--
 5 files changed, 55 insertions(+), 88 deletions(-)
 delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch
 rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.38.0.bb => gdk-pixbuf_2.38.1.bb} (95%)
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch +21 -29
index e638fd3b6f3..e4614049183 100644
@@ -1,4 +1,4 @@
-From bf71999b6e64d1f1919b0351b27c1c417e2b8856 Mon Sep 17 00:00:00 2001
+From be8a47e0c21e5577d4f5669d339dfec6299b25be Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 14 Feb 2019 18:06:25 +0100
 Subject: [PATCH] Generate loaders.cache using a native tool when

@@ -10,37 +10,29 @@ Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <[email protected]>
 
 ---
- gdk-pixbuf/meson.build | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
+ gdk-pixbuf/meson.build | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
-index 1995ffd..d692cb7 100644
+index 5cddbec..78c8bd3 100644
 --- a/gdk-pixbuf/meson.build
 +++ b/gdk-pixbuf/meson.build
-@@ -291,6 +291,7 @@ foreach bin: gdkpixbuf_bin
-   set_variable(bin_name.underscorify(), bin)
- endforeach
- 
-+if not meson.is_cross_build()
- # The 'loaders.cache' used for testing, so we don't accidentally
- # load the installed cache; we always build it by default
- loaders_cache = custom_target('loaders.cache',
-@@ -302,6 +303,18 @@ loaders_cache = custom_target('loaders.cache',
-                               ],
-                               build_by_default: true)
- loaders_dep = declare_dependency(sources: [ loaders_cache ])
-+else
-+loaders_cache = custom_target('loaders.cache',
-+                              output: 'loaders.cache',
-+                              capture: true,
-+                              depends: [ dynamic_loaders_dep ],
-+                              command: [
-+                                'gdk-pixbuf-query-loaders',
-+                                dynamic_loaders,
-+                              ],
-+                              build_by_default: true)
-+loaders_dep = declare_dependency(sources: [ loaders_cache ])
-+endif
+@@ -324,8 +324,16 @@ if not meson.is_cross_build()
+                                 build_by_default: true)
+   loaders_dep = declare_dependency(sources: [ loaders_cache ])
+ else
+-  loaders_cache = []
+-  loaders_dep = declare_dependency()
++  loaders_cache = custom_target('loaders.cache',
++                                output: 'loaders.cache',
++                                capture: true,
++                                command: [
++                                  'gdk-pixbuf-query-loaders',
++                                  dynamic_loaders,
++                                ],
++                                depends: dynamic_loaders_dep,
++                                build_by_default: true)
++  loaders_dep = declare_dependency(sources: [ loaders_cache ])
+ endif
  
  pkgconfig = import('pkgconfig')
- pkgconfig.generate(
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch deleted +0 -51

51 lines not on this page · raw message

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch +3 -5
index 928962d230b..a9c7600eb3e 100644
@@ -1,4 +1,4 @@
-From 6fc7f341399ec49ab06c94426f50dbdca49a2844 Mon Sep 17 00:00:00 2001
+From 2d1b65bd1272ad63b7fbd4babd9a8e8c296d15b5 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 22 Feb 2019 13:22:06 +0100
 Subject: [PATCH] (target only) Work-around thumbnailer and pixdata

@@ -15,6 +15,7 @@ The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057
 
 Upstream-Status: Inappropriate [workaround]
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
  build-aux/gen-thumbnailer.py |  2 --
  tests/meson.build            | 11 +++++++++--

@@ -35,7 +36,7 @@ index 05ac821..c5b99ab 100644
  if os.name == 'nt':
      gdk_pixbuf_dll_buildpath = os.path.dirname(args.pixdata)
 diff --git a/tests/meson.build b/tests/meson.build
-index 4fa3fbc..eca5166 100644
+index 8ed7cc1..e011b77 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
 @@ -1,12 +1,19 @@

@@ -91,6 +92,3 @@ index aaafec8..71bd61b 100644
                ],
                install: true,
                install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers'))
--- 
-2.17.1
-
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch new file +28 -0
new file mode 100644
index 00000000000..0fe13a387a2
@@ -0,0 +1,28 @@
+From 1a532e090c558a830de9503f56e23414e880bb95 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 5 Jun 2019 14:17:55 +0200
+Subject: [PATCH] Build thumbnailer and tests also in cross builds.
+
+Upstream-Status: Inappropriate [relies on oe-core specific hacks]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index d104cea..7acb88a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -397,10 +397,8 @@ endif
+ # i18n
+ subdir('po')
+ 
+-if not meson.is_cross_build()
+-  subdir('tests')
+-  subdir('thumbnailer')
+-endif
++subdir('tests')
++subdir('thumbnailer')
+ 
+ # Documentation
+ subdir('docs')
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.1.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb +3 -3
similarity index 95%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.1.bb
index 7fef697f3fa..3145cc2089b 100644
@@ -18,8 +18,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://fatal-loader.patch \
            file://0001-Work-around-thumbnailer-cross-compile-failure.patch \
            file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \
-           file://0001-loaders.cache-depend-on-loaders-being-fully-build.patch \
            file://0004-Do-not-run-tests-when-building.patch \
+           file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \
            "
 
 SRC_URI_append_class-target = " \

@@ -29,8 +29,8 @@ SRC_URI_append_class-nativesdk = " \
            file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \
            "
 
-SRC_URI[md5sum] = "77765f24496dc8c90c6e0cbe10fd8f0e"
-SRC_URI[sha256sum] = "dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47"
+SRC_URI[md5sum] = "f6ba2195acd18c5c9555421f30c31cc1"
+SRC_URI[sha256sum] = "f19ff836ba991031610dcc53774e8ca436160f7d981867c8c3a37acfe493ab3a"
 
 inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 3/3 gtk+3: update 3.24.5 -> 3.24.8

In reply to Alexander Kanavin

Rebase 0003-Add-disable-opengl-configure-option.patch

Signed-off-by Alexander Kanavin <[email protected]>
---
 ...-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%)
meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +21 -20
index e5a67d098e7..e09748893ff 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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 | \
meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb +2 -2
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
@@ -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}"
Signature · 1 line
2.17.1
#3 lore raw

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

Quoted 10 lines · Alexander Kanavin

Rebase 0003-Add-disable-opengl-configure-option.patch

Signed-off-by Alexander Kanavin <[email protected]>
---
 ...-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

#4 lore raw

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

Quoted 14 lines · Richard Purdie
Quoted 10 lines · Alexander Kanavin

Rebase 0003-Add-disable-opengl-configure-option.patch

Signed-off-by Alexander Kanavin <[email protected]>
---
 ...-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 =>
Quoted 2 lines

gtk+3_3.24.8.bb}
(84%)

Quoted 7 lines

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

#5 lore raw

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

Quoted 24 lines · Richard Purdie
Quoted 15 lines · Richard Purdie
Quoted 11 lines · Alexander Kanavin

Rebase 0003-Add-disable-opengl-configure-option.patch

Signed-off-by Alexander Kanavin <[email protected]>
---
 ...-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 =>
Quoted 2 lines

gtk+3_3.24.8.bb}
(84%)

Quoted 7 lines

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?)

Quoted 8 lines

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

#6 lore raw

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

Quoted 46 lines · Richard Purdie
Quoted 28 lines · Richard Purdie
Quoted 16 lines · Richard Purdie
Quoted 9 lines · Alexander Kanavin

Rebase 0003-Add-disable-opengl-configure-option.patch

Signed-off-by Alexander Kanavin <[email protected]>
---
 ...-Add-disable-opengl-configure-option.patch | 41 ++++++++++-

--
--
--
--

Quoted 5 lines
 .../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%)

Quoted 8 lines

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:

Quoted 7 lines

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

Quoted 1 line

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

Quoted 8 lines
Quoted 2 lines

(glib-compile-resources:91029): GLib-ERROR **: 02:42:13.583:
creating

thread 'gmain': Error creating thread: Resource temporarily unavailable

Quoted 1 line

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

#7 lore raw

Questions: Using OE toolchain of different arch.

In reply to Richard Purdie

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

#8 lore raw

Re: Questions: Using OE toolchain of different arch.

Quoted 19 lines · Ying-Chun Liu (PaulLiu)

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.

Quoted 7 lines

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?

I assume you want to use a prebuilt toolchain and not built another variant along with
what OE will provide you. You can try something like this

https://github.com/akuster/meta-odroid/blob/master/recipes-kernel/linux/linux-hardkernel_3.14.bb#L7-L21

Quoted 12 lines

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

Yours,
Paul

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#9 lore raw
In reply to Alexander Kanavin
Quoted 6 lines · Alexander Kanavin

Drop autotools-specific parts from patches, as all autotools files have been removed upstream (meson is now the only option).

Remove autotools-specific 0001-Revert-Use-absolute-paths-in-pkg- config-files.patch

Quoted 7 lines

Remove backported fix-nl-abaltmon.patch

Add a hunk to Enable-more-tests-while-cross-compiling.patch which comments out
the part of the tests that hard-codes native ld for building.

Signed-off-by Alexander Kanavin <[email protected]>

So far we've seen:

https://autobuilder.yoctoproject.org/typhoon/#/builders/46/builds/682
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/680

Cheers,

Richard

author
#10 lore raw
Quoted 7 lines · Richard Purdie

So far we've seen:

https://autobuilder.yoctoproject.org/typhoon/#/builders/46/builds/682
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/680

Both are the same issue, and a rather bizarre one: instead of starting the build, ninja goes into a loop trying
to re-run the configuration step and recreate build.ninja (its equivalent of Makefile) and not being happy when it finishes.

The issue is specific to opensuse/tumbleweed builders, and I was able to reproduce it locally by setting
meson.build's modification time one week into the future ("touch -d 'next Thursday' meson.build").

Which brings me to a question: is the system date and time set correctly on those builders?

Alex

#11 lore raw
Quoted 13 lines · Alexander Kanavin
Quoted 5 lines · Richard Purdie

So far we've seen:

https://autobuilder.yoctoproject.org/typhoon/#/builders/46/builds/682
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/680

Both are the same issue, and a rather bizarre one: instead of starting the build, ninja goes into a loop trying
to re-run the configuration step and recreate build.ninja (its equivalent of Makefile) and not being happy when it finishes.

Quoted 7 lines

The issue is specific to opensuse/tumbleweed builders, and I was able to reproduce it locally by setting
meson.build's modification time one week into the future ("touch -d 'next Thursday' meson.build").

Which brings me to a question: is the system date and time set correctly on those builders?

Perhaps not:

rpurdie@opensuse151-ty-1:~> date
Fri 7 Jun 11:25:45 UTC 2019

rpurdie@ubuntu1804-ty:~$ date
Fri Jun  7 16:26:20 UTC 2019
rpurdie@tumbleweed-ty-1:~> date
Fri  7 Jun 11:27:09 UTC 2019
[rpurdie@fedora29-ty-1 ~]$ date
Fri  7 Jun 16:27:52 UTC 2019

Michael? (cc'd)

Cheers,

Richard