Skip to contentSkip to conversation

runqemu: add options that enable virgl with the SDL frontend

PATCH In review Alexander Kanavin 6 participants 40 messages Oct 11, 2019 – Oct 22, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/19 runqemu: add options that enable virgl with the SDL frontend

---
 scripts/runqemu | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
scripts/runqemu +9 -4
index 1a5aca98ac7..22671f19ec3 100755
@@ -67,9 +67,9 @@ of the following environment variables (in any order):
     nographic - disable video console
     sdl - choose the SDL UI frontend
     gtk - choose the Gtk UI frontend
-    gl - enable virgl-based GL acceleration (also needs gtk option)
-    gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs gtk option)
-    egl-headless - enable headless EGL output; use vnc or spice to see it
+    gl - enable virgl-based GL acceleration (also needs gtk or sdl options)
+    gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs gtk or sdl options)
+    egl-headless - enable headless EGL output; use vnc (via publicvnc option) or spice to see it
     serial - enable a serial console on /dev/ttyS0
     serialstdio - enable a serial console on the console (regardless of graphics mode)
     slirp - enable user networking, no root privileges is required
@@ -437,7 +437,12 @@ class BaseConfig(object):
                 self.qemu_opt_script += ' -nographic'
                 self.kernel_cmdline_script += ' console=ttyS0'
             elif arg == 'sdl':
-                self.qemu_opt_script += ' -display sdl'
+                if 'gl' in sys.argv[1:]:
+                    self.qemu_opt_script += ' -vga virtio -display sdl,gl=on'
+                elif 'gl-es' in sys.argv[1:]:
+                    self.qemu_opt_script += ' -vga virtio -display sdl,gl=es'
+                else:
+                    self.qemu_opt_script += ' -display sdl'
             elif arg == 'gtk':
                 if 'gl' in sys.argv[1:]:
                     self.qemu_opt_script += ' -vga virtio -display gtk,gl=on'
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/19 oe-selftest: extend virgl gtk test to also check the SDL option

---
 meta/lib/oeqa/selftest/cases/runtime_test.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)
meta/lib/oeqa/selftest/cases/runtime_test.py +13 -4
index 3f212bd0eac..8f98a9ead46 100644
@@ -166,9 +166,9 @@ class TestImage(OESelftestTestCase):
         bitbake('core-image-full-cmdline socat')
         bitbake('-c testimage core-image-full-cmdline')
 
-    def test_testimage_virgl_gtk(self):
+    def test_testimage_virgl_gtk_sdl(self):
         """
-        Summary: Check host-assisted accelerate OpenGL functionality in qemu with gtk frontend
+        Summary: Check host-assisted accelerate OpenGL functionality in qemu with gtk and SDL frontends
         Expected: 1. Check that virgl kernel driver is loaded and 3d acceleration is enabled
                   2. Check that kmscube demo runs without crashing.
         Product: oe-core
@@ -181,18 +181,27 @@ class TestImage(OESelftestTestCase):
             self.skipTest('virgl isn\'t working with Debian 8')
 
         qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+        sdl_packageconfig = get_bb_var('PACKAGECONFIG', 'libsdl2-native')
         features = 'INHERIT += "testimage"\n'
         if 'gtk+' not in qemu_packageconfig:
             features += 'PACKAGECONFIG_append_pn-qemu-system-native = " gtk+"\n'
+        if 'sdl' not in qemu_packageconfig:
+            features += 'PACKAGECONFIG_append_pn-qemu-system-native = " sdl"\n'
         if 'virglrenderer' not in qemu_packageconfig:
             features += 'PACKAGECONFIG_append_pn-qemu-system-native = " virglrenderer"\n'
         if 'glx' not in qemu_packageconfig:
             features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+        if 'opengl' not in sdl_packageconfig:
+            features += 'PACKAGECONFIG_append_pn-libsdl2-native = " opengl"\n'
         features += 'TEST_SUITES = "ping ssh virgl"\n'
         features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
         features += 'IMAGE_INSTALL_append = " kmscube"\n'
-        features += 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
-        self.write_config(features)
+        features_gtk = features + 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
+        self.write_config(features_gtk)
+        bitbake('core-image-minimal')
+        bitbake('-c testimage core-image-minimal')
+        features_sdl = features + 'TEST_RUNQEMUPARAMS = "sdl gl"\n'
+        self.write_config(features_sdl)
         bitbake('core-image-minimal')
         bitbake('-c testimage core-image-minimal')
 
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/19 runqemu: unset another environment variable for 'egl-headless'

In reply to Alexander Kanavin

Some host distributions (opensuse for example) are using 'pkgconf', which, unlike the original pkg-config, appends PKG_CONFIG_SYSROOT_DIR to every directory from the .pc file.

---
 scripts/runqemu | 1 +
 1 file changed, 1 insertion(+)
scripts/runqemu +1 -0
index 22671f19ec3..15cc56b93ec 100755
@@ -462,6 +462,7 @@ class BaseConfig(object):
                     del os.environ['PKG_CONFIG_PATH']
                     del os.environ['PKG_CONFIG_DIR']
                     del os.environ['PKG_CONFIG_LIBDIR']
+                    del os.environ['PKG_CONFIG_SYSROOT_DIR']
                 except KeyError:
                     pass
                 try:
Signature · 1 line
2.17.1
#3 lore raw

PATCH 4/19 gobject-introspection: update to 1.62.0

In reply to Alexander Kanavin

Upstream has removed autotools support entirely, so we can drop the chunks of patches that touch it.

---
 ...t-cross-compilation-support-to-meson.patch |  20 +-
 ...pository-directory-for-native-builds.patch |   6 +-
 ...lete-upstream-attempt-at-cross-compi.patch |  48 -----
 ...-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | 201 ------------------
 ...g-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch |  61 +-----
 ...0.2.bb => gobject-introspection_1.62.0.bb} |   6 +-
 6 files changed, 18 insertions(+), 324 deletions(-)
 delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
 delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
 rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.60.2.bb => gobject-introspection_1.62.0.bb} (96%)
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch +10 -10
index 5747d61c192..639f9c8f61a 100644
@@ -1,4 +1,4 @@
-From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001
+From 0417a1bb08745f2bf5310d20b342c2b3b9b212d3 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 15 Nov 2018 15:10:05 +0100
 Subject: [PATCH] Port cross-compilation support to meson
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  3 files changed, 68 insertions(+), 18 deletions(-)
 
 diff --git a/gir/meson.build b/gir/meson.build
-index 85ae575..327c134 100644
+index c312100..a028033 100644
 --- a/gir/meson.build
 +++ b/gir/meson.build
-@@ -36,16 +36,29 @@ gir_files = [
+@@ -41,16 +41,29 @@ gir_files = [
  typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
  install_data(gir_files, install_dir: girdir)
  
@@ -56,7 +56,7 @@ index 85ae575..327c134 100644
  
  dep_type = glib_dep.type_name()
  if dep_type == 'internal'
-@@ -58,6 +71,12 @@ if dep_type == 'internal'
+@@ -63,6 +76,12 @@ if dep_type == 'internal'
                        '--extra-library=glib-2.0', '--extra-library=gobject-2.0']
  endif
  
@@ -69,7 +69,7 @@ index 85ae575..327c134 100644
  # Take a glob and print to newlines
  globber = '''
  from glob import glob
-@@ -84,8 +103,8 @@ glib_command = scanner_command + [
+@@ -89,8 +108,8 @@ glib_command = scanner_command + [
  
  if dep_type == 'pkgconfig'
    glib_command += ['--external-library', '--pkg=glib-2.0']
@@ -80,8 +80,8 @@ index 85ae575..327c134 100644
    glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
    glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
    glib_files += join_paths(glib_libincdir, 'glibconfig.h')
-@@ -339,7 +358,7 @@ endforeach
- if giounix_dep.found()
+@@ -345,7 +364,7 @@ if giounix_dep.found()
+   dep_type = giounix_dep.type_name()
    if dep_type == 'pkgconfig'
      gio_command += ['--pkg=gio-unix-2.0']
 -    giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
@@ -89,7 +89,7 @@ index 85ae575..327c134 100644
      # Get the installed gio-unix header list
      ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
      if ret.returncode() != 0
-@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository',
+@@ -428,15 +447,24 @@ gir_files += custom_target('gir-girepository',
  )
  
  typelibs = []
@@ -119,10 +119,10 @@ index 85ae575..327c134 100644
      install_dir: typelibdir,
    )
 diff --git a/meson.build b/meson.build
-index 95bbd2b..f7baefd 100644
+index a5e825f..a28490a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -163,7 +163,9 @@ endif
+@@ -168,7 +168,9 @@ endif
  subdir('girepository')
  subdir('tools')
  subdir('giscanner')
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +3 -3
index a4f45a142dd..a15401aeb2f 100644
@@ -1,4 +1,4 @@
-From 8f01066e935a7323ff6e53f27ed1b5fb74fa11eb Mon Sep 17 00:00:00 2001
+From 673623851fb70c0e43cf79cef67b3751432ebe72 Mon Sep 17 00:00:00 2001
 From: Sascha Silbe <[email protected]>
 Date: Fri, 8 Jun 2018 13:55:10 +0200
 Subject: [PATCH] Relocate the repository directory for native builds
@@ -62,10 +62,10 @@ index ca5dc2b..7a4d17f 100644
        typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir);
  
 diff --git a/girepository/meson.build b/girepository/meson.build
-index 0261e1a..4cb646f 100644
+index 1d7aed6..5637fb5 100644
 --- a/girepository/meson.build
 +++ b/girepository/meson.build
-@@ -36,7 +36,7 @@ girepo_internals_lib = static_library('girepository-internals',
+@@ -44,7 +44,7 @@ girepo_internals_lib = static_library('girepository-internals',
    ],
    c_args: gi_hidden_visibility_cflags + custom_c_args,
    include_directories : configinc,
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch deleted +0 -48

48 lines not on this page · raw message

meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch deleted +0 -201

201 lines not on this page · raw message

meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch +3 -58

71 lines not on this page · raw message

meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.2.bb +2 -4
similarity index 96%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.2.bb
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
index f46053f4432..c925115fb73 100644
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
                     "
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
-           file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \
-           file://0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch \
            file://0003-giscanner-add-use-binary-wrapper-option.patch \
            file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \
            file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \
@@ -21,8 +19,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
            file://0001-meson.build-disable-tests-when-cross-compiling.patch \
            "
 
-SRC_URI[md5sum] = "57c1c5dcf3d0a9aa73d06c2d5e6960d7"
-SRC_URI[sha256sum] = "ffdfe2368fb2e34a547898b01aac0520d52d8627fdeb1c306559bcb503ab5e9c"
+SRC_URI[md5sum] = "37278eab3704e42234b6080b8cf241f1"
+SRC_URI[sha256sum] = "b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2"
 
 SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
 
Signature · 1 line
2.17.1
#4 lore raw

PATCH 5/19 glib-2.0: upgrade to 2.62.1

In reply to Alexander Kanavin

Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch where upstream has removed the problematic bit.

---
 ...t-write-bindir-into-pkg-config-files.patch | 31 +++++++---
 ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 ++++++++++
 ...-correctly-when-building-with-mingw3.patch | 22 +++----
 ...-time-check-for-strlcpy-before-attem.patch | 62 -------------------
 ...ot-hardcode-linux-as-the-host-system.patch | 27 --------
 .../glib-2.0/glib-2.0/relocate-modules.patch  |  8 +--
 .../glib-2.0/uclibc_musl_translation.patch    | 22 -------
 ...{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} |  8 +--
 meta/recipes-core/glib-2.0/glib.inc           |  2 +
 9 files changed, 75 insertions(+), 141 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} (69%)
meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +21 -10
index ede29c90bab..edac4c9f75d 100644
@@ -1,4 +1,4 @@
-From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001
+From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 15 Feb 2019 11:17:27 +0100
 Subject: [PATCH] Do not write $bindir into pkg-config files
@@ -9,33 +9,44 @@ rather than use target paths).
 
 Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
- gio/meson.build  | 6 +++---
- glib/meson.build | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ gio/meson.build  | 16 ++++++++--------
+ glib/meson.build |  6 +++---
+ 2 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/gio/meson.build b/gio/meson.build
-index 85d8b14..657720a 100644
+index 71e88c4..8ce3987 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
+@@ -831,14 +831,14 @@ pkg.generate(libgio,
                 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
                 'bindir=' + join_paths('${prefix}', get_option('bindir')),
                 'giomoduledir=' + giomodulesdir,
+-               'gio=' + join_paths('${bindir}', 'gio'),
+-               'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
 -               'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
 -               'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
--               'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')],
+-               'gdbus=' + join_paths('${bindir}', 'gdbus'),
+-               'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
+-               'gresource=' + join_paths('${bindir}', 'gresource'),
+-               'gsettings=' + join_paths('${bindir}', 'gsettings')],
++               'gio=gio',
++               'gio_querymodules=gio-querymodules',
 +               'glib_compile_schemas=glib-compile-schemas',
 +               'glib_compile_resources=glib-compile-resources',
-+               'gdbus_codegen=gdbus-codegen'],
++               'gdbus=gdbus',
++               'gdbus_codegen=gdbus-codegen',
++               'gresource=gresource',
++               'gsettings=gsettings'],
    version : glib_version,
    install_dir : glib_pkgconfigreldir,
    filebase : 'gio-2.0',
 diff --git a/glib/meson.build b/glib/meson.build
-index c05c694..434e8b1 100644
+index 91a48f1..978fb73 100644
 --- a/glib/meson.build
 +++ b/glib/meson.build
-@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
+@@ -375,9 +375,9 @@ pkg.generate(libglib,
    subdirs : ['glib-2.0'],
    extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
    variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch new file +34 -0
new file mode 100644
index 00000000000..d8cf269bb8e
@@ -0,0 +1,34 @@
+From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 15 Mar 2014 22:42:29 -0700
+Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
+
+translation files are always installed under PREFIX/share/locale in uclibc
+based systems therefore lets set DATADIRNAME to "share".
+
+Signed-off-by: Khem Raj <[email protected]>
+Upstream-Status: Pending
+
+%% original patch: uclibc_musl_translation.patch
+---
+ m4macros/glib-gettext.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
+index df6fbf0..47db864 100644
+--- a/m4macros/glib-gettext.m4
++++ b/m4macros/glib-gettext.m4
+@@ -293,6 +293,10 @@ msgstr ""
+ 	    CATOBJEXT=.mo
+             DATADIRNAME=share
+ 	    ;;
++	    *-*-musl* | *-*-linux-uclibc*)
++	    CATOBJEXT=.gmo
++            DATADIRNAME=share
++	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+             DATADIRNAME=lib
+-- 
+2.17.1
+
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +11 -11
index d22a646c5de..b02169e09ba 100644
@@ -1,4 +1,4 @@
-From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00 2001
+From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 13 Feb 2019 15:32:05 +0100
 Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  4 files changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 028b196..217ccb1 100644
+index 95aafc1..9025eb2 100644
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -12,7 +12,7 @@ test_c_args = [
-   '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()),
+@@ -13,7 +13,7 @@ test_c_args = [
+   '-UG_DISABLE_ASSERT',
  ]
  
 -if host_machine.system() == 'windows'
@@ -26,7 +26,7 @@ index 028b196..217ccb1 100644
    common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
  endif
  
-@@ -119,7 +119,7 @@ if dbus1_dep.found()
+@@ -120,7 +120,7 @@ if dbus1_dep.found()
  endif
  
  #  Test programs buildable on UNIX only
@@ -35,7 +35,7 @@ index 028b196..217ccb1 100644
    gio_tests += {
      'file' : {},
      'gdbus-peer' : {
-@@ -327,7 +327,7 @@ if host_machine.system() != 'windows'
+@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
  endif # unix
  
  #  Test programs buildable on Windows only
@@ -44,7 +44,7 @@ index 028b196..217ccb1 100644
    gio_tests += {'win32-streams' : {}}
  endif
  
-@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
+@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
    }
  endif
  
@@ -54,7 +54,7 @@ index 028b196..217ccb1 100644
      'gdbus-example-unix-fd-client' : {
        'install' : false,
 diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index d54fc41..a4761fe 100644
+index c47133f..cad975f 100644
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
 @@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
@@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644
      glib_tests += {
        'gpoll' : {
 diff --git a/meson.build b/meson.build
-index a745024..e87eae5 100644
+index 717d1bc..2a3beb8 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -31,6 +31,9 @@ else
+@@ -32,6 +32,9 @@ else
  endif
  
  host_system = host_machine.system()
@@ -81,7 +81,7 @@ index a745024..e87eae5 100644
  glib_version = meson.project_version()
  glib_api_version = '2.0'
 diff --git a/tests/meson.build b/tests/meson.build
-index 11075dd..cd6067b 100644
+index ce30442..5710f2c 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
 @@ -66,7 +66,7 @@ test_extra_programs = {
meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch deleted +0 -62

62 lines not on this page · raw message

meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch deleted +0 -27
deleted file mode 100644
index 5a1a5898908..00000000000
@@ -1,27 +0,0 @@
-From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 19 Feb 2019 10:31:11 +0100
-Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system
-
-OE build system can set this to other values that include 'linux',
-e.g. 'linux-gnueabi'
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 4348f20..af5ed63 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1574,7 +1574,7 @@ atomicdefine = '''
- # We know that we can always use real ("lock free") atomic operations with MSVC
- if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
-   have_atomic_lock_free = true
--  if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
-+  if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define')
-     # When building for armv5 on Linux, gcc provides
-     # __sync_bool_compare_and_swap but doesn't define
-     # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +4 -4
index 380bee086c0..7e9925845bb 100644
@@ -1,4 +1,4 @@
-From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00 2001
+From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 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,10 +19,10 @@ 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 b92162d..fce9933 100644
+index 1007abd..5380982 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -40,6 +40,8 @@
+@@ -44,6 +44,8 @@
  #include "gnetworkmonitor.h"
  #ifdef G_OS_WIN32
  #include "gregistrysettingsbackend.h"
@@ -31,7 +31,7 @@ index b92162d..fce9933 100644
  #endif
  #include <glib/gstdio.h>
  
-@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
+@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
  #endif
        g_free (install_dir);
  #else
meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch deleted +0 -22
deleted file mode 100644
index 7aa6217d693..00000000000
@@ -1,22 +0,0 @@
-Fix DATADIRNAME on uclibc/Linux
-
-translation files are always installed under PREFIX/share/locale in uclibc
-based systems therefore lets set DATADIRNAME to "share".
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Pending
-Index: glib-2.46.1/m4macros/glib-gettext.m4
-===================================================================
---- glib-2.46.1.orig/m4macros/glib-gettext.m4
-+++ glib-2.46.1/m4macros/glib-gettext.m4
-@@ -243,6 +243,10 @@ msgstr ""
- 	    CATOBJEXT=.mo
-             DATADIRNAME=share
- 	    ;;
-+	    *-*-musl* | *-*-linux-uclibc*)
-+	    CATOBJEXT=.gmo
-+            DATADIRNAME=share
-+	    ;;
- 	    *)
- 	    CATOBJEXT=.mo
-             DATADIRNAME=lib
meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +3 -5
similarity index 69%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
index 740473719d8..6d841ec9d9b 100644
@@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://run-ptest \
-           file://uclibc_musl_translation.patch \
+           file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
            file://Enable-more-tests-while-cross-compiling.patch \
            file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
            file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
@@ -14,12 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0010-Do-not-hardcode-python-path-into-various-tools.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 \
            "
 
 SRC_URI_append_class-native = " file://relocate-modules.patch"
 SRC_URI_append_class-target = " file://glib-meson.cross"
 
-SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde"
-SRC_URI[sha256sum] = "8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310"
+SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649"
+SRC_URI[sha256sum] = "3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df"
meta/recipes-core/glib-2.0/glib.inc +2 -0
index 3ae22f5e807..8b95f212047 100644
@@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\
             ${PN}-locale-pl \
             ${PN}-locale-ru \
             ${PN}-locale-th \
+            python3-core \
+            python3-modules \
            "
 
 RDEPENDS_${PN}-ptest_append_libc-glibc = "\
Signature · 1 line
2.17.1
#5 lore raw

Re: [PATCH 05/19] glib-2.0: upgrade to 2.62.1

Regresses, on riscv

https://errors.yoctoproject.org/Errors/Details/273482/

Quoted 423 lines · Alexander Kanavin

Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch where upstream has removed the problematic bit.

---
 ...t-write-bindir-into-pkg-config-files.patch | 31 +++++++---
 ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 ++++++++++
 ...-correctly-when-building-with-mingw3.patch | 22 +++----
 ...-time-check-for-strlcpy-before-attem.patch | 62 -------------------
 ...ot-hardcode-linux-as-the-host-system.patch | 27 --------
 .../glib-2.0/glib-2.0/relocate-modules.patch  |  8 +--
 .../glib-2.0/uclibc_musl_translation.patch    | 22 -------
 ...{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} |  8 +--
 meta/recipes-core/glib-2.0/glib.inc           |  2 +
 9 files changed, 75 insertions(+), 141 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} (69%)
meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +21 -10
index ede29c90bab..edac4c9f75d 100644
@@ -1,4 +1,4 @@
-From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001
+From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 15 Feb 2019 11:17:27 +0100
 Subject: [PATCH] Do not write $bindir into pkg-config files
@@ -9,33 +9,44 @@ rather than use target paths).
 
 Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
- gio/meson.build  | 6 +++---
- glib/meson.build | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ gio/meson.build  | 16 ++++++++--------
+ glib/meson.build |  6 +++---
+ 2 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/gio/meson.build b/gio/meson.build
-index 85d8b14..657720a 100644
+index 71e88c4..8ce3987 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
+@@ -831,14 +831,14 @@ pkg.generate(libgio,
                 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
                 'bindir=' + join_paths('${prefix}', get_option('bindir')),
                 'giomoduledir=' + giomodulesdir,
+-               'gio=' + join_paths('${bindir}', 'gio'),
+-               'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
 -               'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
 -               'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
--               'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')],
+-               'gdbus=' + join_paths('${bindir}', 'gdbus'),
+-               'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
+-               'gresource=' + join_paths('${bindir}', 'gresource'),
+-               'gsettings=' + join_paths('${bindir}', 'gsettings')],
++               'gio=gio',
++               'gio_querymodules=gio-querymodules',
 +               'glib_compile_schemas=glib-compile-schemas',
 +               'glib_compile_resources=glib-compile-resources',
-+               'gdbus_codegen=gdbus-codegen'],
++               'gdbus=gdbus',
++               'gdbus_codegen=gdbus-codegen',
++               'gresource=gresource',
++               'gsettings=gsettings'],
    version : glib_version,
    install_dir : glib_pkgconfigreldir,
    filebase : 'gio-2.0',
 diff --git a/glib/meson.build b/glib/meson.build
-index c05c694..434e8b1 100644
+index 91a48f1..978fb73 100644
 --- a/glib/meson.build
 +++ b/glib/meson.build
-@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
+@@ -375,9 +375,9 @@ pkg.generate(libglib,
    subdirs : ['glib-2.0'],
    extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
    variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch new file +34 -0
new file mode 100644
index 00000000000..d8cf269bb8e
@@ -0,0 +1,34 @@
+From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 15 Mar 2014 22:42:29 -0700
+Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
+
+translation files are always installed under PREFIX/share/locale in uclibc
+based systems therefore lets set DATADIRNAME to "share".
+
+Signed-off-by: Khem Raj <[email protected]>
+Upstream-Status: Pending
+
+%% original patch: uclibc_musl_translation.patch
+---
+ m4macros/glib-gettext.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
+index df6fbf0..47db864 100644
+--- a/m4macros/glib-gettext.m4
++++ b/m4macros/glib-gettext.m4
+@@ -293,6 +293,10 @@ msgstr ""
+           CATOBJEXT=.mo
+             DATADIRNAME=share
+           ;;
++          *-*-musl* | *-*-linux-uclibc*)
++          CATOBJEXT=.gmo
++            DATADIRNAME=share
++          ;;
+           *)
+           CATOBJEXT=.mo
+             DATADIRNAME=lib
+--
+2.17.1
+
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +11 -11
index d22a646c5de..b02169e09ba 100644
@@ -1,4 +1,4 @@
-From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00 2001
+From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 13 Feb 2019 15:32:05 +0100
 Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  4 files changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 028b196..217ccb1 100644
+index 95aafc1..9025eb2 100644
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -12,7 +12,7 @@ test_c_args = [
-   '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()),
+@@ -13,7 +13,7 @@ test_c_args = [
+   '-UG_DISABLE_ASSERT',
  ]
 
 -if host_machine.system() == 'windows'
@@ -26,7 +26,7 @@ index 028b196..217ccb1 100644
    common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
  endif
 
-@@ -119,7 +119,7 @@ if dbus1_dep.found()
+@@ -120,7 +120,7 @@ if dbus1_dep.found()
  endif
 
  #  Test programs buildable on UNIX only
@@ -35,7 +35,7 @@ index 028b196..217ccb1 100644
    gio_tests += {
      'file' : {},
      'gdbus-peer' : {
-@@ -327,7 +327,7 @@ if host_machine.system() != 'windows'
+@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
  endif # unix
 
  #  Test programs buildable on Windows only
@@ -44,7 +44,7 @@ index 028b196..217ccb1 100644
    gio_tests += {'win32-streams' : {}}
  endif
 
-@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
+@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
    }
  endif
 
@@ -54,7 +54,7 @@ index 028b196..217ccb1 100644
      'gdbus-example-unix-fd-client' : {
        'install' : false,
 diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index d54fc41..a4761fe 100644
+index c47133f..cad975f 100644
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
 @@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
@@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644
      glib_tests += {
        'gpoll' : {
 diff --git a/meson.build b/meson.build
-index a745024..e87eae5 100644
+index 717d1bc..2a3beb8 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -31,6 +31,9 @@ else
+@@ -32,6 +32,9 @@ else
  endif
 
  host_system = host_machine.system()
@@ -81,7 +81,7 @@ index a745024..e87eae5 100644
  glib_version = meson.project_version()
  glib_api_version = '2.0'
 diff --git a/tests/meson.build b/tests/meson.build
-index 11075dd..cd6067b 100644
+index ce30442..5710f2c 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
 @@ -66,7 +66,7 @@ test_extra_programs = {
meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch deleted +0 -62
deleted file mode 100644
index d1ed028759a..00000000000
@@ -1,62 +0,0 @@
-Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Wed, 13 Mar 2019 16:22:09 +0000
-Subject: [PATCH] meson: do a build-time check for strlcpy before attempting
- runtime check
-
-In cross-compilation environments the runtime check isn't possible so it is up
-to the builder to seed the cross file, but we can definitely state that strlcpy
-doesn't exist with a build test.
----
- meson.build | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 15039e448..414f2d9b1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1860,22 +1860,24 @@ endif
-
- # Test if we have strlcpy/strlcat with a compatible implementation:
- # https://bugzilla.gnome.org/show_bug.cgi?id=53933
--if cc_can_run
--  rres = cc.run('''#include <stdlib.h>
--                   #include <string.h>
--                   int main() {
--                     char p[10];
--                     (void) strlcpy (p, "hi", 10);
--                     if (strlcat (p, "bye", 0) != 3)
--                       return 1;
--                     return 0;
--                   }''',
--                name : 'OpenBSD strlcpy/strlcat')
--  if rres.compiled() and rres.returncode() == 0
-+if cc.has_function('strlcpy')
-+  if cc_can_run
-+    rres = cc.run('''#include <stdlib.h>
-+                    #include <string.h>
-+                    int main() {
-+                      char p[10];
-+                      (void) strlcpy (p, "hi", 10);
-+                      if (strlcat (p, "bye", 0) != 3)
-+                        return 1;
-+                      return 0;
-+                    }''',
-+                  name : 'OpenBSD strlcpy/strlcat')
-+    if rres.compiled() and rres.returncode() == 0
-+      glib_conf.set('HAVE_STRLCPY', 1)
-+    endif
-+  elif meson.get_cross_property('have_strlcpy', false)
-     glib_conf.set('HAVE_STRLCPY', 1)
-   endif
--elif meson.get_cross_property('have_strlcpy', false)
--  glib_conf.set('HAVE_STRLCPY', 1)
- endif
-
- python = import('python').find_installation('python3')
---
-2.11.0
-
meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch deleted +0 -27
deleted file mode 100644
index 5a1a5898908..00000000000
@@ -1,27 +0,0 @@
-From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 19 Feb 2019 10:31:11 +0100
-Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system
-
-OE build system can set this to other values that include 'linux',
-e.g. 'linux-gnueabi'
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 4348f20..af5ed63 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1574,7 +1574,7 @@ atomicdefine = '''
- # We know that we can always use real ("lock free") atomic operations with MSVC
- if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
-   have_atomic_lock_free = true
--  if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
-+  if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define')
-     # When building for armv5 on Linux, gcc provides
-     # __sync_bool_compare_and_swap but doesn't define
-     # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +4 -4
index 380bee086c0..7e9925845bb 100644
@@ -1,4 +1,4 @@
-From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00 2001
+From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 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,10 +19,10 @@ 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 b92162d..fce9933 100644
+index 1007abd..5380982 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -40,6 +40,8 @@
+@@ -44,6 +44,8 @@
  #include "gnetworkmonitor.h"
  #ifdef G_OS_WIN32
  #include "gregistrysettingsbackend.h"
@@ -31,7 +31,7 @@ index b92162d..fce9933 100644
  #endif
  #include <glib/gstdio.h>
 
-@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
+@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
  #endif
        g_free (install_dir);
  #else
meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch deleted +0 -22
deleted file mode 100644
index 7aa6217d693..00000000000
@@ -1,22 +0,0 @@
-Fix DATADIRNAME on uclibc/Linux
-
-translation files are always installed under PREFIX/share/locale in uclibc
-based systems therefore lets set DATADIRNAME to "share".
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Pending
-Index: glib-2.46.1/m4macros/glib-gettext.m4
-===================================================================
---- glib-2.46.1.orig/m4macros/glib-gettext.m4
-+++ glib-2.46.1/m4macros/glib-gettext.m4
-@@ -243,6 +243,10 @@ msgstr ""
-           CATOBJEXT=.mo
-             DATADIRNAME=share
-           ;;
-+          *-*-musl* | *-*-linux-uclibc*)
-+          CATOBJEXT=.gmo
-+            DATADIRNAME=share
-+          ;;
-           *)
-           CATOBJEXT=.mo
-             DATADIRNAME=lib
meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +3 -5
similarity index 69%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
index 740473719d8..6d841ec9d9b 100644
@@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://run-ptest \
-           file://uclibc_musl_translation.patch \
+           file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
            file://Enable-more-tests-while-cross-compiling.patch \
            file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
            file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
@@ -14,12 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0010-Do-not-hardcode-python-path-into-various-tools.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 \
            "
 
 SRC_URI_append_class-native = " file://relocate-modules.patch"
 SRC_URI_append_class-target = " file://glib-meson.cross"
 
-SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde"
-SRC_URI[sha256sum] = "8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310"
+SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649"
+SRC_URI[sha256sum] = "3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df"
meta/recipes-core/glib-2.0/glib.inc +2 -1
index 3ae22f5e807..8b95f212047 100644
@@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\
             ${PN}-locale-pl \
             ${PN}-locale-ru \
             ${PN}-locale-th \
+            python3-core \
+            python3-modules \
            "
 
 RDEPENDS_${PN}-ptest_append_libc-glibc = "\
--

2.17.1

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

#6 lore raw

Re: [PATCH 05/19] glib-2.0: upgrade to 2.62.1

some more aarch64/musl failures

https://errors.yoctoproject.org/Errors/Details/273492/
https://errors.yoctoproject.org/Errors/Details/273494/

Quoted 430 lines · Khem Raj

Regresses, on riscv

https://errors.yoctoproject.org/Errors/Details/273482/

Quoted 423 lines · Alexander Kanavin

Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch where upstream has removed the problematic bit.

---
 ...t-write-bindir-into-pkg-config-files.patch | 31 +++++++---
 ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 ++++++++++
 ...-correctly-when-building-with-mingw3.patch | 22 +++----
 ...-time-check-for-strlcpy-before-attem.patch | 62 -------------------
 ...ot-hardcode-linux-as-the-host-system.patch | 27 --------
 .../glib-2.0/glib-2.0/relocate-modules.patch  |  8 +--
 .../glib-2.0/uclibc_musl_translation.patch    | 22 -------
 ...{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} |  8 +--
 meta/recipes-core/glib-2.0/glib.inc           |  2 +
 9 files changed, 75 insertions(+), 141 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} (69%)
meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +21 -10
index ede29c90bab..edac4c9f75d 100644
@@ -1,4 +1,4 @@
-From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001
+From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 15 Feb 2019 11:17:27 +0100
 Subject: [PATCH] Do not write $bindir into pkg-config files
@@ -9,33 +9,44 @@ rather than use target paths).
 
 Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
- gio/meson.build  | 6 +++---
- glib/meson.build | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ gio/meson.build  | 16 ++++++++--------
+ glib/meson.build |  6 +++---
+ 2 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/gio/meson.build b/gio/meson.build
-index 85d8b14..657720a 100644
+index 71e88c4..8ce3987 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
+@@ -831,14 +831,14 @@ pkg.generate(libgio,
                 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
                 'bindir=' + join_paths('${prefix}', get_option('bindir')),
                 'giomoduledir=' + giomodulesdir,
+-               'gio=' + join_paths('${bindir}', 'gio'),
+-               'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
 -               'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
 -               'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
--               'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')],
+-               'gdbus=' + join_paths('${bindir}', 'gdbus'),
+-               'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
+-               'gresource=' + join_paths('${bindir}', 'gresource'),
+-               'gsettings=' + join_paths('${bindir}', 'gsettings')],
++               'gio=gio',
++               'gio_querymodules=gio-querymodules',
 +               'glib_compile_schemas=glib-compile-schemas',
 +               'glib_compile_resources=glib-compile-resources',
-+               'gdbus_codegen=gdbus-codegen'],
++               'gdbus=gdbus',
++               'gdbus_codegen=gdbus-codegen',
++               'gresource=gresource',
++               'gsettings=gsettings'],
    version : glib_version,
    install_dir : glib_pkgconfigreldir,
    filebase : 'gio-2.0',
 diff --git a/glib/meson.build b/glib/meson.build
-index c05c694..434e8b1 100644
+index 91a48f1..978fb73 100644
 --- a/glib/meson.build
 +++ b/glib/meson.build
-@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
+@@ -375,9 +375,9 @@ pkg.generate(libglib,
    subdirs : ['glib-2.0'],
    extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
    variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch new file +34 -0
new file mode 100644
index 00000000000..d8cf269bb8e
@@ -0,0 +1,34 @@
+From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 15 Mar 2014 22:42:29 -0700
+Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
+
+translation files are always installed under PREFIX/share/locale in uclibc
+based systems therefore lets set DATADIRNAME to "share".
+
+Signed-off-by: Khem Raj <[email protected]>
+Upstream-Status: Pending
+
+%% original patch: uclibc_musl_translation.patch
+---
+ m4macros/glib-gettext.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
+index df6fbf0..47db864 100644
+--- a/m4macros/glib-gettext.m4
++++ b/m4macros/glib-gettext.m4
+@@ -293,6 +293,10 @@ msgstr ""
+           CATOBJEXT=.mo
+             DATADIRNAME=share
+           ;;
++          *-*-musl* | *-*-linux-uclibc*)
++          CATOBJEXT=.gmo
++            DATADIRNAME=share
++          ;;
+           *)
+           CATOBJEXT=.mo
+             DATADIRNAME=lib
+--
+2.17.1
+
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +11 -11
index d22a646c5de..b02169e09ba 100644
@@ -1,4 +1,4 @@
-From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00 2001
+From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 13 Feb 2019 15:32:05 +0100
 Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  4 files changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 028b196..217ccb1 100644
+index 95aafc1..9025eb2 100644
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -12,7 +12,7 @@ test_c_args = [
-   '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()),
+@@ -13,7 +13,7 @@ test_c_args = [
+   '-UG_DISABLE_ASSERT',
  ]
 
 -if host_machine.system() == 'windows'
@@ -26,7 +26,7 @@ index 028b196..217ccb1 100644
    common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
  endif
 
-@@ -119,7 +119,7 @@ if dbus1_dep.found()
+@@ -120,7 +120,7 @@ if dbus1_dep.found()
  endif
 
  #  Test programs buildable on UNIX only
@@ -35,7 +35,7 @@ index 028b196..217ccb1 100644
    gio_tests += {
      'file' : {},
      'gdbus-peer' : {
-@@ -327,7 +327,7 @@ if host_machine.system() != 'windows'
+@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
  endif # unix
 
  #  Test programs buildable on Windows only
@@ -44,7 +44,7 @@ index 028b196..217ccb1 100644
    gio_tests += {'win32-streams' : {}}
  endif
 
-@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
+@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
    }
  endif
 
@@ -54,7 +54,7 @@ index 028b196..217ccb1 100644
      'gdbus-example-unix-fd-client' : {
        'install' : false,
 diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index d54fc41..a4761fe 100644
+index c47133f..cad975f 100644
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
 @@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
@@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644
      glib_tests += {
        'gpoll' : {
 diff --git a/meson.build b/meson.build
-index a745024..e87eae5 100644
+index 717d1bc..2a3beb8 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -31,6 +31,9 @@ else
+@@ -32,6 +32,9 @@ else
  endif
 
  host_system = host_machine.system()
@@ -81,7 +81,7 @@ index a745024..e87eae5 100644
  glib_version = meson.project_version()
  glib_api_version = '2.0'
 diff --git a/tests/meson.build b/tests/meson.build
-index 11075dd..cd6067b 100644
+index ce30442..5710f2c 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
 @@ -66,7 +66,7 @@ test_extra_programs = {
meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch deleted +0 -62
deleted file mode 100644
index d1ed028759a..00000000000
@@ -1,62 +0,0 @@
-Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Wed, 13 Mar 2019 16:22:09 +0000
-Subject: [PATCH] meson: do a build-time check for strlcpy before attempting
- runtime check
-
-In cross-compilation environments the runtime check isn't possible so it is up
-to the builder to seed the cross file, but we can definitely state that strlcpy
-doesn't exist with a build test.
----
- meson.build | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 15039e448..414f2d9b1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1860,22 +1860,24 @@ endif
-
- # Test if we have strlcpy/strlcat with a compatible implementation:
- # https://bugzilla.gnome.org/show_bug.cgi?id=53933
--if cc_can_run
--  rres = cc.run('''#include <stdlib.h>
--                   #include <string.h>
--                   int main() {
--                     char p[10];
--                     (void) strlcpy (p, "hi", 10);
--                     if (strlcat (p, "bye", 0) != 3)
--                       return 1;
--                     return 0;
--                   }''',
--                name : 'OpenBSD strlcpy/strlcat')
--  if rres.compiled() and rres.returncode() == 0
-+if cc.has_function('strlcpy')
-+  if cc_can_run
-+    rres = cc.run('''#include <stdlib.h>
-+                    #include <string.h>
-+                    int main() {
-+                      char p[10];
-+                      (void) strlcpy (p, "hi", 10);
-+                      if (strlcat (p, "bye", 0) != 3)
-+                        return 1;
-+                      return 0;
-+                    }''',
-+                  name : 'OpenBSD strlcpy/strlcat')
-+    if rres.compiled() and rres.returncode() == 0
-+      glib_conf.set('HAVE_STRLCPY', 1)
-+    endif
-+  elif meson.get_cross_property('have_strlcpy', false)
-     glib_conf.set('HAVE_STRLCPY', 1)
-   endif
--elif meson.get_cross_property('have_strlcpy', false)
--  glib_conf.set('HAVE_STRLCPY', 1)
- endif
-
- python = import('python').find_installation('python3')
---
-2.11.0
-
meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch deleted +0 -27
deleted file mode 100644
index 5a1a5898908..00000000000
@@ -1,27 +0,0 @@
-From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 19 Feb 2019 10:31:11 +0100
-Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system
-
-OE build system can set this to other values that include 'linux',
-e.g. 'linux-gnueabi'
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 4348f20..af5ed63 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1574,7 +1574,7 @@ atomicdefine = '''
- # We know that we can always use real ("lock free") atomic operations with MSVC
- if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
-   have_atomic_lock_free = true
--  if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
-+  if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define')
-     # When building for armv5 on Linux, gcc provides
-     # __sync_bool_compare_and_swap but doesn't define
-     # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +4 -4
index 380bee086c0..7e9925845bb 100644
@@ -1,4 +1,4 @@
-From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00 2001
+From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 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,10 +19,10 @@ 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 b92162d..fce9933 100644
+index 1007abd..5380982 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -40,6 +40,8 @@
+@@ -44,6 +44,8 @@
  #include "gnetworkmonitor.h"
  #ifdef G_OS_WIN32
  #include "gregistrysettingsbackend.h"
@@ -31,7 +31,7 @@ index b92162d..fce9933 100644
  #endif
  #include <glib/gstdio.h>
 
-@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
+@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
  #endif
        g_free (install_dir);
  #else
meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch deleted +0 -22
deleted file mode 100644
index 7aa6217d693..00000000000
@@ -1,22 +0,0 @@
-Fix DATADIRNAME on uclibc/Linux
-
-translation files are always installed under PREFIX/share/locale in uclibc
-based systems therefore lets set DATADIRNAME to "share".
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Pending
-Index: glib-2.46.1/m4macros/glib-gettext.m4
-===================================================================
---- glib-2.46.1.orig/m4macros/glib-gettext.m4
-+++ glib-2.46.1/m4macros/glib-gettext.m4
-@@ -243,6 +243,10 @@ msgstr ""
-           CATOBJEXT=.mo
-             DATADIRNAME=share
-           ;;
-+          *-*-musl* | *-*-linux-uclibc*)
-+          CATOBJEXT=.gmo
-+            DATADIRNAME=share
-+          ;;
-           *)
-           CATOBJEXT=.mo
-             DATADIRNAME=lib
meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +3 -5
similarity index 69%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
index 740473719d8..6d841ec9d9b 100644
@@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://run-ptest \
-           file://uclibc_musl_translation.patch \
+           file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
            file://Enable-more-tests-while-cross-compiling.patch \
            file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
            file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
@@ -14,12 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0010-Do-not-hardcode-python-path-into-various-tools.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 \
            "
 
 SRC_URI_append_class-native = " file://relocate-modules.patch"
 SRC_URI_append_class-target = " file://glib-meson.cross"
 
-SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde"
-SRC_URI[sha256sum] = "8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310"
+SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649"
+SRC_URI[sha256sum] = "3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df"
meta/recipes-core/glib-2.0/glib.inc +2 -1
index 3ae22f5e807..8b95f212047 100644
@@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\
             ${PN}-locale-pl \
             ${PN}-locale-ru \
             ${PN}-locale-th \
+            python3-core \
+            python3-modules \
            "
 
 RDEPENDS_${PN}-ptest_append_libc-glibc = "\
--

2.17.1

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

#7 lore raw

Re: [PATCH 05/19] glib-2.0: upgrade to 2.62.1

In reply to Alexander Kanavin
Quoted 6 lines · Alexander Kanavin

Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before- attem.patch
and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch where
upstream has removed the problematic bit.

I have sent a patch to fix clang/atomics build on top of this.
https://patchwork.openembedded.org/patch/165753/

Quoted 493 lines
---
 ...t-write-bindir-into-pkg-config-files.patch | 31 +++++++---
 ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 ++++++++++
 ...-correctly-when-building-with-mingw3.patch | 22 +++----
 ...-time-check-for-strlcpy-before-attem.patch | 62 ---------------
----
 ...ot-hardcode-linux-as-the-host-system.patch | 27 --------
 .../glib-2.0/glib-2.0/relocate-modules.patch  |  8 +--
 .../glib-2.0/uclibc_musl_translation.patch    | 22 -------
 ...{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} |  8 +--
 meta/recipes-core/glib-2.0/glib.inc           |  2 +
 9 files changed, 75 insertions(+), 141 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-
DATADIRNAME-on-uclibc-Linux.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson-
do-a-build-time-check-for-strlcpy-before-attem.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-
meson.build-do-not-hardcode-linux-as-the-host-system.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-
2.0/uclibc_musl_translation.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.7.bb => glib-

2.0_2.62.1.bb} (69%)

(quoted diff) +0 -0

bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib- 2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index ede29c90bab..edac4c9f75d 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir- into-pkg-config-files.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir- into-pkg-config-files.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00

2001
+From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <[email protected]>
Date: Fri, 15 Feb 2019 11:17:27 +0100
Subject: [PATCH] Do not write $bindir into pkg-config files

(quoted diff) +0 -0
@@ -9,33 +9,44 @@ rather than use target paths).
 
 Upstream-Status: Inappropriate [upstream wants the paths in .pc

files]

meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +6 -5
+
 ---
- gio/meson.build  | 6 +++---
- glib/meson.build | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ gio/meson.build  | 16 ++++++++--------
+ glib/meson.build |  6 +++---
+ 2 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/gio/meson.build b/gio/meson.build
-index 85d8b14..657720a 100644
+index 71e88c4..8ce3987 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
+@@ -831,14 +831,14 @@ pkg.generate(libgio,
                 'schemasdir=' + join_paths('${datadir}',

schemas_subdir),

                 'bindir=' + join_paths('${prefix}',
get_option('bindir')),
                 'giomoduledir=' + giomodulesdir,
+-               'gio=' + join_paths('${bindir}', 'gio'),
+-               'gio_querymodules=' + join_paths('${bindir}', 'gio-

querymodules'),
- 'glib_compile_schemas=' + join_paths('${bindir}',
'glib-compile-schemas'),
- 'glib_compile_resources=' + join_paths('${bindir}',
'glib-compile-resources'),
-- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-
codegen')],

+-               'gdbus=' + join_paths('${bindir}', 'gdbus'),
+-               'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-
codegen'),
+-               'gresource=' + join_paths('${bindir}', 'gresource'),
+-               'gsettings=' + join_paths('${bindir}',
'gsettings')],
++               'gio=gio',
++               'gio_querymodules=gio-querymodules',
 +               'glib_compile_schemas=glib-compile-schemas',
 +               'glib_compile_resources=glib-compile-resources',
-+               'gdbus_codegen=gdbus-codegen'],
++               'gdbus=gdbus',
++               'gdbus_codegen=gdbus-codegen',
++               'gresource=gresource',
++               'gsettings=gsettings'],

version : glib_version,
install_dir : glib_pkgconfigreldir,
filebase : 'gio-2.0',
diff --git a/glib/meson.build b/glib/meson.build

meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +2 -2
-index c05c694..434e8b1 100644
+index 91a48f1..978fb73 100644
 --- a/glib/meson.build
 +++ b/glib/meson.build
-@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
+@@ -375,9 +375,9 @@ pkg.generate(libglib,
    subdirs : ['glib-2.0'],
    extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
    variables : ['bindir=' + join_paths('${prefix}',

get_option('bindir')),

(quoted diff) +0 -0

DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib- 2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
new file mode 100644
index 00000000000..d8cf269bb8e

meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on- new file +0 -0

uclibc-Linux.patch

meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on- new file +1 -0
@@ -0,0 +1,34 @@
+From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00

2001

meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on- new file +5 -0
+From: Khem Raj <[email protected]>
+Date: Sat, 15 Mar 2014 22:42:29 -0700
+Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
+
+translation files are always installed under PREFIX/share/locale in

uclibc

meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on- new file +28 -0
+based systems therefore lets set DATADIRNAME to "share".
+
+Signed-off-by: Khem Raj <[email protected]>
+Upstream-Status: Pending
+
+%% original patch: uclibc_musl_translation.patch
+---
+ m4macros/glib-gettext.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
+index df6fbf0..47db864 100644
+--- a/m4macros/glib-gettext.m4
++++ b/m4macros/glib-gettext.m4
+@@ -293,6 +293,10 @@ msgstr ""
+ 	    CATOBJEXT=.mo
+             DATADIRNAME=share
+ 	    ;;
++	    *-*-musl* | *-*-linux-uclibc*)
++	    CATOBJEXT=.gmo
++            DATADIRNAME=share
++	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+             DATADIRNAME=lib
+-- 
+2.17.1
+
(quoted diff) +0 -0

host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine- correctly-when-building-with-mingw3.patch
index d22a646c5de..b02169e09ba 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine- correctly-when-building-with-mingw3.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine- correctly-when-building-with-mingw3.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00

2001
+From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <[email protected]>
Date: Wed, 13 Feb 2019 15:32:05 +0100
Subject: [PATCH] Set host_machine correctly when building with
mingw32

(quoted diff) +0 -0
@@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <

[email protected]>

  4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gio/tests/meson.build b/gio/tests/meson.build

meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +1 -3
-index 028b196..217ccb1 100644
+index 95aafc1..9025eb2 100644
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -12,7 +12,7 @@ test_c_args = [
-   '-

DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()) ,
+@@ -13,7 +13,7 @@ test_c_args = [

meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +1 -0
+   '-UG_DISABLE_ASSERT',
  ]
 
 -if host_machine.system() == 'windows'
@@ -26,7 +26,7 @@ index 028b196..217ccb1 100644
    common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library

('secur32')]
endif

-@@ -119,7 +119,7 @@ if dbus1_dep.found()
+@@ -120,7 +120,7 @@ if dbus1_dep.found()
endif

# Test programs buildable on UNIX only

meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +2 -2
@@ -35,7 +35,7 @@ index 028b196..217ccb1 100644
    gio_tests += {
      'file' : {},
      'gdbus-peer' : {
-@@ -327,7 +327,7 @@ if host_machine.system() != 'windows'
+@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
  endif # unix
 
  #  Test programs buildable on Windows only
@@ -44,7 +44,7 @@ index 028b196..217ccb1 100644
    gio_tests += {'win32-streams' : {}}
  endif
 
-@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
+@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() !=

'clang-cl'

    }

endif

meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +4 -4
@@ -54,7 +54,7 @@ index 028b196..217ccb1 100644
      'gdbus-example-unix-fd-client' : {
        'install' : false,
 diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index d54fc41..a4761fe 100644
+index c47133f..cad975f 100644
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
 @@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
@@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644
      glib_tests += {
        'gpoll' : {
 diff --git a/meson.build b/meson.build
-index a745024..e87eae5 100644
+index 717d1bc..2a3beb8 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -31,6 +31,9 @@ else
+@@ -32,6 +32,9 @@ else
  endif
 
  host_system = host_machine.system()
@@ -81,7 +81,7 @@ index a745024..e87eae5 100644
  glib_version = meson.project_version()
  glib_api_version = '2.0'
 diff --git a/tests/meson.build b/tests/meson.build
-index 11075dd..cd6067b 100644
+index ce30442..5710f2c 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
 @@ -66,7 +66,7 @@ test_extra_programs = {
(quoted diff) +0 -0

build-time-check-for-strlcpy-before-attem.patch b/meta/recipes- core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy- before-attem.patch
deleted file mode 100644
index d1ed028759a..00000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time- check-for-strlcpy-before-attem.patch
+++ /dev/null

meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch deleted +0 -4
@@ -1,62 +0,0 @@
-Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00

2001

meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch deleted +0 -3
-From: Ross Burton <[email protected]>
-Date: Wed, 13 Mar 2019 16:22:09 +0000
-Subject: [PATCH] meson: do a build-time check for strlcpy before

attempting
- runtime check

(quoted diff) +0 -2
-
-In cross-compilation environments the runtime check isn't possible

so it is up
-to the builder to seed the cross file, but we can definitely state that strlcpy

meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch deleted +0 -51
-doesn't exist with a build test.
----
- meson.build | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 15039e448..414f2d9b1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1860,22 +1860,24 @@ endif
- 
- # Test if we have strlcpy/strlcat with a compatible implementation:
- # https://bugzilla.gnome.org/show_bug.cgi?id=53933
--if cc_can_run
--  rres = cc.run('''#include <stdlib.h>
--                   #include <string.h>
--                   int main() {
--                     char p[10];
--                     (void) strlcpy (p, "hi", 10);
--                     if (strlcat (p, "bye", 0) != 3)
--                       return 1;
--                     return 0;
--                   }''',
--                name : 'OpenBSD strlcpy/strlcat')
--  if rres.compiled() and rres.returncode() == 0
-+if cc.has_function('strlcpy')
-+  if cc_can_run
-+    rres = cc.run('''#include <stdlib.h>
-+                    #include <string.h>
-+                    int main() {
-+                      char p[10];
-+                      (void) strlcpy (p, "hi", 10);
-+                      if (strlcat (p, "bye", 0) != 3)
-+                        return 1;
-+                      return 0;
-+                    }''',
-+                  name : 'OpenBSD strlcpy/strlcat')
-+    if rres.compiled() and rres.returncode() == 0
-+      glib_conf.set('HAVE_STRLCPY', 1)
-+    endif
-+  elif meson.get_cross_property('have_strlcpy', false)
-     glib_conf.set('HAVE_STRLCPY', 1)
-   endif
--elif meson.get_cross_property('have_strlcpy', false)
--  glib_conf.set('HAVE_STRLCPY', 1)
- endif
- 
- python = import('python').find_installation('python3')
--- 
-2.11.0
-
(quoted diff) +0 -0

not-hardcode-linux-as-the-host-system.patch b/meta/recipes-core/glib- 2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host- system.patch
deleted file mode 100644
index 5a1a5898908..00000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not- hardcode-linux-as-the-host-system.patch
+++ /dev/null

(quoted diff) +0 -1
@@ -1,27 +0,0 @@
-From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00

2001

meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch deleted +0 -3
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 19 Feb 2019 10:31:11 +0100
-Subject: [PATCH] meson.build: do not hardcode 'linux' as the host

system

meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch deleted +0 -16
-
-OE build system can set this to other values that include 'linux',
-e.g. 'linux-gnueabi'
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 4348f20..af5ed63 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1574,7 +1574,7 @@ atomicdefine = '''
- # We know that we can always use real ("lock free") atomic

operations with MSVC
- if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
- have_atomic_lock_free = true
-- if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
-+ if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define')

meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch deleted +0 -3
-     # When building for armv5 on Linux, gcc provides
-     # __sync_bool_compare_and_swap but doesn't define
-     # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
(quoted diff) +0 -0

modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate- modules.patch
index 380bee086c0..7e9925845bb 100644

meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +0 -1
@@ -1,4 +1,4 @@
-From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00

2001
+From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 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

meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +0 -0
@@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <

[email protected]>

  1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gio/giomodule.c b/gio/giomodule.c

meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +3 -3
-index b92162d..fce9933 100644
+index 1007abd..5380982 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -40,6 +40,8 @@
+@@ -44,6 +44,8 @@
  #include "gnetworkmonitor.h"
  #ifdef G_OS_WIN32
  #include "gregistrysettingsbackend.h"
@@ -31,7 +31,7 @@ index b92162d..fce9933 100644
  #endif
  #include <glib/gstdio.h>
 
-@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
+@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
  #endif
        g_free (install_dir);
  #else
(quoted diff) +0 -0

2.0/uclibc_musl_translation.patch b/meta/recipes-core/glib-2.0/glib- 2.0/uclibc_musl_translation.patch
deleted file mode 100644
index 7aa6217d693..00000000000
--- a/meta/recipes-core/glib-2.0/glib- 2.0/uclibc_musl_translation.patch
+++ /dev/null

meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch deleted +0 -3
@@ -1,22 +0,0 @@
-Fix DATADIRNAME on uclibc/Linux
-
-translation files are always installed under PREFIX/share/locale in

uclibc

meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch deleted +0 -19
-based systems therefore lets set DATADIRNAME to "share".
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Pending
-Index: glib-2.46.1/m4macros/glib-gettext.m4
-===================================================================
---- glib-2.46.1.orig/m4macros/glib-gettext.m4
-+++ glib-2.46.1/m4macros/glib-gettext.m4
-@@ -243,6 +243,10 @@ msgstr ""
- 	    CATOBJEXT=.mo
-             DATADIRNAME=share
- 	    ;;
-+	    *-*-musl* | *-*-linux-uclibc*)
-+	    CATOBJEXT=.gmo
-+            DATADIRNAME=share
-+	    ;;
- 	    *)
- 	    CATOBJEXT=.mo
-             DATADIRNAME=lib
meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +1 -1
similarity index 69%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
index 740473719d8..6d841ec9d9b 100644
@@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://run-ptest \
-           file://uclibc_musl_translation.patch \
+           file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
            file://Enable-more-tests-while-cross-compiling.patch \
            file://0001-Remove-the-warning-about-deprecated-paths-in-
 schemas.patch \
            file://0001-Install-gio-querymodules-as-

libexec_PROGRAM.patch \

meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +0 -2
@@ -14,12 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-
 ${PV}.tar.xz \
            file://0010-Do-not-hardcode-python-path-into-various-
 tools.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 \
            "

SRC_URI_append_class-native = " file://relocate-modules.patch" SRC_URI_append_class-target = " file://glib-meson.cross"

meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +0 -2
-SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde"
-SRC_URI[sha256sum] =

"8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310"

meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +2 -0
+SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649"
+SRC_URI[sha256sum] =

"3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df"

meta/recipes- renamed from meta/recipes-core/glib-2.0/glib.inc +0 -0

core/glib-2.0/glib.inc
index 3ae22f5e807..8b95f212047 100644

meta/recipes-core/glib-2.0/glib.inc +2 -0
@@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\
             ${PN}-locale-pl \
             ${PN}-locale-ru \
             ${PN}-locale-th \
+            python3-core \
+            python3-modules \
            "
 
 RDEPENDS_${PN}-ptest_append_libc-glibc = "\
Signature · 1 line
2.17.1
#8 lore raw

Re: [PATCH 05/19] glib-2.0: upgrade to 2.62.1

In reply to Alexander Kanavin

libmbim/qemuarm fails too with following error

| ../../../libmbim-1.18.0/src/libmbim-glib/mbim-proxy.c: In function 'mbim_proxy_init':
| ../../../libmbim-1.18.0/src/libmbim-glib/mbim-proxy.c:1446:13: error:
G_ADD_PRIVATE [-Werror]

|  1446
|                                               MbimProxyPrivate);
|       |             ^
| cc1: all warnings being treated as errors
| Makefile:670: recipe for target 'libmbim_glib_core_la-mbim-proxy.lo'

failed
| make[4]: *** [libmbim_glib_core_la-mbim-proxy.lo] Error 1 | make[4]: Leaving directory '/home/jenkins/oe/world/yoe/build/tmpfs/work/armv7vet2hf-neon-yoe- linux-gnueabi/libmbim/1.18.0-r0/build/src/libmbim-glib'

Quoted 499 lines · Alexander Kanavin

Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before- attem.patch
and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch where
upstream has removed the problematic bit.

---
 ...t-write-bindir-into-pkg-config-files.patch | 31 +++++++---
 ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 ++++++++++
 ...-correctly-when-building-with-mingw3.patch | 22 +++----
 ...-time-check-for-strlcpy-before-attem.patch | 62 ---------------
----
 ...ot-hardcode-linux-as-the-host-system.patch | 27 --------
 .../glib-2.0/glib-2.0/relocate-modules.patch  |  8 +--
 .../glib-2.0/uclibc_musl_translation.patch    | 22 -------
 ...{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} |  8 +--
 meta/recipes-core/glib-2.0/glib.inc           |  2 +
 9 files changed, 75 insertions(+), 141 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-
DATADIRNAME-on-uclibc-Linux.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson-
do-a-build-time-check-for-strlcpy-before-attem.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-
meson.build-do-not-hardcode-linux-as-the-host-system.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-
2.0/uclibc_musl_translation.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.7.bb => glib-

2.0_2.62.1.bb} (69%)

(quoted diff) +0 -0

bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib- 2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index ede29c90bab..edac4c9f75d 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir- into-pkg-config-files.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir- into-pkg-config-files.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00

2001
+From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <[email protected]>
Date: Fri, 15 Feb 2019 11:17:27 +0100
Subject: [PATCH] Do not write $bindir into pkg-config files

(quoted diff) +0 -0
@@ -9,33 +9,44 @@ rather than use target paths).
 
 Upstream-Status: Inappropriate [upstream wants the paths in .pc

files]

meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +6 -5
+
 ---
- gio/meson.build  | 6 +++---
- glib/meson.build | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ gio/meson.build  | 16 ++++++++--------
+ glib/meson.build |  6 +++---
+ 2 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/gio/meson.build b/gio/meson.build
-index 85d8b14..657720a 100644
+index 71e88c4..8ce3987 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
+@@ -831,14 +831,14 @@ pkg.generate(libgio,
                 'schemasdir=' + join_paths('${datadir}',

schemas_subdir),

                 'bindir=' + join_paths('${prefix}',
get_option('bindir')),
                 'giomoduledir=' + giomodulesdir,
+-               'gio=' + join_paths('${bindir}', 'gio'),
+-               'gio_querymodules=' + join_paths('${bindir}', 'gio-

querymodules'),
- 'glib_compile_schemas=' + join_paths('${bindir}',
'glib-compile-schemas'),
- 'glib_compile_resources=' + join_paths('${bindir}',
'glib-compile-resources'),
-- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-
codegen')],

+-               'gdbus=' + join_paths('${bindir}', 'gdbus'),
+-               'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-
codegen'),
+-               'gresource=' + join_paths('${bindir}', 'gresource'),
+-               'gsettings=' + join_paths('${bindir}',
'gsettings')],
++               'gio=gio',
++               'gio_querymodules=gio-querymodules',
 +               'glib_compile_schemas=glib-compile-schemas',
 +               'glib_compile_resources=glib-compile-resources',
-+               'gdbus_codegen=gdbus-codegen'],
++               'gdbus=gdbus',
++               'gdbus_codegen=gdbus-codegen',
++               'gresource=gresource',
++               'gsettings=gsettings'],

version : glib_version,
install_dir : glib_pkgconfigreldir,
filebase : 'gio-2.0',
diff --git a/glib/meson.build b/glib/meson.build

meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +2 -2
-index c05c694..434e8b1 100644
+index 91a48f1..978fb73 100644
 --- a/glib/meson.build
 +++ b/glib/meson.build
-@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
+@@ -375,9 +375,9 @@ pkg.generate(libglib,
    subdirs : ['glib-2.0'],
    extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
    variables : ['bindir=' + join_paths('${prefix}',

get_option('bindir')),

(quoted diff) +0 -0

DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib- 2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
new file mode 100644
index 00000000000..d8cf269bb8e

meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on- new file +0 -0

uclibc-Linux.patch

meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on- new file +1 -0
@@ -0,0 +1,34 @@
+From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00

2001

meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on- new file +5 -0
+From: Khem Raj <[email protected]>
+Date: Sat, 15 Mar 2014 22:42:29 -0700
+Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
+
+translation files are always installed under PREFIX/share/locale in

uclibc

meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on- new file +28 -0
+based systems therefore lets set DATADIRNAME to "share".
+
+Signed-off-by: Khem Raj <[email protected]>
+Upstream-Status: Pending
+
+%% original patch: uclibc_musl_translation.patch
+---
+ m4macros/glib-gettext.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
+index df6fbf0..47db864 100644
+--- a/m4macros/glib-gettext.m4
++++ b/m4macros/glib-gettext.m4
+@@ -293,6 +293,10 @@ msgstr ""
+ 	    CATOBJEXT=.mo
+             DATADIRNAME=share
+ 	    ;;
++	    *-*-musl* | *-*-linux-uclibc*)
++	    CATOBJEXT=.gmo
++            DATADIRNAME=share
++	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+             DATADIRNAME=lib
+-- 
+2.17.1
+
(quoted diff) +0 -0

host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine- correctly-when-building-with-mingw3.patch
index d22a646c5de..b02169e09ba 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine- correctly-when-building-with-mingw3.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine- correctly-when-building-with-mingw3.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00

2001
+From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <[email protected]>
Date: Wed, 13 Feb 2019 15:32:05 +0100
Subject: [PATCH] Set host_machine correctly when building with
mingw32

(quoted diff) +0 -0
@@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <

[email protected]>

  4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gio/tests/meson.build b/gio/tests/meson.build

meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +1 -3
-index 028b196..217ccb1 100644
+index 95aafc1..9025eb2 100644
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -12,7 +12,7 @@ test_c_args = [
-   '-

DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()) ,
+@@ -13,7 +13,7 @@ test_c_args = [

meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +1 -0
+   '-UG_DISABLE_ASSERT',
  ]
 
 -if host_machine.system() == 'windows'
@@ -26,7 +26,7 @@ index 028b196..217ccb1 100644
    common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library

('secur32')]
endif

-@@ -119,7 +119,7 @@ if dbus1_dep.found()
+@@ -120,7 +120,7 @@ if dbus1_dep.found()
endif

# Test programs buildable on UNIX only

meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +2 -2
@@ -35,7 +35,7 @@ index 028b196..217ccb1 100644
    gio_tests += {
      'file' : {},
      'gdbus-peer' : {
-@@ -327,7 +327,7 @@ if host_machine.system() != 'windows'
+@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
  endif # unix
 
  #  Test programs buildable on Windows only
@@ -44,7 +44,7 @@ index 028b196..217ccb1 100644
    gio_tests += {'win32-streams' : {}}
  endif
 
-@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
+@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() !=

'clang-cl'

    }

endif

meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +4 -4
@@ -54,7 +54,7 @@ index 028b196..217ccb1 100644
      'gdbus-example-unix-fd-client' : {
        'install' : false,
 diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index d54fc41..a4761fe 100644
+index c47133f..cad975f 100644
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
 @@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
@@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644
      glib_tests += {
        'gpoll' : {
 diff --git a/meson.build b/meson.build
-index a745024..e87eae5 100644
+index 717d1bc..2a3beb8 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -31,6 +31,9 @@ else
+@@ -32,6 +32,9 @@ else
  endif
 
  host_system = host_machine.system()
@@ -81,7 +81,7 @@ index a745024..e87eae5 100644
  glib_version = meson.project_version()
  glib_api_version = '2.0'
 diff --git a/tests/meson.build b/tests/meson.build
-index 11075dd..cd6067b 100644
+index ce30442..5710f2c 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
 @@ -66,7 +66,7 @@ test_extra_programs = {
(quoted diff) +0 -0

build-time-check-for-strlcpy-before-attem.patch b/meta/recipes- core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy- before-attem.patch
deleted file mode 100644
index d1ed028759a..00000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time- check-for-strlcpy-before-attem.patch
+++ /dev/null

meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch deleted +0 -4
@@ -1,62 +0,0 @@
-Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00

2001

meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch deleted +0 -3
-From: Ross Burton <[email protected]>
-Date: Wed, 13 Mar 2019 16:22:09 +0000
-Subject: [PATCH] meson: do a build-time check for strlcpy before

attempting
- runtime check

(quoted diff) +0 -2
-
-In cross-compilation environments the runtime check isn't possible

so it is up
-to the builder to seed the cross file, but we can definitely state that strlcpy

meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch deleted +0 -51
-doesn't exist with a build test.
----
- meson.build | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 15039e448..414f2d9b1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1860,22 +1860,24 @@ endif
- 
- # Test if we have strlcpy/strlcat with a compatible implementation:
- # https://bugzilla.gnome.org/show_bug.cgi?id=53933
--if cc_can_run
--  rres = cc.run('''#include <stdlib.h>
--                   #include <string.h>
--                   int main() {
--                     char p[10];
--                     (void) strlcpy (p, "hi", 10);
--                     if (strlcat (p, "bye", 0) != 3)
--                       return 1;
--                     return 0;
--                   }''',
--                name : 'OpenBSD strlcpy/strlcat')
--  if rres.compiled() and rres.returncode() == 0
-+if cc.has_function('strlcpy')
-+  if cc_can_run
-+    rres = cc.run('''#include <stdlib.h>
-+                    #include <string.h>
-+                    int main() {
-+                      char p[10];
-+                      (void) strlcpy (p, "hi", 10);
-+                      if (strlcat (p, "bye", 0) != 3)
-+                        return 1;
-+                      return 0;
-+                    }''',
-+                  name : 'OpenBSD strlcpy/strlcat')
-+    if rres.compiled() and rres.returncode() == 0
-+      glib_conf.set('HAVE_STRLCPY', 1)
-+    endif
-+  elif meson.get_cross_property('have_strlcpy', false)
-     glib_conf.set('HAVE_STRLCPY', 1)
-   endif
--elif meson.get_cross_property('have_strlcpy', false)
--  glib_conf.set('HAVE_STRLCPY', 1)
- endif
- 
- python = import('python').find_installation('python3')
--- 
-2.11.0
-
(quoted diff) +0 -0

not-hardcode-linux-as-the-host-system.patch b/meta/recipes-core/glib- 2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host- system.patch
deleted file mode 100644
index 5a1a5898908..00000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not- hardcode-linux-as-the-host-system.patch
+++ /dev/null

(quoted diff) +0 -1
@@ -1,27 +0,0 @@
-From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00

2001

meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch deleted +0 -3
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 19 Feb 2019 10:31:11 +0100
-Subject: [PATCH] meson.build: do not hardcode 'linux' as the host

system

meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch deleted +0 -16
-
-OE build system can set this to other values that include 'linux',
-e.g. 'linux-gnueabi'
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 4348f20..af5ed63 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1574,7 +1574,7 @@ atomicdefine = '''
- # We know that we can always use real ("lock free") atomic

operations with MSVC
- if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
- have_atomic_lock_free = true
-- if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
-+ if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define')

meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch deleted +0 -3
-     # When building for armv5 on Linux, gcc provides
-     # __sync_bool_compare_and_swap but doesn't define
-     # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
(quoted diff) +0 -0

modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate- modules.patch
index 380bee086c0..7e9925845bb 100644

meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +0 -1
@@ -1,4 +1,4 @@
-From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00

2001
+From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 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

meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +0 -0
@@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <

[email protected]>

  1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gio/giomodule.c b/gio/giomodule.c

meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +3 -3
-index b92162d..fce9933 100644
+index 1007abd..5380982 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -40,6 +40,8 @@
+@@ -44,6 +44,8 @@
  #include "gnetworkmonitor.h"
  #ifdef G_OS_WIN32
  #include "gregistrysettingsbackend.h"
@@ -31,7 +31,7 @@ index b92162d..fce9933 100644
  #endif
  #include <glib/gstdio.h>
 
-@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
+@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
  #endif
        g_free (install_dir);
  #else
(quoted diff) +0 -0

2.0/uclibc_musl_translation.patch b/meta/recipes-core/glib-2.0/glib- 2.0/uclibc_musl_translation.patch
deleted file mode 100644
index 7aa6217d693..00000000000
--- a/meta/recipes-core/glib-2.0/glib- 2.0/uclibc_musl_translation.patch
+++ /dev/null

meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch deleted +0 -3
@@ -1,22 +0,0 @@
-Fix DATADIRNAME on uclibc/Linux
-
-translation files are always installed under PREFIX/share/locale in

uclibc

meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch deleted +0 -19
-based systems therefore lets set DATADIRNAME to "share".
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Pending
-Index: glib-2.46.1/m4macros/glib-gettext.m4
-===================================================================
---- glib-2.46.1.orig/m4macros/glib-gettext.m4
-+++ glib-2.46.1/m4macros/glib-gettext.m4
-@@ -243,6 +243,10 @@ msgstr ""
- 	    CATOBJEXT=.mo
-             DATADIRNAME=share
- 	    ;;
-+	    *-*-musl* | *-*-linux-uclibc*)
-+	    CATOBJEXT=.gmo
-+            DATADIRNAME=share
-+	    ;;
- 	    *)
- 	    CATOBJEXT=.mo
-             DATADIRNAME=lib
meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +1 -1
similarity index 69%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
index 740473719d8..6d841ec9d9b 100644
@@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://run-ptest \
-           file://uclibc_musl_translation.patch \
+           file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
            file://Enable-more-tests-while-cross-compiling.patch \
            file://0001-Remove-the-warning-about-deprecated-paths-in-
 schemas.patch \
            file://0001-Install-gio-querymodules-as-

libexec_PROGRAM.patch \

meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +0 -2
@@ -14,12 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-
 ${PV}.tar.xz \
            file://0010-Do-not-hardcode-python-path-into-various-
 tools.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 \
            "

SRC_URI_append_class-native = " file://relocate-modules.patch" SRC_URI_append_class-target = " file://glib-meson.cross"

meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +0 -2
-SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde"
-SRC_URI[sha256sum] =

"8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310"

meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +2 -0
+SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649"
+SRC_URI[sha256sum] =

"3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df"

meta/recipes- renamed from meta/recipes-core/glib-2.0/glib.inc +0 -0

core/glib-2.0/glib.inc
index 3ae22f5e807..8b95f212047 100644

meta/recipes-core/glib-2.0/glib.inc +2 -0
@@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\
             ${PN}-locale-pl \
             ${PN}-locale-ru \
             ${PN}-locale-th \
+            python3-core \
+            python3-modules \
            "
 
 RDEPENDS_${PN}-ptest_append_libc-glibc = "\
Signature · 1 line
2.17.1
#9 lore raw

PATCH 6/19 glib-networking: update to 2.62.1

In reply to Alexander Kanavin
---
 .../{glib-networking_2.60.3.bb => glib-networking_2.62.1.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/glib-networking/{glib-networking_2.60.3.bb => glib-networking_2.62.1.bb} (88%)
meta/recipes-core/glib-networking/glib-networking_2.62.1.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.60.3.bb +2 -2
similarity index 88%
rename from meta/recipes-core/glib-networking/glib-networking_2.60.3.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.62.1.bb
index 0278ab2fb68..81d3fd43d9e 100644
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SECTION = "libs"
 DEPENDS = "glib-2.0"
 
-SRC_URI[archive.md5sum] = "e8fd0462a82269fb4bbd6c07a1e7d0f4"
-SRC_URI[archive.sha256sum] = "d50183046a4ff955d8cc7e953067cdfc94f14dbfda3024bf377ff37a3121dcd5"
+SRC_URI[archive.md5sum] = "64ca1e1e43e623b916059585bf7e4758"
+SRC_URI[archive.sha256sum] = "3c55ae6771ad7a79fa606a834f4686ed555c2774ed6e9ece6f3c0f6a3dab7110"
 
 PACKAGECONFIG ??= "gnutls"
 
Signature · 1 line
2.17.1
#10 lore raw

PATCH 7/19 sysprof: update to 3.34.1

In reply to Alexander Kanavin

0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch is replaced by a meson option.

---
 ...thing-in-help-as-it-requires-itstool.patch | 27 --------------
 ...-Define-NT_GNU_BUILD_ID-if-undefined.patch | 35 +++++++++++++++++++
 .../files/define-NT_GNU_BUILD_ID.patch        | 22 ------------
 .../{sysprof_3.32.0.bb => sysprof_3.34.1.bb}  | 16 +++++----
 4 files changed, 45 insertions(+), 55 deletions(-)
 delete mode 100644 meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
 create mode 100644 meta/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch
 delete mode 100644 meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
 rename meta/recipes-kernel/sysprof/{sysprof_3.32.0.bb => sysprof_3.34.1.bb} (63%)
meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch deleted +0 -27
deleted file mode 100644
index ade51cf864f..00000000000
@@ -1,27 +0,0 @@
-From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 23 Aug 2017 18:38:26 +0300
-Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 3986273..ae2f65e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -164,7 +164,6 @@ subdir('tools')
- subdir('tests')
- 
- subdir('data')
--subdir('help')
- subdir('po')
- 
- meson.add_install_script('build-aux/meson/post_install.sh')
--- 
-2.7.4
-
meta/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch new file +35 -0
new file mode 100644
index 00000000000..75aa86cdbf0
@@ -0,0 +1,35 @@
+From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Mon, 18 Jul 2011 16:00:17 -0700
+Subject: [PATCH 1/2] sysprof: Define NT_GNU_BUILD_ID if undefined
+
+On uclibc elf.h does not have GNU extentions but we need this define
+so we define it locally if its not getting it from elf.h
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Upstream-Status: Pending
+
+%% original patch: define-NT_GNU_BUILD_ID.patch
+---
+ src/libsysprof/elfparser.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/libsysprof/elfparser.h b/src/libsysprof/elfparser.h
+index 160e4c9..94fa5c0 100644
+--- a/src/libsysprof/elfparser.h
++++ b/src/libsysprof/elfparser.h
+@@ -18,6 +18,10 @@
+ 
+ #include <glib.h>
+ 
++#ifndef NT_GNU_BUILD_ID
++#define NT_GNU_BUILD_ID 3
++#endif
++
+ typedef struct ElfSym ElfSym;
+ typedef struct ElfParser ElfParser;
+ 
+-- 
+2.17.1
+
meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch deleted +0 -22
deleted file mode 100644
index f75ddad43a1..00000000000
@@ -1,22 +0,0 @@
-On uclibc elf.h does not have GNU extentions but we need this define
-so we define it locally if its not getting it from elf.h
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Upstream-Status: Pending
-
-Index: git/elfparser.h
-===================================================================
---- git.orig/lib/util/elfparser.h	2011-07-16 18:57:41.000000000 -0700
-+++ git/lib/util/elfparser.h	2011-07-16 20:28:54.733829895 -0700
-@@ -17,6 +17,10 @@
-  */
- #include <glib.h>
- 
-+#ifndef NT_GNU_BUILD_ID
-+#define NT_GNU_BUILD_ID 3
-+#endif
-+
- typedef struct ElfSym ElfSym;
- typedef struct ElfParser ElfParser;
- 
meta/recipes-kernel/sysprof/sysprof_3.34.1.bb renamed from meta/recipes-kernel/sysprof/sysprof_3.32.0.bb +10 -6
similarity index 63%
rename from meta/recipes-kernel/sysprof/sysprof_3.32.0.bb
rename to meta/recipes-kernel/sysprof/sysprof_3.34.1.bb
index b92933806cf..6d04cce5303 100644
@@ -2,23 +2,26 @@ SUMMARY = "System-wide Performance Profiler for Linux"
 HOMEPAGE = "http://www.sysprof.com"
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
+                    file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607"
 
 GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gettext systemd upstream-version-is-even gsettings
 
 DEPENDS = "glib-2.0 libxml2-native glib-2.0-native"
 
-SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af"
-SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d"
+SRC_URI[archive.md5sum] = "cc32455277b31afb1965d627ae3e3629"
+SRC_URI[archive.sha256sum] = "844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0"
 SRC_URI += " \
-           file://define-NT_GNU_BUILD_ID.patch \
-           file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
+           file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \
            "
 
 PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
-PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3"
+PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle"
 PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit"
+PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit"
+
+# Enablig this requries yelp
+EXTRA_OEMESON += "-Dhelp=false"
 
 SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
@@ -28,5 +31,6 @@ SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysp
 FILES_${PN} += " \
                ${datadir}/dbus-1/system-services \
                ${datadir}/dbus-1/system.d \
+               ${datadir}/dbus-1/interfaces \
                ${datadir}/metainfo \
                "
Signature · 1 line
2.17.1
#11 lore raw

PATCH 8/19 epiphany: upgrade 3.32.4 -> 3.34.1

In reply to Alexander Kanavin
---
 .../epiphany/{epiphany_3.32.4.bb => epiphany_3.34.1.bb}       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.32.4.bb => epiphany_3.34.1.bb} (84%)
meta/recipes-gnome/epiphany/epiphany_3.34.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.32.4.bb +2 -2
similarity index 84%
rename from meta/recipes-gnome/epiphany/epiphany_3.32.4.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.34.1.bb
index 44af469942b..f5f086391e5 100644
@@ -13,8 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
 SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            "
-SRC_URI[archive.md5sum] = "6a5eada8a3870ab4d0fcd5168559776f"
-SRC_URI[archive.sha256sum] = "c9a828578301af77ac9f3d3ce253b02f9f3a1561840cc8d74dd5645f92d0a995"
+SRC_URI[archive.md5sum] = "50b50e18d99b19f44cc9cd419c6a4ba8"
+SRC_URI[archive.sha256sum] = "a07bc997ad2cbf14d58557bb0b63e92d8c33683680c5e50ea6f9b53b36bec1d9"
 
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
Signature · 1 line
2.17.1
#12 lore raw

PATCH 9/19 webkitgtk: update 2.24.4 -> 2.26.1

In reply to Alexander Kanavin

Drop patches:
- 0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch - this has been a pain to rebase for a while as upstream keeps shifting and changing the code that needs to be modified. If the issue the patch is addressing is still relevant, please work with upstream to fix it at the source

- 0001-gstreamer-add-a-missing-format-string.patch, narrowing.patch are integrated upstream

- detect-gstreamer-gl.patch is adjusting something that is better done from the yocto package configuration

Add an option to disable an enabled-by-default sandbox that requires a component that oe-core does not have.

---
 ...acros-Append-to-I-and-not-to-isystem.patch | 125 ------------------
 ...streamer-add-a-missing-format-string.patch |  24 ----
 .../webkitgtk/detect-gstreamer-gl.patch       |  20 ---
 .../webkit/webkitgtk/narrowing.patch          |  31 -----
 ...ebkitgtk_2.24.4.bb => webkitgtk_2.26.1.bb} |   9 +-
 5 files changed, 3 insertions(+), 206 deletions(-)
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/narrowing.patch
 rename meta/recipes-sato/webkit/{webkitgtk_2.24.4.bb => webkitgtk_2.26.1.bb} (93%)
meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch deleted +0 -125
deleted file mode 100644
index e71905d26a1..00000000000
@@ -1,125 +0,0 @@
-From d1634e56a2589ec62325011bf77d480a67123b52 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 17 Apr 2016 12:35:41 -0700
-Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
-
-gcc-6 has now introduced stdlib.h in libstdc++ for better
-compliance and its including the C library stdlib.h using
-include_next which is sensitive to order of system header
-include paths. Its infact better to not tinker with the
-system header include paths at all. Since adding /usr/include
-to -system is redundant and compiler knows about it moreover
-now with gcc6 it interferes with compiler's functioning
-and ends up with compile errors e.g.
-
-/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Upstream-Status: Pending
-
----
- Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
- Source/WebCore/PlatformGTK.cmake           | 6 +++---
- Source/WebKit/PlatformGTK.cmake            | 2 +-
- Source/cmake/WebKitMacros.cmake            | 2 +-
- Tools/MiniBrowser/gtk/CMakeLists.txt       | 2 +-
- Tools/TestWebKitAPI/PlatformGTK.cmake      | 2 +-
- 6 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
-index 87153e35..cd0beed4 100644
---- a/Source/JavaScriptCore/shell/CMakeLists.txt
-+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
-@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
- WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
- WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
- include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
- add_executable(jsc ${JSC_SOURCES})
- target_link_libraries(jsc ${JSC_LIBRARIES})
- 
-diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
-index e0dd9cd9..a2997f3e 100644
---- a/Source/WebCore/PlatformGTK.cmake
-+++ b/Source/WebCore/PlatformGTK.cmake
-@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
-     target_include_directories(WebCorePlatformGTK2 PRIVATE
-         ${WebCore_INCLUDE_DIRECTORIES}
-     )
--    target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
-+    target_include_directories(WebCorePlatformGTK2 PRIVATE
-         ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
-         ${GTK2_INCLUDE_DIRS}
-         ${GDK2_INCLUDE_DIRS}
-@@ -190,7 +190,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
- target_include_directories(WebCorePlatformGTK PRIVATE
-     ${WebCore_INCLUDE_DIRECTORIES}
- )
--target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
-+target_include_directories(WebCorePlatformGTK PRIVATE
-     ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
-     ${GTK_INCLUDE_DIRS}
-     ${GDK_INCLUDE_DIRS}
-@@ -206,7 +206,7 @@ include_directories(
-     "${WEBCORE_DIR}/bindings/gobject/"
- )
- 
--include_directories(SYSTEM
-+include_directories(
-     ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
- )
- 
-diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index 693bbdfe..20e3802f 100644
---- a/Source/WebKit/PlatformGTK.cmake
-+++ b/Source/WebKit/PlatformGTK.cmake
-@@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
-     target_include_directories(WebKitPluginProcess2 PRIVATE
-         ${WebKitCommonIncludeDirectories}
-     )
--    target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
-+    target_include_directories(WebKitPluginProcess2 PRIVATE
-          ${WebKitCommonSystemIncludeDirectories}
-          ${GTK2_INCLUDE_DIRS}
-          ${GDK2_INCLUDE_DIRS}
-diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
-index 6d58d57e..976e2362 100644
---- a/Source/cmake/WebKitMacros.cmake
-+++ b/Source/cmake/WebKitMacros.cmake
-@@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target)
-         ${${_target}_SOURCES}
-     )
-     target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
--    target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
-+    target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
-     target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>")
-     target_link_libraries(${_target} ${${_target}_LIBRARIES})
-     set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
-diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
-index a0d32059..f259ade2 100644
---- a/Tools/MiniBrowser/gtk/CMakeLists.txt
-+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
-@@ -59,7 +59,7 @@ endif ()
- add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
- 
- include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
- add_executable(MiniBrowser ${MiniBrowser_SOURCES})
- target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
- 
-diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
-index 8dd0e146..d037fc35 100644
---- a/Tools/TestWebKitAPI/PlatformGTK.cmake
-+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
-@@ -22,7 +22,7 @@ include_directories(
-     ${WEBKIT_DIR}/UIProcess/API/gtk
- )
- 
--include_directories(SYSTEM
-+include_directories(
-     ${GDK3_INCLUDE_DIRS}
-     ${GLIB_INCLUDE_DIRS}
-     ${GSTREAMER_INCLUDE_DIRS}
meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch deleted +0 -24
deleted file mode 100644
index bd4ac1e3538..00000000000
@@ -1,24 +0,0 @@
-From 2d9687840b97186b80053dd262209e39455ac876 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 8 May 2019 15:31:23 +0200
-Subject: [PATCH] gstreamer: add a missing format string
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- .../platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-index e1e497ee..483fd65c 100644
---- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-@@ -738,7 +738,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
-     WebKitWebSrc* src = WEBKIT_WEB_SRC(element);
- 
- #if GST_CHECK_VERSION(1, 14, 0)
--    GST_DEBUG_OBJECT(src, gst_state_change_get_name(transition));
-+    GST_DEBUG_OBJECT(src, "%s", gst_state_change_get_name(transition));
- #endif
-     switch (transition) {
-     case GST_STATE_CHANGE_READY_TO_NULL:
meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch deleted +0 -20
deleted file mode 100644
index 57ae48c1413..00000000000
@@ -1,20 +0,0 @@
-From: Alberto Garcia <[email protected]>
-Subject: Disable USE_GSTREAMER_GL is the package is not found
-Forwarded: no
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
-Index: webkitgtk/Source/cmake/GStreamerChecks.cmake
-===================================================================
---- webkitgtk.orig/Source/cmake/GStreamerChecks.cmake
-+++ webkitgtk/Source/cmake/GStreamerChecks.cmake
-@@ -43,7 +43,8 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
-             message(FATAL_ERROR "GStreamer 1.10 is needed for USE_GSTREAMER_GL.")
-         else ()
-             if (NOT PC_GSTREAMER_GL_FOUND)
--                message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
-+                set(USE_GSTREAMER_GL OFF)
-+                message(STATUS "GStreamerGL is needed for USE_GSTREAMER_GL.")
-             endif ()
-         endif ()
-     endif ()
meta/recipes-sato/webkit/webkitgtk/narrowing.patch deleted +0 -31
deleted file mode 100644
index 598b6b5df53..00000000000
@@ -1,31 +0,0 @@
-Fix build with clang on arm where char is unsigned
-
-Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197087]
-Signed-off-by: Khem Raj <[email protected]>
-
---- a/Source/WebCore/contentextensions/DFACombiner.cpp
-+++ b/Source/WebCore/contentextensions/DFACombiner.cpp
-@@ -37,7 +37,7 @@ namespace WebCore {
- namespace ContentExtensions {
- 
- class DFAMerger {
--    typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList;
-+    typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList;
- 
-     enum class WhichDFA {
-         A,
---- a/Source/WebCore/contentextensions/NFAToDFA.cpp
-+++ b/Source/WebCore/contentextensions/NFAToDFA.cpp
-@@ -41,9 +41,9 @@ namespace WebCore {
- 
- namespace ContentExtensions {
- 
--typedef MutableRange<char, NFANodeIndexSet> NFANodeRange;
--typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList;
--typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
-+typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange;
-+typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList;
-+typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
- typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList;
- typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures;
- 
meta/recipes-sato/webkit/webkitgtk_2.26.1.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.24.4.bb +3 -6
similarity index 93%
rename from meta/recipes-sato/webkit/webkitgtk_2.24.4.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.26.1.bb
index 8c695ce9e75..77e51e7d290 100644
@@ -17,16 +17,12 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
            file://x32_support.patch \
            file://cross-compile.patch \
-           file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
            file://0001-Fix-build-with-musl.patch \
-           file://detect-gstreamer-gl.patch \
            file://include_array.patch \
-           file://narrowing.patch \
-           file://0001-gstreamer-add-a-missing-format-string.patch \
            "
 
-SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87"
-SRC_URI[sha256sum] = "8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8"
+SRC_URI[md5sum] = "08145bd6c1587230f135921c142bc150"
+SRC_URI[sha256sum] = "6b4b21801d2b1008422a1075dbd6fb4ae8b5127503faf657cf9671289d9cd155"
 
 inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
 
@@ -69,6 +65,7 @@ EXTRA_OECMAKE = " \
 		${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \
 		-DENABLE_MINIBROWSER=ON \
                 -DPYTHON_EXECUTABLE=`which python3` \
+                -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
 		"
 
 # Javascript JIT is not supported on ARC
Signature · 1 line
2.17.1
#13 lore raw

Re: [PATCH 09/19] webkitgtk: update 2.24.4 -> 2.26.1

Quoted 8 lines · Alexander Kanavin

Drop patches:
- 0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch - this has been a pain to rebase for a while as upstream keeps shifting and changing the code that needs to be modified. If the issue the patch is addressing is still relevant, please work with upstream to fix it at the source

IIRC this has already been fixed differently. So dropping it might be fine.

Quoted 289 lines

- 0001-gstreamer-add-a-missing-format-string.patch, narrowing.patch are integrated upstream

- detect-gstreamer-gl.patch is adjusting something that is better done from the yocto package configuration

Add an option to disable an enabled-by-default sandbox that requires a component that oe-core does not have.

---
 ...acros-Append-to-I-and-not-to-isystem.patch | 125 ------------------
 ...streamer-add-a-missing-format-string.patch |  24 ----
 .../webkitgtk/detect-gstreamer-gl.patch       |  20 ---
 .../webkit/webkitgtk/narrowing.patch          |  31 -----
 ...ebkitgtk_2.24.4.bb => webkitgtk_2.26.1.bb} |   9 +-
 5 files changed, 3 insertions(+), 206 deletions(-)
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/narrowing.patch
 rename meta/recipes-sato/webkit/{webkitgtk_2.24.4.bb => webkitgtk_2.26.1.bb} (93%)
meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch deleted +0 -125
deleted file mode 100644
index e71905d26a1..00000000000
@@ -1,125 +0,0 @@
-From d1634e56a2589ec62325011bf77d480a67123b52 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 17 Apr 2016 12:35:41 -0700
-Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
-
-gcc-6 has now introduced stdlib.h in libstdc++ for better
-compliance and its including the C library stdlib.h using
-include_next which is sensitive to order of system header
-include paths. Its infact better to not tinker with the
-system header include paths at all. Since adding /usr/include
-to -system is redundant and compiler knows about it moreover
-now with gcc6 it interferes with compiler's functioning
-and ends up with compile errors e.g.
-
-/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Upstream-Status: Pending
-
----
- Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
- Source/WebCore/PlatformGTK.cmake           | 6 +++---
- Source/WebKit/PlatformGTK.cmake            | 2 +-
- Source/cmake/WebKitMacros.cmake            | 2 +-
- Tools/MiniBrowser/gtk/CMakeLists.txt       | 2 +-
- Tools/TestWebKitAPI/PlatformGTK.cmake      | 2 +-
- 6 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
-index 87153e35..cd0beed4 100644
---- a/Source/JavaScriptCore/shell/CMakeLists.txt
-+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
-@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
- WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
- WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
- include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
- add_executable(jsc ${JSC_SOURCES})
- target_link_libraries(jsc ${JSC_LIBRARIES})
-
-diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
-index e0dd9cd9..a2997f3e 100644
---- a/Source/WebCore/PlatformGTK.cmake
-+++ b/Source/WebCore/PlatformGTK.cmake
-@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
-     target_include_directories(WebCorePlatformGTK2 PRIVATE
-         ${WebCore_INCLUDE_DIRECTORIES}
-     )
--    target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
-+    target_include_directories(WebCorePlatformGTK2 PRIVATE
-         ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
-         ${GTK2_INCLUDE_DIRS}
-         ${GDK2_INCLUDE_DIRS}
-@@ -190,7 +190,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
- target_include_directories(WebCorePlatformGTK PRIVATE
-     ${WebCore_INCLUDE_DIRECTORIES}
- )
--target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
-+target_include_directories(WebCorePlatformGTK PRIVATE
-     ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
-     ${GTK_INCLUDE_DIRS}
-     ${GDK_INCLUDE_DIRS}
-@@ -206,7 +206,7 @@ include_directories(
-     "${WEBCORE_DIR}/bindings/gobject/"
- )
-
--include_directories(SYSTEM
-+include_directories(
-     ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
- )
-
-diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index 693bbdfe..20e3802f 100644
---- a/Source/WebKit/PlatformGTK.cmake
-+++ b/Source/WebKit/PlatformGTK.cmake
-@@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
-     target_include_directories(WebKitPluginProcess2 PRIVATE
-         ${WebKitCommonIncludeDirectories}
-     )
--    target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
-+    target_include_directories(WebKitPluginProcess2 PRIVATE
-          ${WebKitCommonSystemIncludeDirectories}
-          ${GTK2_INCLUDE_DIRS}
-          ${GDK2_INCLUDE_DIRS}
-diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
-index 6d58d57e..976e2362 100644
---- a/Source/cmake/WebKitMacros.cmake
-+++ b/Source/cmake/WebKitMacros.cmake
-@@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target)
-         ${${_target}_SOURCES}
-     )
-     target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
--    target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
-+    target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
-     target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>")
-     target_link_libraries(${_target} ${${_target}_LIBRARIES})
-     set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
-diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
-index a0d32059..f259ade2 100644
---- a/Tools/MiniBrowser/gtk/CMakeLists.txt
-+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
-@@ -59,7 +59,7 @@ endif ()
- add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
-
- include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
- add_executable(MiniBrowser ${MiniBrowser_SOURCES})
- target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
-
-diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
-index 8dd0e146..d037fc35 100644
---- a/Tools/TestWebKitAPI/PlatformGTK.cmake
-+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
-@@ -22,7 +22,7 @@ include_directories(
-     ${WEBKIT_DIR}/UIProcess/API/gtk
- )
-
--include_directories(SYSTEM
-+include_directories(
-     ${GDK3_INCLUDE_DIRS}
-     ${GLIB_INCLUDE_DIRS}
-     ${GSTREAMER_INCLUDE_DIRS}
meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch deleted +0 -24
deleted file mode 100644
index bd4ac1e3538..00000000000
@@ -1,24 +0,0 @@
-From 2d9687840b97186b80053dd262209e39455ac876 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 8 May 2019 15:31:23 +0200
-Subject: [PATCH] gstreamer: add a missing format string
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- .../platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-index e1e497ee..483fd65c 100644
---- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-@@ -738,7 +738,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
-     WebKitWebSrc* src = WEBKIT_WEB_SRC(element);
-
- #if GST_CHECK_VERSION(1, 14, 0)
--    GST_DEBUG_OBJECT(src, gst_state_change_get_name(transition));
-+    GST_DEBUG_OBJECT(src, "%s", gst_state_change_get_name(transition));
- #endif
-     switch (transition) {
-     case GST_STATE_CHANGE_READY_TO_NULL:
meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch deleted +0 -20
deleted file mode 100644
index 57ae48c1413..00000000000
@@ -1,20 +0,0 @@
-From: Alberto Garcia <[email protected]>
-Subject: Disable USE_GSTREAMER_GL is the package is not found
-Forwarded: no
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
-Index: webkitgtk/Source/cmake/GStreamerChecks.cmake
-===================================================================
---- webkitgtk.orig/Source/cmake/GStreamerChecks.cmake
-+++ webkitgtk/Source/cmake/GStreamerChecks.cmake
-@@ -43,7 +43,8 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
-             message(FATAL_ERROR "GStreamer 1.10 is needed for USE_GSTREAMER_GL.")
-         else ()
-             if (NOT PC_GSTREAMER_GL_FOUND)
--                message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
-+                set(USE_GSTREAMER_GL OFF)
-+                message(STATUS "GStreamerGL is needed for USE_GSTREAMER_GL.")
-             endif ()
-         endif ()
-     endif ()
meta/recipes-sato/webkit/webkitgtk/narrowing.patch deleted +0 -31
deleted file mode 100644
index 598b6b5df53..00000000000
@@ -1,31 +0,0 @@
-Fix build with clang on arm where char is unsigned
-
-Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197087]
-Signed-off-by: Khem Raj <[email protected]>
-
---- a/Source/WebCore/contentextensions/DFACombiner.cpp
-+++ b/Source/WebCore/contentextensions/DFACombiner.cpp
-@@ -37,7 +37,7 @@ namespace WebCore {
- namespace ContentExtensions {
-
- class DFAMerger {
--    typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList;
-+    typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList;
-
-     enum class WhichDFA {
-         A,
---- a/Source/WebCore/contentextensions/NFAToDFA.cpp
-+++ b/Source/WebCore/contentextensions/NFAToDFA.cpp
-@@ -41,9 +41,9 @@ namespace WebCore {
-
- namespace ContentExtensions {
-
--typedef MutableRange<char, NFANodeIndexSet> NFANodeRange;
--typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList;
--typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
-+typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange;
-+typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList;
-+typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
- typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList;
- typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures;
-
meta/recipes-sato/webkit/webkitgtk_2.26.1.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.24.4.bb +3 -7
similarity index 93%
rename from meta/recipes-sato/webkit/webkitgtk_2.24.4.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.26.1.bb
index 8c695ce9e75..77e51e7d290 100644
@@ -17,16 +17,12 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
            file://x32_support.patch \
            file://cross-compile.patch \
-           file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
            file://0001-Fix-build-with-musl.patch \
-           file://detect-gstreamer-gl.patch \
            file://include_array.patch \
-           file://narrowing.patch \
-           file://0001-gstreamer-add-a-missing-format-string.patch \
            "
 
-SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87"
-SRC_URI[sha256sum] = "8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8"
+SRC_URI[md5sum] = "08145bd6c1587230f135921c142bc150"
+SRC_URI[sha256sum] = "6b4b21801d2b1008422a1075dbd6fb4ae8b5127503faf657cf9671289d9cd155"
 
 inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
 
@@ -69,6 +65,7 @@ EXTRA_OECMAKE = " \
                ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \
                -DENABLE_MINIBROWSER=ON \
                 -DPYTHON_EXECUTABLE=`which python3` \
+                -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
                "
 
 # Javascript JIT is not supported on ARC
--

2.17.1

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

#14 lore raw

PATCH 10/19 gtk-doc: upgrade 1.31 -> 1.32

In reply to Alexander Kanavin
---
 meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch      | 2 +-
 .../gtk-doc/{gtk-doc_1.31.bb => gtk-doc_1.32.bb}              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.31.bb => gtk-doc_1.32.bb} (93%)
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +1 -1
index 8c9bc954420..5ca4e3e086d 100644
@@ -1,4 +1,4 @@
-From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001
+From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Mon, 5 Sep 2016 22:25:44 +0100
 Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb +2 -2
similarity index 93%
rename from meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb
rename to meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
index 4f97ce06333..50d4d99722f 100644
@@ -18,8 +18,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation",
 PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments"
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
 
-SRC_URI[archive.md5sum] = "6239713011369a4fbdc7619350403772"
-SRC_URI[archive.sha256sum] = "a51687956d0377ac70904d03fdc73c9e116589b4a01453fa92162442b3657011"
+SRC_URI[archive.md5sum] = "07764836262e154e94922e5f2aa476ae"
+SRC_URI[archive.sha256sum] = "de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c"
 SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
            file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
            file://conditionaltests.patch \
Signature · 1 line
2.17.1
#15 lore raw

Re: [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32

Quoted 12 lines · Alexander Kanavin
---
 meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch      | 2 +-
 .../gtk-doc/{gtk-doc_1.31.bb => gtk-doc_1.32.bb}              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.31.bb => gtk-doc_1.32.bb} (93%)
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +0 -0
index 8c9bc954420..5ca4e3e086d 100644

meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch line 3

Quoted 4 lines
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +1 -1
@@ -1,4 +1,4 @@
-From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001
+From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Mon, 5 Sep 2016 22:25:44 +0100

Why did the patch change?

Quoted 19 lines
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +0 -0
 Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb +2 -2
similarity index 93%
rename from meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb
rename to meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
index 4f97ce06333..50d4d99722f 100644
@@ -18,8 +18,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation",
 PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments"
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
 
-SRC_URI[archive.md5sum] = "6239713011369a4fbdc7619350403772"
-SRC_URI[archive.sha256sum] = "a51687956d0377ac70904d03fdc73c9e116589b4a01453fa92162442b3657011"
+SRC_URI[archive.md5sum] = "07764836262e154e94922e5f2aa476ae"
+SRC_URI[archive.sha256sum] = "de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c"
 SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
            file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
            file://conditionaltests.patch \
#16 lore raw

Re: [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32

Quoted 10 lines · On Fri, 11 Oct 2019 at 21:30, akuster808 <[email protected]> wrote:

meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch line 3

Quoted 7 lines
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +1 -1
@@ -1,4 +1,4 @@
-From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001
+From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Mon, 5 Sep 2016 22:25:44 +0100

Why did the patch change?

rebasing patches with 'devtool upgrade' can do this. I usually don't trim such non-changes as they're obvious and harmless.

Alex

#17 lore raw

Re: [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32

Quoted 12 lines · Alexander Kanavin
Quoted 9 lines · On Fri, 11 Oct 2019 at 21:30, akuster808 <[email protected]> wrote:

meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch line 3

Quoted 7 lines
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +1 -1
@@ -1,4 +1,4 @@
-From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001
+From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Mon, 5 Sep 2016 22:25:44 +0100

Why did the patch change?

Quoted 2 lines

rebasing patches with 'devtool upgrade' can do this. I usually don't trim such non-changes as they're obvious and harmless.

They can be a pain when cherry-picking changes for backporting.

Quoted 1 line

Alex

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#18 lore raw

PATCH 11/19 libdazzle: upgrade 3.32.3 -> 3.34.1

In reply to Alexander Kanavin
---
 .../libdazzle/{libdazzle_3.32.3.bb => libdazzle_3.34.1.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/libdazzle/{libdazzle_3.32.3.bb => libdazzle_3.34.1.bb} (73%)
meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb renamed from meta/recipes-gnome/libdazzle/libdazzle_3.32.3.bb +2 -2
similarity index 73%
rename from meta/recipes-gnome/libdazzle/libdazzle_3.32.3.bb
rename to meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb
index e1a11830070..cf61ed5016f 100644
@@ -7,8 +7,8 @@ inherit gnomebase upstream-version-is-even vala distro_features_check gobject-in
 
 DEPENDS = "glib-2.0-native glib-2.0 gtk+3"
 
-SRC_URI[archive.md5sum] = "b6da085649dcda2795e6980a84667950"
-SRC_URI[archive.sha256sum] = "6c8d9b1514b5f6422107596f4145b89b8f2a99abef6383e086dfcd28c28667e8"
+SRC_URI[archive.md5sum] = "e796a92dd3f529616ed388c15208359b"
+SRC_URI[archive.sha256sum] = "3d981cbb9d9bb87bfaff7bfd44d9847223b3ef81e69225e4d1f6ac725a669505"
 
 GIR_MESON_OPTION = 'with_introspection'
 
Signature · 1 line
2.17.1
#19 lore raw

PATCH 12/19 libsecret: upgrade 0.19.0 -> 0.19.1

In reply to Alexander Kanavin
---
 .../libsecret/{libsecret_0.19.0.bb => libsecret_0.19.1.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/libsecret/{libsecret_0.19.0.bb => libsecret_0.19.1.bb} (81%)
meta/recipes-gnome/libsecret/libsecret_0.19.1.bb renamed from meta/recipes-gnome/libsecret/libsecret_0.19.0.bb +2 -2
similarity index 81%
rename from meta/recipes-gnome/libsecret/libsecret_0.19.0.bb
rename to meta/recipes-gnome/libsecret/libsecret_0.19.1.bb
index 7da8e90084d..0d76075239f 100644
@@ -8,8 +8,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native"
 
 PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
 
-SRC_URI[archive.md5sum] = "483d293e73e7257c6d9fc18579b0e1ea"
-SRC_URI[archive.sha256sum] = "8049b09a4e737911aa647e50aee3d06b5db7aa902608ca43a0dd10d83e1d67f9"
+SRC_URI[archive.md5sum] = "ea673119c00570d6434f8fd3636f1eb8"
+SRC_URI[archive.sha256sum] = "8583e10179456ae2c83075d95455f156dc08db6278b32bf4bd61819335a30e3a"
 
 # http://errors.yoctoproject.org/Errors/Details/20228/
 ARM_INSTRUCTION_SET_armv4 = "arm"
Signature · 1 line
2.17.1
#20 lore raw

PATCH 13/19 mpg123: upgrade 1.25.11 -> 1.25.12

In reply to Alexander Kanavin
---
 .../mpg123/{mpg123_1.25.11.bb => mpg123_1.25.12.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.25.11.bb => mpg123_1.25.12.bb} (94%)
meta/recipes-multimedia/mpg123/mpg123_1.25.12.bb renamed from meta/recipes-multimedia/mpg123/mpg123_1.25.11.bb +2 -2
similarity index 94%
rename from meta/recipes-multimedia/mpg123/mpg123_1.25.11.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.25.12.bb
index d063ef5c599..a18b2f44174 100644
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2 \
            file://sdl2.patch"
-SRC_URI[md5sum] = "64749512a6fdc117227abe13fee4cc36"
-SRC_URI[sha256sum] = "df063307faa27c7d9efe63d2139b1564cfc7cdbb7c6f449c89ef8faabfa0eab2"
+SRC_URI[md5sum] = "ddb38254966eb38c77f220d456a1839d"
+SRC_URI[sha256sum] = "1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1"
 
 inherit autotools pkgconfig
 
Signature · 1 line
2.17.1
#21 lore raw

PATCH 14/19 p11-kit: upgrade 0.23.16.1 -> 0.23.18.1

In reply to Alexander Kanavin

Drop the patch that has been merged upstream.

---
 ...-languages-for-which-upstream-does-n.patch | 29 -------------------
 ...-kit_0.23.16.1.bb => p11-kit_0.23.18.1.bb} |  6 ++--
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
 rename meta/recipes-support/p11-kit/{p11-kit_0.23.16.1.bb => p11-kit_0.23.18.1.bb} (89%)
meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch deleted +0 -29
deleted file mode 100644
index e902b0b522f..00000000000
@@ -1,29 +0,0 @@
-From c6bb4b99af39daa3221c3bdc0686987ae0f31693 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 31 Jan 2018 16:47:44 +0200
-Subject: [PATCH] LINGUAS: drop the languages for which upstream does not
- supply .po files
-
-Regenerating them proved to be too painful.
-Upstream has been notified: https://github.com/p11-glue/p11-kit/issues/127
-
-Upstream-Status: Inappropriate [missing upstream distribution files]
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- po/LINGUAS | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/po/LINGUAS b/po/LINGUAS
-index 767a806c2e20..6ab48001c409 100644
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -12,8 +12,6 @@ cy
- da
- de
- el
--en@boldquot
--en@quot
- en_GB
- eo
- es
meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb renamed from meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb +2 -4
similarity index 89%
rename from meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb
rename to meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
index 54455da1bb7..119d8365a18 100644
@@ -6,10 +6,8 @@ inherit autotools gettext pkgconfig gtk-doc
 
 DEPENDS = "libtasn1 libffi"
 
-SRC_URI = "git://github.com/p11-glue/p11-kit \
-           file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \
-           "
-SRCREV = "c689917b393379d288b868f70b2f7b7f6aafe430"
+SRC_URI = "git://github.com/p11-glue/p11-kit"
+SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6"
 S = "${WORKDIR}/git"
 
 AUTOTOOLS_AUXDIR = "${S}/build/litter"
Signature · 1 line
2.17.1
#22 lore raw

PATCH 15/19 vala: upgrade 0.44.7 -> 0.46.3

In reply to Alexander Kanavin
---
 meta/recipes-devtools/vala/{vala_0.44.7.bb => vala_0.46.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/vala/{vala_0.44.7.bb => vala_0.46.3.bb} (57%)
meta/recipes-devtools/vala/vala_0.46.3.bb renamed from meta/recipes-devtools/vala/vala_0.44.7.bb +2 -2
similarity index 57%
rename from meta/recipes-devtools/vala/vala_0.44.7.bb
rename to meta/recipes-devtools/vala/vala_0.46.3.bb
index 807ca7a2139..eda5738c066 100644
@@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat
            file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
            "
 
-SRC_URI[md5sum] = "27fd30535c51af5b87b0e7ffdbd906ef"
-SRC_URI[sha256sum] = "bf1ff4f59d5de2d626e98e98ef81cb75dc1e6a27610a7de4133597c430f1bd7c"
+SRC_URI[md5sum] = "809ddac69b039ef509b61993c848613f"
+SRC_URI[sha256sum] = "e29c2b1f108dc22c91bb501975a77c938aef079ca7875e1fbf41191e22cc57e3"
Signature · 1 line
2.17.1
#23 lore raw

PATCH 16/19 meson: update to 0.52.0

In reply to Alexander Kanavin

Drop backported patches.

---
 meta/recipes-devtools/meson/meson.inc         |  7 +--
 ...efined-by-the-existance-of-a-cross-f.patch | 28 -----------
 .../0001-Make-CPU-family-warnings-fatal.patch |  8 +--
 ...etect-windows-also-if-the-system-str.patch | 29 -----------
 ...sues-that-arise-when-cross-compiling.patch |  8 +--
 ...pport-building-allarch-recipes-again.patch |  4 +-
 .../meson/meson/0003-native_bindir.patch      | 20 ++++----
 .../meson/meson/vala-cross-compile.patch      | 50 -------------------
 .../{meson_0.51.2.bb => meson_0.52.0.bb}      |  1 -
 ...on_0.51.2.bb => nativesdk-meson_0.52.0.bb} |  0
 10 files changed, 22 insertions(+), 133 deletions(-)
 delete mode 100644 meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/vala-cross-compile.patch
 rename meta/recipes-devtools/meson/{meson_0.51.2.bb => meson_0.52.0.bb} (97%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.51.2.bb => nativesdk-meson_0.52.0.bb} (100%)
meta/recipes-devtools/meson/meson.inc +2 -5
index 8219d87c741..ae0091c051c 100644
@@ -14,14 +14,11 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-python-module-do-not-manipulate-the-environment-when.patch \
            file://disable-rpath-handling.patch \
            file://cross-prop-default.patch \
-           file://0001-environment.py-detect-windows-also-if-the-system-str.patch \
-           file://0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch \
            file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
-           file://vala-cross-compile.patch \
            "
-SRC_URI[sha256sum] = "23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"
-SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
+SRC_URI[sha256sum] = "d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"
+SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -28
deleted file mode 100644
index a5dbb81b088..00000000000
@@ -1,28 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00 2001
-From: Jussi Pakkanen <[email protected]>
-Date: Sun, 6 Oct 2019 15:17:32 +0300
-Subject: [PATCH] Cross build is defined by the existance of a cross file.
-
----
- mesonbuild/environment.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index e5d041b4..03c65688 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -611,7 +611,7 @@ class Environment:
-         self.first_invocation = True
- 
-     def is_cross_build(self) -> bool:
--        return not self.machines.matches_build_machine(MachineChoice.HOST)
-+        return self.coredata.is_cross_build()
- 
-     def dump_coredata(self):
-         return coredata.save(self.coredata, self.get_build_dir())
--- 
-2.20.1
-
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +4 -4
index 444fc081686..fc55dcacf6d 100644
@@ -1,4 +1,4 @@
-From f70fee13e4dbc757cd8153cd42d92fa9394fb542 Mon Sep 17 00:00:00 2001
+From c07d29b715209cd5d75b142a00a540d45b00c36d Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
 Subject: [PATCH] Make CPU family warnings fatal
@@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 03c6346..86b350b 100644
+index a59cd89..17de654 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -186,7 +186,7 @@ class MachineInfo:
@@ -25,10 +25,10 @@ index 03c6346..86b350b 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 0cfdf9c..40aa189 100644
+index 3704921..f1988f2 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -262,9 +262,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -251,9 +251,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
          trial = 'parisc'
  
      if trial not in known_cpu_families:
meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch deleted +0 -29
deleted file mode 100644
index 2faeda2e711..00000000000
@@ -1,29 +0,0 @@
-From b52e47c9d61dc4c930cfc7236fbeb70338c3b953 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Mon, 25 Mar 2019 17:17:06 +0100
-Subject: [PATCH] environment.py: detect windows also if the system string
- contains 'mingw'
-
-Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d]
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- mesonbuild/envconfig.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 03c6346..a59cd89 100644
---- a/mesonbuild/envconfig.py
-+++ b/mesonbuild/envconfig.py
-@@ -198,7 +198,7 @@ class MachineInfo:
-         """
-         Machine is windows?
-         """
--        return self.system in {'windows', 'mingw'}
-+        return self.system == 'windows' or 'mingw' in self.system
- 
-     def is_cygwin(self) -> bool:
-         """
--- 
-2.17.1
-
meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +4 -4
index 7c3238bf91a..471f1500daa 100644
@@ -1,4 +1,4 @@
-From 1afbf5ccff56e582229c8f673f50aedf2b24117e Mon Sep 17 00:00:00 2001
+From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 4 Aug 2017 16:16:41 +0300
 Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
@@ -20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 4 insertions(+)
 
 diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index bf49770..7c5a363 100644
+index bcf77b9..6a4b472 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -972,6 +972,10 @@ This will become a hard error in the future.''')
-                 '--mode=' + mode]
+@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
+             args.append('--{}={}'.format(program_name, path))
          if namespace:
              args.append('--namespace=' + namespace)
 +        gtkdoc_exe_wrapper = state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +2 -2
index 8ad86a46e99..b8837d77b64 100644
@@ -1,4 +1,4 @@
-From 3009a1c2f1b736b836a057d84dc11f379cba99cf Mon Sep 17 00:00:00 2001
+From 263fc0e26e1fd92e25fa3ef93f4a549dcebc5887 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 86b350b..aa426ca 100644
+index 17de654..2d2deef 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +10 -10
index 57de598d2f1..76cc4931d63 100644
@@ -1,4 +1,4 @@
-From ac38495de38a1ea42e2bc09a2f23c2e945fbc22d Mon Sep 17 00:00:00 2001
+From 4a1d676522d6b56cbe9a45c3b040afaa27d37f78 Mon Sep 17 00:00:00 2001
 From: Ricardo Ribalda Delgado <[email protected]>
 Date: Wed, 15 Nov 2017 15:05:01 +0100
 Subject: [PATCH] native_bindir
@@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
  2 files changed, 14 insertions(+), 11 deletions(-)
 
 diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index 21da8e2..7d1ef85 100644
+index 3c55a56..eb52fd1 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
-@@ -155,7 +155,7 @@ class Dependency:
+@@ -185,7 +185,7 @@ class Dependency:
      def get_exe_args(self, compiler):
          return []
  
@@ -34,7 +34,7 @@ index 21da8e2..7d1ef85 100644
          raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
  
      def get_configtool_variable(self, variable_name):
-@@ -214,7 +214,7 @@ class InternalDependency(Dependency):
+@@ -248,7 +248,7 @@ class InternalDependency(Dependency):
          self.sources = sources
          self.ext_deps = ext_deps
  
@@ -43,7 +43,7 @@ index 21da8e2..7d1ef85 100644
          raise DependencyException('Method "get_pkgconfig_variable()" is '
                                    'invalid for an internal dependency')
  
-@@ -639,15 +639,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
          return s.format(self.__class__.__name__, self.name, self.is_found,
                          self.version_reqs)
  
@@ -65,7 +65,7 @@ index 21da8e2..7d1ef85 100644
          # Always copy the environment since we're going to modify it
          # with pkg-config variables
          if env is None:
-@@ -663,7 +666,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
          targs = tuple(args)
          cache = PkgConfigDependency.pkgbin_cache
          if (self.pkgbin, targs, fenv) not in cache:
@@ -74,16 +74,16 @@ index 21da8e2..7d1ef85 100644
          return cache[(self.pkgbin, targs, fenv)]
  
      def _convert_mingw_paths(self, args):
-@@ -845,7 +848,7 @@ class PkgConfigDependency(ExternalDependency):
-                                       (self.name, out_raw))
-         self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
+@@ -926,7 +929,7 @@ class PkgConfigDependency(ExternalDependency):
+             mlog.warning('Could not determine complete list of dependencies for %s' % self.name)
+         self.link_args, self.raw_link_args = self._search_libs(out, out_raw, out_all)
  
 -    def get_pkgconfig_variable(self, variable_name, kwargs):
 +    def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False):
          options = ['--variable=' + variable_name, self.name]
  
          if 'define_variable' in kwargs:
-@@ -858,7 +861,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -939,7 +942,7 @@ class PkgConfigDependency(ExternalDependency):
  
              options = ['--define-variable=' + '='.join(definition)] + options
  
meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -50

50 lines not on this page · raw message

meta/recipes-devtools/meson/meson_0.52.0.bb renamed from meta/recipes-devtools/meson/meson_0.51.2.bb +0 -1
similarity index 97%
rename from meta/recipes-devtools/meson/meson_0.51.2.bb
rename to meta/recipes-devtools/meson/meson_0.52.0.bb
index de9b905c12b..897fa148d94 100644
@@ -1,4 +1,3 @@
 include meson.inc
 
 BBCLASSEXTEND = "native"
-
meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
Signature · 1 line
2.17.1
#24 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

Quoted 12 lines · Alexander Kanavin

Drop backported patches.

---
 meta/recipes-devtools/meson/meson.inc         |  7 +--
 ...efined-by-the-existance-of-a-cross-f.patch | 28 -----------
 .../0001-Make-CPU-family-warnings-fatal.patch |  8 +--
 ...etect-windows-also-if-the-system-str.patch | 29 -----------
 ...sues-that-arise-when-cross-compiling.patch |  8 +--
 ...pport-building-allarch-recipes-again.patch |  4 +-
 .../meson/meson/0003-native_bindir.patch      | 20 ++++----
 .../meson/meson/vala-cross-compile.patch      | 50 ---------------

meson 0.52.x seems to be exposing the dconf build issue.

https://errors.yoctoproject.org/Errors/Details/273492/

also reported here
https://gitlab.gnome.org/GNOME/dconf/issues/59

Quoted 408 lines

----

 .../{meson_0.51.2.bb => meson_0.52.0.bb}      |  1 -
 ...on_0.51.2.bb => nativesdk-meson_0.52.0.bb} |  0
 10 files changed, 22 insertions(+), 133 deletions(-)
 delete mode 100644 meta/recipes-devtools/meson/meson/0001-Cross-
build-is-defined-by-the-existance-of-a-cross-f.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/0001-
environment.py-detect-windows-also-if-the-system-str.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/vala-cross-
compile.patch
 rename meta/recipes-devtools/meson/{meson_0.51.2.bb =>
meson_0.52.0.bb} (97%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.51.2.bb =>

nativesdk-meson_0.52.0.bb} (100%)

meta/recipes- renamed from meta/recipes-devtools/meson/meson.inc +0 -0

devtools/meson/meson.inc
index 8219d87c741..ae0091c051c 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -14,14 +14,11 @@ SRC_URI = "

https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P

            file://0001-python-module-do-not-manipulate-the-
environment-when.patch \
            file://disable-rpath-handling.patch \
            file://cross-prop-default.patch \

- file://0001-environment.py-detect-windows-also-if-the-
system-str.patch \
- file://0001-Cross-build-is-defined-by-the-existance-of-a-
cross-f.patch \
file://0001-mesonbuild-environment.py-check-environment-

for-vari.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-

install.patch \

meta/recipes-devtools/meson/meson.inc +0 -2
-           file://vala-cross-compile.patch \
            "
-SRC_URI[sha256sum] =

"23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"

meta/recipes-devtools/meson/meson.inc +1 -1
-SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
+SRC_URI[sha256sum] =

"d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"

meta/recipes-devtools/meson/meson.inc +1 -0
+SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
(quoted diff) +0 -0

defined-by-the-existance-of-a-cross-f.patch b/meta/recipes- devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of- a-cross-f.patch
deleted file mode 100644
index a5dbb81b088..00000000000
--- a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined- by-the-existance-of-a-cross-f.patch
+++ /dev/null

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -4
@@ -1,28 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00

2001

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -3
-From: Jussi Pakkanen <[email protected]>
-Date: Sun, 6 Oct 2019 15:17:32 +0300
-Subject: [PATCH] Cross build is defined by the existance of a cross

file.

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -14
-
----
- mesonbuild/environment.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index e5d041b4..03c65688 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -611,7 +611,7 @@ class Environment:
-         self.first_invocation = True
- 
-     def is_cross_build(self) -> bool:
--        return not

self.machines.matches_build_machine(MachineChoice.HOST)
-+ return self.coredata.is_cross_build()
-

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -5
-     def dump_coredata(self):
-         return coredata.save(self.coredata, self.get_build_dir())
--- 
-2.20.1
-
(quoted diff) +0 -0

warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make- CPU-family-warnings-fatal.patch
index 444fc081686..fc55dcacf6d 100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- warnings-fatal.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From f70fee13e4dbc757cd8153cd42d92fa9394fb542 Mon Sep 17 00:00:00

2001
+From c07d29b715209cd5d75b142a00a540d45b00c36d Mon Sep 17 00:00:00 2001
From: Ross Burton <[email protected]>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal

meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +3 -5
@@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 03c6346..86b350b 100644
+index a59cd89..17de654 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -186,7 +186,7 @@ class MachineInfo:
@@ -25,10 +25,10 @@ index 03c6346..86b350b 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 0cfdf9c..40aa189 100644
+index 3704921..f1988f2 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -262,9 +262,7 @@ def detect_cpu_family(compilers: CompilersDict)
-> str:
+@@ -251,9 +251,7 @@ def detect_cpu_family(compilers: CompilersDict)
-> str:
          trial = 'parisc'
 
      if trial not in known_cpu_families:
(quoted diff) +0 -0

detect-windows-also-if-the-system-str.patch b/meta/recipes- devtools/meson/meson/0001-environment.py-detect-windows-also-if-the- system-str.patch
deleted file mode 100644
index 2faeda2e711..00000000000
--- a/meta/recipes-devtools/meson/meson/0001-environment.py-detect- windows-also-if-the-system-str.patch
+++ /dev/null

(quoted diff) +0 -1
@@ -1,29 +0,0 @@
-From b52e47c9d61dc4c930cfc7236fbeb70338c3b953 Mon Sep 17 00:00:00

2001

meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch deleted +0 -3
-From: Alexander Kanavin <[email protected]>
-Date: Mon, 25 Mar 2019 17:17:06 +0100
-Subject: [PATCH] environment.py: detect windows also if the system

string
- contains 'mingw'

meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch deleted +0 -24
-
-Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d]
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- mesonbuild/envconfig.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 03c6346..a59cd89 100644
---- a/mesonbuild/envconfig.py
-+++ b/mesonbuild/envconfig.py
-@@ -198,7 +198,7 @@ class MachineInfo:
-         """
-         Machine is windows?
-         """
--        return self.system in {'windows', 'mingw'}
-+        return self.system == 'windows' or 'mingw' in self.system
- 
-     def is_cygwin(self) -> bool:
-         """
--- 
-2.17.1
-
(quoted diff) +0 -0

issues-that-arise-when-cross-compiling.patch b/meta/recipes- devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross- compiling.patch
index 7c3238bf91a..471f1500daa 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that- arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that- arise-when-cross-compiling.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From 1afbf5ccff56e582229c8f673f50aedf2b24117e Mon Sep 17 00:00:00

2001
+From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <[email protected]>
Date: Fri, 4 Aug 2017 16:16:41 +0300
Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling

(quoted diff) +0 -0
@@ -20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <

[email protected]>

  1 file changed, 4 insertions(+)

diff --git a/mesonbuild/modules/gnome.py
b/mesonbuild/modules/gnome.py

meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +1 -2
-index bf49770..7c5a363 100644
+index bcf77b9..6a4b472 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -972,6 +972,10 @@ This will become a hard error in the

future.''')
- '--mode=' + mode]
+@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
+ args.append('--{}={}'.format(program_name, path))
if namespace:
args.append('--namespace=' + namespace)
+ gtkdoc_exe_wrapper =
state.environment.properties.host.get('gtkdoc_exe_wrapper', None)

(quoted diff) +0 -0

allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002- Support-building-allarch-recipes-again.patch
index 8ad86a46e99..b8837d77b64 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building- allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building- allarch-recipes-again.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From 3009a1c2f1b736b836a057d84dc11f379cba99cf Mon Sep 17 00:00:00

2001
+From 263fc0e26e1fd92e25fa3ef93f4a549dcebc5887 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <[email protected]>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again

(quoted diff) +0 -0
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <

[email protected]>

  1 file changed, 1 insertion(+)

diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
-index 86b350b..aa426ca 100644
+index 17de654..2d2deef 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
(quoted diff) +0 -0

native_bindir.patch b/meta/recipes-devtools/meson/meson/0003- native_bindir.patch
index 57de598d2f1..76cc4931d63 100644

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -1
@@ -1,4 +1,4 @@
-From ac38495de38a1ea42e2bc09a2f23c2e945fbc22d Mon Sep 17 00:00:00

2001
+From 4a1d676522d6b56cbe9a45c3b040afaa27d37f78 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <[email protected]>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <

[email protected]>

  2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/mesonbuild/dependencies/base.py
b/mesonbuild/dependencies/base.py

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +3 -3
-index 21da8e2..7d1ef85 100644
+index 3c55a56..eb52fd1 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
-@@ -155,7 +155,7 @@ class Dependency:
+@@ -185,7 +185,7 @@ class Dependency:
      def get_exe_args(self, compiler):
          return []
@@ -34,7 +34,7 @@ index 21da8e2..7d1ef85 100644
          raise DependencyException('{!r} is not a pkgconfig
 dependency'.format(self.name))
 
      def get_configtool_variable(self, variable_name):
-@@ -214,7 +214,7 @@ class InternalDependency(Dependency):
+@@ -248,7 +248,7 @@ class InternalDependency(Dependency):
          self.sources = sources
          self.ext_deps = ext_deps
@@ -43,7 +43,7 @@ index 21da8e2..7d1ef85 100644
          raise DependencyException('Method

"get_pkgconfig_variable()" is '
'invalid for an internal
dependency')

-@@ -639,15 +639,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):

          return s.format(self.__class__.__name__, self.name,

self.is_found,
self.version_reqs)

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -65,7 +65,7 @@ index 21da8e2..7d1ef85 100644
          # Always copy the environment since we're going to modify

it

          # with pkg-config variables
          if env is None:
-@@ -663,7 +666,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
          targs = tuple(args)
          cache = PkgConfigDependency.pkgbin_cache
          if (self.pkgbin, targs, fenv) not in cache:
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +3 -3
@@ -74,16 +74,16 @@ index 21da8e2..7d1ef85 100644
          return cache[(self.pkgbin, targs, fenv)]
 
      def _convert_mingw_paths(self, args):
-@@ -845,7 +848,7 @@ class PkgConfigDependency(ExternalDependency):
-                                       (self.name, out_raw))
-         self.link_args, self.raw_link_args = self._search_libs(out,
 out_raw)
+@@ -926,7 +929,7 @@ class PkgConfigDependency(ExternalDependency):
+             mlog.warning('Could not determine complete list of
 dependencies for %s' % self.name)
+         self.link_args, self.raw_link_args = self._search_libs(out,
 out_raw, out_all)
 
 -    def get_pkgconfig_variable(self, variable_name, kwargs):
 +    def get_pkgconfig_variable(self, variable_name, kwargs,

use_native=False):
options = ['--variable=' + variable_name, self.name]

if 'define_variable' in kwargs:
-@@ -858,7 +861,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -939,7 +942,7 @@ class PkgConfigDependency(ExternalDependency):

              options = ['--define-variable=' + '='.join(definition)]

+ options

(quoted diff) +0 -0

compile.patch b/meta/recipes-devtools/meson/meson/vala-cross- compile.patch
deleted file mode 100644
index 816f810c054..00000000000

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -1
@@ -1,50 +0,0 @@
-From 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d Mon Sep 17 00:00:00

2001

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -5
-From: James Westman <[email protected]>
-Date: Mon, 24 Jun 2019 12:04:12 -0500
-Subject: [PATCH] Fix two errors when cross-compiling with Vala
-
-- AttributeError: 'ValaCompiler' object has no attribute

'get_program_dirs'

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -2
-
-  Fixed by adding a `get_program_dirs()` function to the base

Compiler

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -5
-  class, to match `get_library_dirs()`
-
-- KeyError: 'vala_COMPILER'
-
-  Fixed by creating the Vala compile rules for all machines, not

just

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -3
-  the build machine.
-
-Upstream-Status: Backport [

https://github.com/mesonbuild/meson/commit/77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d
]

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -7
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- mesonbuild/backend/ninjabackend.py | 3 +--
- mesonbuild/compilers/compilers.py  | 3 +++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/backend/ninjabackend.py

b/mesonbuild/backend/ninjabackend.py
-index a454e6ab5f..b830e377e4 100644
---- a/mesonbuild/backend/ninjabackend.py
-+++ b/mesonbuild/backend/ninjabackend.py
-@@ -1653,8 +1653,7 @@ def generate_compile_rule_for(self, langname, compiler):

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -4
-                 self.generate_cs_compile_rule(compiler)
-             return
-         if langname == 'vala':
--            if

self.environment.machines.matches_build_machine(compiler.for_machine) :
-- self.generate_vala_compile_rules(compiler)
-+ self.generate_vala_compile_rules(compiler)

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -4
-             return
-         if langname == 'rust':
-             self.generate_rust_compile_rules(compiler)
-diff --git a/mesonbuild/compilers/compilers.py

b/mesonbuild/compilers/compilers.py

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -13
-index 5855de71c8..86c1e33407 100644
---- a/mesonbuild/compilers/compilers.py
-+++ b/mesonbuild/compilers/compilers.py
-@@ -1117,6 +1117,9 @@ def find_library(self, *args, **kwargs):
-     def get_library_dirs(self, *args, **kwargs):
-         return ()
- 
-+    def get_program_dirs(self, *args, **kwargs):
-+        return ()
-+
-     def has_multi_arguments(self, args, env) -> Tuple[bool, bool]:
-         raise EnvironmentException(
-             'Language {} does not support

has_multi_arguments.'.format(

meta/recipes-devtools/meson/meson_0.52.0.bb renamed from meta/recipes-devtools/meson/meson_0.51.2.bb +0 -1
similarity index 97%
rename from meta/recipes-devtools/meson/meson_0.51.2.bb
rename to meta/recipes-devtools/meson/meson_0.52.0.bb
index de9b905c12b..897fa148d94 100644
@@ -1,4 +1,3 @@
 include meson.inc
 
 BBCLASSEXTEND = "native"
-
meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
Signature · 1 line
2.17.1
#25 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

Quoted 15 lines · Khem Raj
Quoted 12 lines · Alexander Kanavin

Drop backported patches.

---
 meta/recipes-devtools/meson/meson.inc         |  7 +--
 ...efined-by-the-existance-of-a-cross-f.patch | 28 -----------
 .../0001-Make-CPU-family-warnings-fatal.patch |  8 +--
 ...etect-windows-also-if-the-system-str.patch | 29 -----------
 ...sues-that-arise-when-cross-compiling.patch |  8 +--
 ...pport-building-allarch-recipes-again.patch |  4 +-
 .../meson/meson/0003-native_bindir.patch      | 20 ++++----
 .../meson/meson/vala-cross-compile.patch      | 50 ---------------
Quoted 7 lines

meson 0.52.x seems to be exposing the dconf build issue.

https://errors.yoctoproject.org/Errors/Details/273492/

also reported here
https://gitlab.gnome.org/GNOME/dconf/issues/59

Regardless of this report, this is now merged and I don't see any resolution either of a followup
from the submitter or any other developer. This is quite disheartening since it takes a lot of effort to find
these issues and reports. we should try to be considerate of the layers who are trying to keep up with
OE-Core, like this we won't be able to improve the quality of these layers. I understand that there are no breakages seen in OE-cor but we should encourage more
of other layers to test master and especially if there are reports than it would be good to heed to them.

Quoted 409 lines
Quoted 408 lines

----

 .../{meson_0.51.2.bb => meson_0.52.0.bb}      |  1 -
 ...on_0.51.2.bb => nativesdk-meson_0.52.0.bb} |  0
 10 files changed, 22 insertions(+), 133 deletions(-)
 delete mode 100644 meta/recipes-devtools/meson/meson/0001-Cross-
build-is-defined-by-the-existance-of-a-cross-f.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/0001-
environment.py-detect-windows-also-if-the-system-str.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/vala-cross-
compile.patch
 rename meta/recipes-devtools/meson/{meson_0.51.2.bb =>
meson_0.52.0.bb} (97%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.51.2.bb =>

nativesdk-meson_0.52.0.bb} (100%)

meta/recipes- renamed from meta/recipes-devtools/meson/meson.inc +0 -0

devtools/meson/meson.inc
index 8219d87c741..ae0091c051c 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -14,14 +14,11 @@ SRC_URI = "

https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P

            file://0001-python-module-do-not-manipulate-the-
environment-when.patch \
            file://disable-rpath-handling.patch \
            file://cross-prop-default.patch \

- file://0001-environment.py-detect-windows-also-if-the-
system-str.patch \
- file://0001-Cross-build-is-defined-by-the-existance-of-a-
cross-f.patch \
file://0001-mesonbuild-environment.py-check-environment-

for-vari.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-

install.patch \

meta/recipes-devtools/meson/meson.inc +0 -2
-           file://vala-cross-compile.patch \
            "
-SRC_URI[sha256sum] =

"23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"

meta/recipes-devtools/meson/meson.inc +1 -1
-SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
+SRC_URI[sha256sum] =

"d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"

meta/recipes-devtools/meson/meson.inc +1 -0
+SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
(quoted diff) +0 -0

defined-by-the-existance-of-a-cross-f.patch b/meta/recipes- devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of- a-cross-f.patch
deleted file mode 100644
index a5dbb81b088..00000000000
--- a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined- by-the-existance-of-a-cross-f.patch
+++ /dev/null

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -4
@@ -1,28 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00

2001

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -3
-From: Jussi Pakkanen <[email protected]>
-Date: Sun, 6 Oct 2019 15:17:32 +0300
-Subject: [PATCH] Cross build is defined by the existance of a cross

file.

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -14
-
----
- mesonbuild/environment.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index e5d041b4..03c65688 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -611,7 +611,7 @@ class Environment:
-         self.first_invocation = True
-
-     def is_cross_build(self) -> bool:
--        return not

self.machines.matches_build_machine(MachineChoice.HOST)
-+ return self.coredata.is_cross_build()

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -6
-
-     def dump_coredata(self):
-         return coredata.save(self.coredata, self.get_build_dir())
---
-2.20.1
-
(quoted diff) +0 -0

warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make- CPU-family-warnings-fatal.patch
index 444fc081686..fc55dcacf6d 100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- warnings-fatal.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From f70fee13e4dbc757cd8153cd42d92fa9394fb542 Mon Sep 17 00:00:00

2001
+From c07d29b715209cd5d75b142a00a540d45b00c36d Mon Sep 17 00:00:00 2001
From: Ross Burton <[email protected]>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal

meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +3 -5
@@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 03c6346..86b350b 100644
+index a59cd89..17de654 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -186,7 +186,7 @@ class MachineInfo:
@@ -25,10 +25,10 @@ index 03c6346..86b350b 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 0cfdf9c..40aa189 100644
+index 3704921..f1988f2 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -262,9 +262,7 @@ def detect_cpu_family(compilers: CompilersDict)
-> str:
+@@ -251,9 +251,7 @@ def detect_cpu_family(compilers: CompilersDict)
-> str:
          trial = 'parisc'
 
      if trial not in known_cpu_families:
(quoted diff) +0 -0

detect-windows-also-if-the-system-str.patch b/meta/recipes- devtools/meson/meson/0001-environment.py-detect-windows-also-if-the- system-str.patch
deleted file mode 100644
index 2faeda2e711..00000000000
--- a/meta/recipes-devtools/meson/meson/0001-environment.py-detect- windows-also-if-the-system-str.patch
+++ /dev/null

(quoted diff) +0 -1
@@ -1,29 +0,0 @@
-From b52e47c9d61dc4c930cfc7236fbeb70338c3b953 Mon Sep 17 00:00:00

2001

meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch deleted +0 -3
-From: Alexander Kanavin <[email protected]>
-Date: Mon, 25 Mar 2019 17:17:06 +0100
-Subject: [PATCH] environment.py: detect windows also if the system

string
- contains 'mingw'

meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch deleted +0 -24
-
-Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d]
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- mesonbuild/envconfig.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 03c6346..a59cd89 100644
---- a/mesonbuild/envconfig.py
-+++ b/mesonbuild/envconfig.py
-@@ -198,7 +198,7 @@ class MachineInfo:
-         """
-         Machine is windows?
-         """
--        return self.system in {'windows', 'mingw'}
-+        return self.system == 'windows' or 'mingw' in self.system
-
-     def is_cygwin(self) -> bool:
-         """
---
-2.17.1
-
(quoted diff) +0 -0

issues-that-arise-when-cross-compiling.patch b/meta/recipes- devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross- compiling.patch
index 7c3238bf91a..471f1500daa 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that- arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that- arise-when-cross-compiling.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From 1afbf5ccff56e582229c8f673f50aedf2b24117e Mon Sep 17 00:00:00

2001
+From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <[email protected]>
Date: Fri, 4 Aug 2017 16:16:41 +0300
Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling

(quoted diff) +0 -0
@@ -20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <

[email protected]>

  1 file changed, 4 insertions(+)

diff --git a/mesonbuild/modules/gnome.py
b/mesonbuild/modules/gnome.py

meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +1 -2
-index bf49770..7c5a363 100644
+index bcf77b9..6a4b472 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -972,6 +972,10 @@ This will become a hard error in the

future.''')
- '--mode=' + mode]
+@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
+ args.append('--{}={}'.format(program_name, path))
if namespace:
args.append('--namespace=' + namespace)
+ gtkdoc_exe_wrapper =
state.environment.properties.host.get('gtkdoc_exe_wrapper', None)

(quoted diff) +0 -0

allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002- Support-building-allarch-recipes-again.patch
index 8ad86a46e99..b8837d77b64 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building- allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building- allarch-recipes-again.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From 3009a1c2f1b736b836a057d84dc11f379cba99cf Mon Sep 17 00:00:00

2001
+From 263fc0e26e1fd92e25fa3ef93f4a549dcebc5887 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <[email protected]>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again

(quoted diff) +0 -0
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <

[email protected]>

  1 file changed, 1 insertion(+)

diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
-index 86b350b..aa426ca 100644
+index 17de654..2d2deef 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
(quoted diff) +0 -0

native_bindir.patch b/meta/recipes-devtools/meson/meson/0003- native_bindir.patch
index 57de598d2f1..76cc4931d63 100644

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -1
@@ -1,4 +1,4 @@
-From ac38495de38a1ea42e2bc09a2f23c2e945fbc22d Mon Sep 17 00:00:00

2001
+From 4a1d676522d6b56cbe9a45c3b040afaa27d37f78 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <[email protected]>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <

[email protected]>

  2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/mesonbuild/dependencies/base.py
b/mesonbuild/dependencies/base.py

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +3 -3
-index 21da8e2..7d1ef85 100644
+index 3c55a56..eb52fd1 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
-@@ -155,7 +155,7 @@ class Dependency:
+@@ -185,7 +185,7 @@ class Dependency:
      def get_exe_args(self, compiler):
          return []
@@ -34,7 +34,7 @@ index 21da8e2..7d1ef85 100644
          raise DependencyException('{!r} is not a pkgconfig
 dependency'.format(self.name))
 
      def get_configtool_variable(self, variable_name):
-@@ -214,7 +214,7 @@ class InternalDependency(Dependency):
+@@ -248,7 +248,7 @@ class InternalDependency(Dependency):
          self.sources = sources
          self.ext_deps = ext_deps
@@ -43,7 +43,7 @@ index 21da8e2..7d1ef85 100644
          raise DependencyException('Method

"get_pkgconfig_variable()" is '
'invalid for an internal
dependency')

-@@ -639,15 +639,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):

          return s.format(self.__class__.__name__, self.name,

self.is_found,
self.version_reqs)

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -65,7 +65,7 @@ index 21da8e2..7d1ef85 100644
          # Always copy the environment since we're going to modify

it

          # with pkg-config variables
          if env is None:
-@@ -663,7 +666,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
          targs = tuple(args)
          cache = PkgConfigDependency.pkgbin_cache
          if (self.pkgbin, targs, fenv) not in cache:
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +3 -3
@@ -74,16 +74,16 @@ index 21da8e2..7d1ef85 100644
          return cache[(self.pkgbin, targs, fenv)]
 
      def _convert_mingw_paths(self, args):
-@@ -845,7 +848,7 @@ class PkgConfigDependency(ExternalDependency):
-                                       (self.name, out_raw))
-         self.link_args, self.raw_link_args = self._search_libs(out,
 out_raw)
+@@ -926,7 +929,7 @@ class PkgConfigDependency(ExternalDependency):
+             mlog.warning('Could not determine complete list of
 dependencies for %s' % self.name)
+         self.link_args, self.raw_link_args = self._search_libs(out,
 out_raw, out_all)
 
 -    def get_pkgconfig_variable(self, variable_name, kwargs):
 +    def get_pkgconfig_variable(self, variable_name, kwargs,

use_native=False):
options = ['--variable=' + variable_name, self.name]

if 'define_variable' in kwargs:
-@@ -858,7 +861,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -939,7 +942,7 @@ class PkgConfigDependency(ExternalDependency):

              options = ['--define-variable=' + '='.join(definition)]

+ options

(quoted diff) +0 -0

compile.patch b/meta/recipes-devtools/meson/meson/vala-cross- compile.patch
deleted file mode 100644
index 816f810c054..00000000000

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -1
@@ -1,50 +0,0 @@
-From 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d Mon Sep 17 00:00:00

2001

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -5
-From: James Westman <[email protected]>
-Date: Mon, 24 Jun 2019 12:04:12 -0500
-Subject: [PATCH] Fix two errors when cross-compiling with Vala
-
-- AttributeError: 'ValaCompiler' object has no attribute

'get_program_dirs'

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -2
-
-  Fixed by adding a `get_program_dirs()` function to the base

Compiler

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -5
-  class, to match `get_library_dirs()`
-
-- KeyError: 'vala_COMPILER'
-
-  Fixed by creating the Vala compile rules for all machines, not

just

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -3
-  the build machine.
-
-Upstream-Status: Backport [

https://github.com/mesonbuild/meson/commit/77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d
]

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -7
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- mesonbuild/backend/ninjabackend.py | 3 +--
- mesonbuild/compilers/compilers.py  | 3 +++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/backend/ninjabackend.py

b/mesonbuild/backend/ninjabackend.py
-index a454e6ab5f..b830e377e4 100644
---- a/mesonbuild/backend/ninjabackend.py
-+++ b/mesonbuild/backend/ninjabackend.py
-@@ -1653,8 +1653,7 @@ def generate_compile_rule_for(self, langname, compiler):

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -4
-                 self.generate_cs_compile_rule(compiler)
-             return
-         if langname == 'vala':
--            if

self.environment.machines.matches_build_machine(compiler.for_machine) :
-- self.generate_vala_compile_rules(compiler)
-+ self.generate_vala_compile_rules(compiler)

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -4
-             return
-         if langname == 'rust':
-             self.generate_rust_compile_rules(compiler)
-diff --git a/mesonbuild/compilers/compilers.py

b/mesonbuild/compilers/compilers.py

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -13
-index 5855de71c8..86c1e33407 100644
---- a/mesonbuild/compilers/compilers.py
-+++ b/mesonbuild/compilers/compilers.py
-@@ -1117,6 +1117,9 @@ def find_library(self, *args, **kwargs):
-     def get_library_dirs(self, *args, **kwargs):
-         return ()
-
-+    def get_program_dirs(self, *args, **kwargs):
-+        return ()
-+
-     def has_multi_arguments(self, args, env) -> Tuple[bool, bool]:
-         raise EnvironmentException(
-             'Language {} does not support

has_multi_arguments.'.format(

meta/recipes-devtools/meson/meson_0.52.0.bb renamed from meta/recipes-devtools/meson/meson_0.51.2.bb +0 -1
similarity index 97%
rename from meta/recipes-devtools/meson/meson_0.51.2.bb
rename to meta/recipes-devtools/meson/meson_0.52.0.bb
index de9b905c12b..897fa148d94 100644
@@ -1,4 +1,3 @@
 include meson.inc
 
 BBCLASSEXTEND = "native"
-
meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb +0 -1
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
--

2.17.1

#26 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

Quoted 9 lines · Khem Raj
Quoted 7 lines

meson 0.52.x seems to be exposing the dconf build issue.

https://errors.yoctoproject.org/Errors/Details/273492/

also reported here
https://gitlab.gnome.org/GNOME/dconf/issues/59

Quoted 12 lines

Regardless of this report, this is now merged and I don't see any resolution either of a followup
from the submitter or any other developer. This is quite disheartening since it takes a lot of effort to find
these issues and reports. we should try to be considerate of the layers who are trying to keep up with
OE-Core, like this we won't be able to improve the quality of these layers. I understand that there are no breakages seen in OE-cor but we should encourage more
of other layers to test master and especially if there are reports than it would be good to heed to them.

https://github.com/mesonbuild/meson/pull/6030 looks seems to address.

Cannot test currently - am in 48h build from scratch currently (with this patch reverted)

Andreas

#27 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

In reply to Khem Raj

I certainly don't mean to ignore those reports, it's just that due to my ongoing health problems, and having to dedicate most of my energy to the day job (https://mbition.io/en/home/), I am not currently able to work on the upstream issues in a timely manner the way I used to when maintaining core was actually my day job (at Intel).

The question of how much effort people who update things in core should allocate to fixing 'other' layers has been a conflict point for a long time. I'd prefer to see more aggressive blacklisting/removal of recipes that no one has an interest in fixing and updating.

Alex

Quoted 449 lines · Khem Raj
Quoted 15 lines · Khem Raj
Quoted 12 lines · Alexander Kanavin

Drop backported patches.

---
 meta/recipes-devtools/meson/meson.inc         |  7 +--
 ...efined-by-the-existance-of-a-cross-f.patch | 28 -----------
 .../0001-Make-CPU-family-warnings-fatal.patch |  8 +--
 ...etect-windows-also-if-the-system-str.patch | 29 -----------
 ...sues-that-arise-when-cross-compiling.patch |  8 +--
 ...pport-building-allarch-recipes-again.patch |  4 +-
 .../meson/meson/0003-native_bindir.patch      | 20 ++++----
 .../meson/meson/vala-cross-compile.patch      | 50 ---------------
Quoted 7 lines

meson 0.52.x seems to be exposing the dconf build issue.

https://errors.yoctoproject.org/Errors/Details/273492/

also reported here
https://gitlab.gnome.org/GNOME/dconf/issues/59

Regardless of this report, this is now merged and I don't see any resolution either of a followup
from the submitter or any other developer. This is quite disheartening since it takes a lot of effort to find
these issues and reports. we should try to be considerate of the layers who are trying to keep up with
OE-Core, like this we won't be able to improve the quality of these layers. I understand that there are no breakages seen in OE-cor but we should encourage more
of other layers to test master and especially if there are reports than it would be good to heed to them.

Quoted 338 lines
Quoted 338 lines

----

 .../{meson_0.51.2.bb => meson_0.52.0.bb}      |  1 -
 ...on_0.51.2.bb => nativesdk-meson_0.52.0.bb} |  0
 10 files changed, 22 insertions(+), 133 deletions(-)
 delete mode 100644 meta/recipes-devtools/meson/meson/0001-Cross-
build-is-defined-by-the-existance-of-a-cross-f.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/0001-
environment.py-detect-windows-also-if-the-system-str.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/vala-cross-
compile.patch
 rename meta/recipes-devtools/meson/{meson_0.51.2.bb =>
meson_0.52.0.bb} (97%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.51.2.bb =>

nativesdk-meson_0.52.0.bb} (100%)

meta/recipes- renamed from meta/recipes-devtools/meson/meson.inc +0 -0

devtools/meson/meson.inc
index 8219d87c741..ae0091c051c 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -14,14 +14,11 @@ SRC_URI = "

https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P

            file://0001-python-module-do-not-manipulate-the-
environment-when.patch \
            file://disable-rpath-handling.patch \
            file://cross-prop-default.patch \

- file://0001-environment.py-detect-windows-also-if-the-
system-str.patch \
- file://0001-Cross-build-is-defined-by-the-existance-of-a-
cross-f.patch \
file://0001-mesonbuild-environment.py-check-environment-

for-vari.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-

install.patch \

meta/recipes-devtools/meson/meson.inc +0 -2
-           file://vala-cross-compile.patch \
            "
-SRC_URI[sha256sum] =

"23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"

meta/recipes-devtools/meson/meson.inc +1 -1
-SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
+SRC_URI[sha256sum] =

"d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"

meta/recipes-devtools/meson/meson.inc +1 -0
+SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
(quoted diff) +0 -0

defined-by-the-existance-of-a-cross-f.patch b/meta/recipes- devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of- a-cross-f.patch
deleted file mode 100644
index a5dbb81b088..00000000000
--- a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined- by-the-existance-of-a-cross-f.patch
+++ /dev/null

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -4
@@ -1,28 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00

2001

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -3
-From: Jussi Pakkanen <[email protected]>
-Date: Sun, 6 Oct 2019 15:17:32 +0300
-Subject: [PATCH] Cross build is defined by the existance of a cross

file.

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -14
-
----
- mesonbuild/environment.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index e5d041b4..03c65688 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -611,7 +611,7 @@ class Environment:
-         self.first_invocation = True
-
-     def is_cross_build(self) -> bool:
--        return not

self.machines.matches_build_machine(MachineChoice.HOST)
-+ return self.coredata.is_cross_build()

meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch deleted +0 -6
-
-     def dump_coredata(self):
-         return coredata.save(self.coredata, self.get_build_dir())
---
-2.20.1
-
(quoted diff) +0 -0

warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make- CPU-family-warnings-fatal.patch
index 444fc081686..fc55dcacf6d 100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- warnings-fatal.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From f70fee13e4dbc757cd8153cd42d92fa9394fb542 Mon Sep 17 00:00:00

2001
+From c07d29b715209cd5d75b142a00a540d45b00c36d Mon Sep 17 00:00:00 2001
From: Ross Burton <[email protected]>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal

meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +3 -5
@@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <[email protected]>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 03c6346..86b350b 100644
+index a59cd89..17de654 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -186,7 +186,7 @@ class MachineInfo:
@@ -25,10 +25,10 @@ index 03c6346..86b350b 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 0cfdf9c..40aa189 100644
+index 3704921..f1988f2 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -262,9 +262,7 @@ def detect_cpu_family(compilers: CompilersDict)
-> str:
+@@ -251,9 +251,7 @@ def detect_cpu_family(compilers: CompilersDict)
-> str:
          trial = 'parisc'
 
      if trial not in known_cpu_families:
(quoted diff) +0 -0

detect-windows-also-if-the-system-str.patch b/meta/recipes- devtools/meson/meson/0001-environment.py-detect-windows-also-if-the- system-str.patch
deleted file mode 100644
index 2faeda2e711..00000000000
--- a/meta/recipes-devtools/meson/meson/0001-environment.py-detect- windows-also-if-the-system-str.patch
+++ /dev/null

(quoted diff) +0 -1
@@ -1,29 +0,0 @@
-From b52e47c9d61dc4c930cfc7236fbeb70338c3b953 Mon Sep 17 00:00:00

2001

meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch deleted +0 -3
-From: Alexander Kanavin <[email protected]>
-Date: Mon, 25 Mar 2019 17:17:06 +0100
-Subject: [PATCH] environment.py: detect windows also if the system

string
- contains 'mingw'

meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch deleted +0 -24
-
-Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d]
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- mesonbuild/envconfig.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 03c6346..a59cd89 100644
---- a/mesonbuild/envconfig.py
-+++ b/mesonbuild/envconfig.py
-@@ -198,7 +198,7 @@ class MachineInfo:
-         """
-         Machine is windows?
-         """
--        return self.system in {'windows', 'mingw'}
-+        return self.system == 'windows' or 'mingw' in self.system
-
-     def is_cygwin(self) -> bool:
-         """
---
-2.17.1
-
(quoted diff) +0 -0

issues-that-arise-when-cross-compiling.patch b/meta/recipes- devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross- compiling.patch
index 7c3238bf91a..471f1500daa 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that- arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that- arise-when-cross-compiling.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From 1afbf5ccff56e582229c8f673f50aedf2b24117e Mon Sep 17 00:00:00

2001
+From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <[email protected]>
Date: Fri, 4 Aug 2017 16:16:41 +0300
Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling

(quoted diff) +0 -0
@@ -20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <

[email protected]>

  1 file changed, 4 insertions(+)

diff --git a/mesonbuild/modules/gnome.py
b/mesonbuild/modules/gnome.py

meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +1 -2
-index bf49770..7c5a363 100644
+index bcf77b9..6a4b472 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -972,6 +972,10 @@ This will become a hard error in the

future.''')
- '--mode=' + mode]
+@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
+ args.append('--{}={}'.format(program_name, path))
if namespace:
args.append('--namespace=' + namespace)
+ gtkdoc_exe_wrapper =
state.environment.properties.host.get('gtkdoc_exe_wrapper', None)

(quoted diff) +0 -0

allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002- Support-building-allarch-recipes-again.patch
index 8ad86a46e99..b8837d77b64 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building- allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building- allarch-recipes-again.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From 3009a1c2f1b736b836a057d84dc11f379cba99cf Mon Sep 17 00:00:00

2001
+From 263fc0e26e1fd92e25fa3ef93f4a549dcebc5887 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <[email protected]>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again

(quoted diff) +0 -0
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <

[email protected]>

  1 file changed, 1 insertion(+)

diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
-index 86b350b..aa426ca 100644
+index 17de654..2d2deef 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
(quoted diff) +0 -0

native_bindir.patch b/meta/recipes-devtools/meson/meson/0003- native_bindir.patch
index 57de598d2f1..76cc4931d63 100644

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -1
@@ -1,4 +1,4 @@
-From ac38495de38a1ea42e2bc09a2f23c2e945fbc22d Mon Sep 17 00:00:00

2001
+From 4a1d676522d6b56cbe9a45c3b040afaa27d37f78 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <[email protected]>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <

[email protected]>

  2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/mesonbuild/dependencies/base.py
b/mesonbuild/dependencies/base.py

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +3 -3
-index 21da8e2..7d1ef85 100644
+index 3c55a56..eb52fd1 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
-@@ -155,7 +155,7 @@ class Dependency:
+@@ -185,7 +185,7 @@ class Dependency:
      def get_exe_args(self, compiler):
          return []
@@ -34,7 +34,7 @@ index 21da8e2..7d1ef85 100644
          raise DependencyException('{!r} is not a pkgconfig
 dependency'.format(self.name))
 
      def get_configtool_variable(self, variable_name):
-@@ -214,7 +214,7 @@ class InternalDependency(Dependency):
+@@ -248,7 +248,7 @@ class InternalDependency(Dependency):
          self.sources = sources
          self.ext_deps = ext_deps
@@ -43,7 +43,7 @@ index 21da8e2..7d1ef85 100644
          raise DependencyException('Method

"get_pkgconfig_variable()" is '
'invalid for an internal
dependency')

-@@ -639,15 +639,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):

          return s.format(self.__class__.__name__, self.name,

self.is_found,
self.version_reqs)

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -65,7 +65,7 @@ index 21da8e2..7d1ef85 100644
          # Always copy the environment since we're going to modify

it

          # with pkg-config variables
          if env is None:
-@@ -663,7 +666,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
          targs = tuple(args)
          cache = PkgConfigDependency.pkgbin_cache
          if (self.pkgbin, targs, fenv) not in cache:
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +3 -3
@@ -74,16 +74,16 @@ index 21da8e2..7d1ef85 100644
          return cache[(self.pkgbin, targs, fenv)]
 
      def _convert_mingw_paths(self, args):
-@@ -845,7 +848,7 @@ class PkgConfigDependency(ExternalDependency):
-                                       (self.name, out_raw))
-         self.link_args, self.raw_link_args = self._search_libs(out,
 out_raw)
+@@ -926,7 +929,7 @@ class PkgConfigDependency(ExternalDependency):
+             mlog.warning('Could not determine complete list of
 dependencies for %s' % self.name)
+         self.link_args, self.raw_link_args = self._search_libs(out,
 out_raw, out_all)
 
 -    def get_pkgconfig_variable(self, variable_name, kwargs):
 +    def get_pkgconfig_variable(self, variable_name, kwargs,

use_native=False):
options = ['--variable=' + variable_name, self.name]

if 'define_variable' in kwargs:
-@@ -858,7 +861,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -939,7 +942,7 @@ class PkgConfigDependency(ExternalDependency):

              options = ['--define-variable=' + '='.join(definition)]

+ options

(quoted diff) +0 -0

compile.patch b/meta/recipes-devtools/meson/meson/vala-cross- compile.patch
deleted file mode 100644
index 816f810c054..00000000000

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -1
@@ -1,50 +0,0 @@
-From 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d Mon Sep 17 00:00:00

2001

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -5
-From: James Westman <[email protected]>
-Date: Mon, 24 Jun 2019 12:04:12 -0500
-Subject: [PATCH] Fix two errors when cross-compiling with Vala
-
-- AttributeError: 'ValaCompiler' object has no attribute

'get_program_dirs'

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -2
-
-  Fixed by adding a `get_program_dirs()` function to the base

Compiler

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -2
-  class, to match `get_library_dirs()`
-
Quoted 8 lines

meta/recipes-devtools/meson/meson/vala-cross-compile.patch

Quoted 8 lines

-- KeyError: 'vala_COMPILER'

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -2
-
-  Fixed by creating the Vala compile rules for all machines, not

just

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -3
-  the build machine.
-
-Upstream-Status: Backport [

https://github.com/mesonbuild/meson/commit/77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d

Quoted 63 lines
Quoted 62 lines

]

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -7
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- mesonbuild/backend/ninjabackend.py | 3 +--
- mesonbuild/compilers/compilers.py  | 3 +++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/backend/ninjabackend.py

b/mesonbuild/backend/ninjabackend.py
-index a454e6ab5f..b830e377e4 100644
---- a/mesonbuild/backend/ninjabackend.py
-+++ b/mesonbuild/backend/ninjabackend.py
-@@ -1653,8 +1653,7 @@ def generate_compile_rule_for(self, langname, compiler):

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -4
-                 self.generate_cs_compile_rule(compiler)
-             return
-         if langname == 'vala':
--            if

self.environment.machines.matches_build_machine(compiler.for_machine) :
-- self.generate_vala_compile_rules(compiler)
-+ self.generate_vala_compile_rules(compiler)

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -4
-             return
-         if langname == 'rust':
-             self.generate_rust_compile_rules(compiler)
-diff --git a/mesonbuild/compilers/compilers.py

b/mesonbuild/compilers/compilers.py

meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted +0 -13
-index 5855de71c8..86c1e33407 100644
---- a/mesonbuild/compilers/compilers.py
-+++ b/mesonbuild/compilers/compilers.py
-@@ -1117,6 +1117,9 @@ def find_library(self, *args, **kwargs):
-     def get_library_dirs(self, *args, **kwargs):
-         return ()
-
-+    def get_program_dirs(self, *args, **kwargs):
-+        return ()
-+
-     def has_multi_arguments(self, args, env) -> Tuple[bool, bool]:
-         raise EnvironmentException(
-             'Language {} does not support

has_multi_arguments.'.format(

meta/recipes-devtools/meson/meson_0.52.0.bb renamed from meta/recipes-devtools/meson/meson_0.51.2.bb +0 -1
similarity index 97%
rename from meta/recipes-devtools/meson/meson_0.51.2.bb
rename to meta/recipes-devtools/meson/meson_0.52.0.bb
index de9b905c12b..897fa148d94 100644
@@ -1,4 +1,3 @@
 include meson.inc
 
 BBCLASSEXTEND = "native"
-
meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb +0 -1
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
--

2.17.1

#28 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

Quoted 11 lines · Alexander Kanavin

I certainly don't mean to ignore those reports, it's just that due to my ongoing health problems, and having to dedicate most of my energy to the day job (https://mbition.io/en/home/), I am not currently able to work on the upstream issues in a timely manner the way I used to when maintaining core was actually my day job (at Intel).

The question of how much effort people who update things in core should allocate to fixing 'other' layers has been a conflict point for a long time. I'd prefer to see more aggressive blacklisting/removal of recipes that no one has an interest in fixing and updating.

If anything this would be my fault for merging things despite there being concerns raised. I have to admit I'd seen other patches and therefore erroneously thought the issues we mostly resolved.

Should OE-Core block on all issues being resolved before merging? I'm torn on that, I realise there are pros and cons.

It takes most of my time/energy to track the issues with core without trying to remember that patch X breaks layer Y and that I need a report back on that combination before I then find a patch and merge it.

So sorry, I probably shouldn't have taken this :/.

There is a fundamental issue with having enough people to help work on these things though and requiring more work for changes to be merged isn't going to help. I wish I knew what would help.

Cheers,

Richard

#29 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

Quoted 13 lines · On Sat, Oct 19, 2019 at 2:56 AM <[email protected]> wrote:
Quoted 11 lines · Alexander Kanavin

I certainly don't mean to ignore those reports, it's just that due to my ongoing health problems, and having to dedicate most of my energy to the day job (https://mbition.io/en/home/), I am not currently able to work on the upstream issues in a timely manner the way I used to when maintaining core was actually my day job (at Intel).

The question of how much effort people who update things in core should allocate to fixing 'other' layers has been a conflict point for a long time. I'd prefer to see more aggressive blacklisting/removal of recipes that no one has an interest in fixing and updating.

Quoted 6 lines

If anything this would be my fault for merging things despite there being concerns raised. I have to admit I'd seen other patches and therefore erroneously thought the issues we mostly resolved.

Should OE-Core block on all issues being resolved before merging? I'm torn on that, I realise there are pros and cons.

If an issue is there and gets reported after it’s merged I think it’s fine to do whatever is needed after the fact however if testing master-next from oe-core and reported against it I think this will help you in longer run if these master-next issues are looked into and blocked on. We should not run Oe-core so fast that other layers fall way back behind where they start supporting just releases and you have lost free integration testing that other layers would offer

If there are too many reports then it would be questionable to block on it but I don’t think that’s the case

Quoted 19 lines

It takes most of my time/energy to track the issues with core without trying to remember that patch X breaks layer Y and that I need a report back on that combination before I then find a patch and merge it.

So sorry, I probably shouldn't have taken this :/.

There is a fundamental issue with having enough people to help work on these things though and requiring more work for changes to be merged isn't going to help. I wish I knew what would help.

Cheers,

Richard

#30 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

Quoted 38 lines · Khem Raj
Quoted 17 lines · On Sat, Oct 19, 2019 at 2:56 AM <[email protected]> wrote:
Quoted 1 line · Alexander Kanavin

I certainly don't mean to ignore those reports, it's just that

due to

Quoted 1 line

my ongoing health problems, and having to dedicate most of my

energy

Quoted 1 line

to the day job (https://mbition.io/en/home/), I am not currently

able

Quoted 1 line

to work on the upstream issues in a timely manner the way I used

to

Quoted 4 lines

when maintaining core was actually my day job (at Intel).

The question of how much effort people who update things in core should allocate to fixing 'other' layers has been a conflict

point

Quoted 2 lines

for a long time. I'd prefer to see more aggressive blacklisting/removal of recipes that no one has an interest in

fixing

Quoted 8 lines
Quoted 1 line

and updating.

If anything this would be my fault for merging things despite there being concerns raised. I have to admit I'd seen other patches and therefore erroneously thought the issues we mostly resolved.

Should OE-Core block on all issues being resolved before merging? I'm torn on that, I realise there are pros and cons.

If an issue is there and gets reported after it’s merged I think it’s fine to do whatever is needed after the fact however if testing master-next from oe-core and reported against it I think this will help you in longer run if these master-next issues are looked into and blocked on. We should not run Oe-core so fast that other layers fall way back behind where they start supporting just releases and you have lost free integration testing that other layers would offer

Quoted 2 lines

If there are too many reports then it would be questionable to block on it but I don’t think that’s the case

As I said, I understand the desire and from some perspectives it makes a lot of sense. From a human resource perspective I have concerns. Following this through:

This means we should make meta-oe testing a default part of full builds, maybe even quick?

We're then effectively highlighting any issues and blocking patches on testing with meta-oe. We should then really update the maintainer guidelines to highlight they should be testing with meta-oe as well? world builds of it?

Should we include other layers too? We're actually at the point where project members want their layers tested so they get to know ASAP about failures.

We (as in the TSC) did discuss this and basically said that a heads up warning of problems was what we could realistically achieve, not blocking. meta-oe is special in some ways, is it that special?

I suspect a more realistic take away is we figure out what set of tests are missing for oe-core and add them, such that changes don't break layers. In this case we're clearly missing some meson usecase tests?

Cheers,

Richard

#31 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

In reply to Khem Raj
Quoted 39 lines · Khem Raj
Quoted 19 lines · On Sat, Oct 19, 2019 at 2:56 AM <[email protected]> wrote:
Quoted 1 line · Alexander Kanavin

I certainly don't mean to ignore those reports, it's just that

due to

Quoted 1 line

my ongoing health problems, and having to dedicate most of my

energy

Quoted 1 line

to the day job (https://mbition.io/en/home/), I am not currently

able

Quoted 1 line

to work on the upstream issues in a timely manner the way I used

to

Quoted 4 lines

when maintaining core was actually my day job (at Intel).

The question of how much effort people who update things in core should allocate to fixing 'other' layers has been a conflict

point

Quoted 2 lines

for a long time. I'd prefer to see more aggressive blacklisting/removal of recipes that no one has an interest in

fixing

Quoted 1 line

and updating.

Quoted 7 lines

If anything this would be my fault for merging things despite there being concerns raised. I have to admit I'd seen other patches and therefore erroneously thought the issues we mostly resolved.

Should OE-Core block on all issues being resolved before merging? I'm
torn on that, I realise there are pros and cons.

If an issue is there and gets reported after it’s merged I think it’s fine to do whatever is needed after the fact however if testing master-next from oe-core and reported against it I think this will help you in longer run if these master-next issues are looked into and blocked on. We should not run Oe-core so fast that other layers fall way back behind where they start supporting just releases and you have lost free integration testing that other layers would offer

Quoted 2 lines

If there are too many reports then it would be questionable to block on it but I don’t think that’s the case

Feeling suitably responsible for this breakage, I looked into it. The following two patches, one for meson in OE-Core and the other for dconf in meta-oe seem to address the problem. I'm not entirely sure they're correct but they don't actually change the library binary so its probably fine whilst upstream sorts it out.

If they look ok to you I'll submit them "properly".

Cheers,

Richard

From 7ebd50f90b3b7f4e1dc56f07ae7e8e02275d41c8 Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Sun, 20 Oct 2019 13:27:07 +0100
Subject: [PATCH] dconf: Fix build with meson 0.52

---
 .../dconf/dconf/fix-meson-0.52.patch          | 25 +++++++++++++++++++
 .../recipes-gnome/dconf/dconf_0.32.0.bb       |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch
meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch new file +25 -0
new file mode 100644
index 000000000..bca021347
@@ -0,0 +1,25 @@
+With meson 0.52 the build fails due to duplicate symbols. There is a fix
+to meson but the dconf build also needs tweaking.
+
+https://gitlab.gnome.org/GNOME/dconf/issues/59
+https://github.com/mesonbuild/meson/pull/5936
+
+Despite the comments there about this being incorrect, libdconf is unchanged
+between 0.51 and 0.52 and this patch.
+
+Upstream-Status: Pending [under discussion, see above links]
+Signed-off-by: Richard Purdie <[email protected]>
+
+Index: dconf-0.32.0/client/meson.build
+===================================================================
+--- dconf-0.32.0.orig/client/meson.build
++++ dconf-0.32.0/client/meson.build
+@@ -28,7 +28,7 @@ libdconf_client = static_library(
+ 
+ libdconf_client_dep = declare_dependency(
+   dependencies: gio_dep,
+-  link_whole: libdconf_client,
++  link_with: libdconf_client,
+ )
+ 
+ libdconf = shared_library(
meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb +1 -0
index 8d1bbdfd1..fec04079e 100644
@@ -3,6 +3,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 SECTION = "x11/gnome"
 
+SRC_URI += "file://fix-meson-0.52.patch"
 SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a"
 SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab"
 
Signature · 1 line
2.17.1

From f52194e9806002e66235f63184a2eea0b15c19a1 Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Sun, 20 Oct 2019 13:12:32 +0100
Subject: [PATCH] meson: Backport fix to assist meta-oe breakage

Add a backported commit from upstream which helps fix build failures in meta-oe.

---
 meta/recipes-devtools/meson/meson.inc         |  1 +
 ...e971bd320f3df15c1ee74f54858e6792b183.patch | 95 +++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch
meta/recipes-devtools/meson/meson.inc +1 -0
index ae0091c051c..84bcc8409de 100644
@@ -16,6 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://cross-prop-default.patch \
            file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
+           file://dbc9e971bd320f3df15c1ee74f54858e6792b183.patch \
            "
 SRC_URI[sha256sum] = "d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"
 SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch new file +95 -0

95 lines not on this page · raw message

Signature · 1 line
2.17.1
#32 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

Quoted 7 lines · On Sun, Oct 20, 2019 at 2:32 PM <[email protected]> wrote:

Feeling suitably responsible for this breakage, I looked into it. The following two patches, one for meson in OE-Core and the other for dconf in meta-oe seem to address the problem. I'm not entirely sure they're correct but they don't actually change the library binary so its probably fine whilst upstream sorts it out.

Quoted 6 lines

If they look ok to you I'll submit them "properly".

Cheers,

Richard

Had exactly the same idea for dconf: in the discussion they did link_whole->link_with for libdconf_common which is wrong and was just meant as example.

As soon as I finished bisecting do_rootfs issue (reported) I will try

* dconf-patch
* dconf+meson patch

and report.

Thanks for taking care

Andreas

#33 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

Quoted 19 lines · Andreas Müller
Quoted 7 lines · On Sun, Oct 20, 2019 at 2:32 PM <[email protected]> wrote:

Feeling suitably responsible for this breakage, I looked into it. The following two patches, one for meson in OE-Core and the other for dconf in meta-oe seem to address the problem. I'm not entirely sure they're correct but they don't actually change the library binary so its probably fine whilst upstream sorts it out.

Quoted 6 lines

If they look ok to you I'll submit them "properly".

Cheers,

Richard

Had exactly the same idea for dconf: in the discussion they did link_whole->link_with for libdconf_common which is wrong and was just meant as example.

Quoted 9 lines

As soon as I finished bisecting do_rootfs issue (reported) I will try

* dconf-patch
* dconf+meson patch

and report.

Thanks for taking care

Had to adjust the dconf-patch:

* Here (and in master-next) we moved dconf 0.32 -> 0.34
* The SRC_URI has to go below inherit gnomebase otherwise it does not cause effect.

But very important result: dconf-patch only fixes dconf build!

Will send out reworked version to meta-oe list

Andreas

#34 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

Quoted 12 lines · Andreas Müller
Quoted 10 lines

As soon as I finished bisecting do_rootfs issue (reported) I will try

* dconf-patch
* dconf+meson patch

and report.

Thanks for taking care

Had to adjust the dconf-patch:

Quoted 8 lines

* Here (and in master-next) we moved dconf 0.32 -> 0.34
* The SRC_URI has to go below inherit gnomebase otherwise it does not cause effect.

But very important result: dconf-patch only fixes dconf build!

Will send out reworked version to meta-oe list

15K build tasks later:

Have build my images with both patches (meson/dconf): No fallout but more interesting: The do_rootfs [1] issue is gone and the meson patch was the only change I applied. Have no idea how meson affects qemu (did not build from scratch and qemu-native was rebuild due to dependencies). Whatever: Have a full build again \o/

[1] http://lists.openembedded.org/pipermail/openembedded-core/2019-October/288091.html

Andreas

#35 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

In reply to Alexander Kanavin
Quoted 7 lines · Alexander Kanavin

I certainly don't mean to ignore those reports, it's just that due to my ongoing health problems, and having to dedicate most of my energy to the day job (https://mbition.io/en/home/), I am not currently able to work on the upstream issues in a timely manner the way I used to when maintaining core was actually my day job (at Intel).

The question of how much effort people who update things in core should allocate to fixing 'other' layers has been a conflict point for a long time. I'd prefer to see more aggressive blacklisting/removal of recipes that no one has an interest in fixing and updating.

Alex

First and most important: Wish you the very best to get back full health
Second: If I read meson github issues correctly, there are chances that meson 0.52.1 fixes (works around) static library fallout as seen on dconf
Third: Taking this in was sub-optimal but: We are close to release which is btw the most smooth I've ever seen since I follow this project.

We're back to dirty master where sh*t happens...

Andreas

#36 lore raw

Re: [PATCH 16/19] meson: update to 0.52.0

Quoted 26 lines · Andreas Müller
Quoted 7 lines · Alexander Kanavin

I certainly don't mean to ignore those reports, it's just that due to my ongoing health problems, and having to dedicate most of my energy to the day job (https://mbition.io/en/home/), I am not currently able to work on the upstream issues in a timely manner the way I used to when maintaining core was actually my day job (at Intel).

Quoted 8 lines

The question of how much effort people who update things in core should allocate to fixing 'other' layers has been a conflict point for a long time. I'd prefer to see more aggressive blacklisting/removal of recipes that no one has an interest in fixing and updating.

Alex

First and most important: Wish you the very best to get back full health
Second: If I read meson github issues correctly, there are chances that meson 0.52.1 fixes (works around) static library fallout as seen on dconf
Third: Taking this in was sub-optimal but: We are close to release which is btw the most smooth I've ever seen since I follow this project.

Quoted 1 line

We're back to dirty master where sh*t happens...

Just to be clear for those not following close, this is only on master and not on the release branch which did not get this change.

Cheers,

Richard

#37 lore raw

PATCH 17/19 libmodulemd-v1: introduce the recipe

In reply to Alexander Kanavin

Upstream has split version 1 of the libmodulemd recipe into its own branch and removed version 1 from the master branch and 2.x releases; as libdnf requires v1 of libmodulemd, this commit introduces a v1-specific revipe.

---
 meta/conf/distro/include/maintainers.inc      |  1 +
 meta/recipes-devtools/libdnf/libdnf_0.28.1.bb |  2 +-
 ...t-generate-gtkdoc-or-python-bindings.patch | 60 +++++++++++++++++++
 ...ec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch | 22 +++++++
 .../libmodulemd/libmodulemd-v1_git.bb         | 26 ++++++++
 5 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
 create mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
 create mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
meta/conf/distro/include/maintainers.inc +1 -0
index ab0c6c55412..7a9d55c5c34 100644
@@ -356,6 +356,7 @@ RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <[email protected]>"
 RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin <[email protected]>"
+RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-libnl = "Alexander Kanavin <[email protected]>"
meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +1 -1
index 4ff294c32cb..3f11e0231fa 100644
@@ -13,7 +13,7 @@ SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native"
+DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd-v1 json-c swig-native"
 
 inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base
 
meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch new file +60 -0

60 lines not on this page · raw message

meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch new file +22 -0
new file mode 100644
index 00000000000..847b5f700b0
@@ -0,0 +1,22 @@
+From 4e67f6049b3f822fe6f5af46790a51ace581bf82 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Tue, 6 Nov 2018 13:41:29 +0100
+Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+
+---
+ spec_tmpl.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec_tmpl.sh b/spec_tmpl.sh
+index 0238087..126853c 100755
+--- a/spec_tmpl.sh
++++ b/spec_tmpl.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/sh
++#!/bin/sh
+ 
+ version=$1
+ template=$2
meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb new file +26 -0
new file mode 100644
index 00000000000..9790470f4fe
@@ -0,0 +1,26 @@
+SUMMARY = "C Library for manipulating module metadata files"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
+
+SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=1.x-maint \
+           file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
+           file://0001-Do-not-generate-gtkdoc-or-python-bindings.patch \
+           "
+
+PV = "1.8.15"
+SRCREV = "2d461725f781c6fdcf32893d8dcfa40bcef8dda5"
+UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)"
+
+S = "${WORKDIR}/git"
+
+inherit meson gobject-introspection
+
+EXTRA_OEMESON = "-Ddeveloper_build=false"
+
+DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
+
+BBCLASSEXTEND = "native nativesdk"
+
+GIR_MESON_OPTION = 'skip_introspection'
+GIR_MESON_ENABLE_FLAG = 'false'
+GIR_MESON_DISABLE_FLAG = 'true'
Signature · 1 line
2.17.1
#38 lore raw

PATCH 18/19 libmodulemd: remove the recipe

In reply to Alexander Kanavin

Version 2 of the recipe is not actually required by anything; the lidmodulemd dependency in createrepo-c is optional, and the libmodulemd feature is not used in YP.

---
 meta/conf/distro/include/maintainers.inc      |  1 -
 .../createrepo-c/createrepo-c_0.15.0.bb       |  4 +-
 ...ec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch | 22 ------
 ...xplicitly-specify-the-v1-library-in-.patch | 28 --------
 ...n.build-do-not-generate-gir-or-gtkdo.patch | 71 -------------------
 .../libmodulemd/libmodulemd_git.bb            | 26 -------
 6 files changed, 2 insertions(+), 150 deletions(-)
 delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
 delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
 delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch
 delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
meta/conf/distro/include/maintainers.inc +0 -1
index 7a9d55c5c34..d85e5b697f5 100644
@@ -355,7 +355,6 @@ RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <[email protected]>"
-RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <[email protected]>"
meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb +2 -2
index ae0a35da847..dc1b851b2d7 100644
@@ -12,12 +12,12 @@ SRCREV = "2077ba104eae04bb819e9e0c906c8c835b62e7a6"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm libmodulemd"
+DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm"
 DEPENDS_append_class-native = " file-replacement-native"
 
 inherit cmake pkgconfig bash-completion distutils3-base
 
-EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF"
+EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF -DWITH_LIBMODULEMD=OFF"
 
 BBCLASSEXTEND = "native nativesdk"
 
meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch deleted +0 -22
deleted file mode 100644
index 2598c177c4c..00000000000
@@ -1,22 +0,0 @@
-From 74ea6a665d0f3417e75f1d3d02f27a12f128ec70 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 6 Nov 2018 13:41:29 +0100
-Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- spec_tmpl.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec_tmpl.sh b/spec_tmpl.sh
-index 14e895a..fc80fc6 100755
---- a/spec_tmpl.sh
-+++ b/spec_tmpl.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#!/bin/sh
- 
- version=$1
- libmodulemd_v1_version=$2
meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch deleted +0 -28
deleted file mode 100644
index 1568d25f9d8..00000000000
@@ -1,28 +0,0 @@
-From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 21 May 2019 17:59:26 +0200
-Subject: [PATCH] v1/meson.build: explicitly specify the v1 library in
- pkgconfig
-
-Otherwise there would be '-lmodulemd' which resolves
-to v2 version if both v2 and v1 are present in the sysroot.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- modulemd/v1/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
-index 4d54e69..9144ca2 100644
---- a/modulemd/v1/meson.build
-+++ b/modulemd/v1/meson.build
-@@ -325,7 +325,7 @@ configure_file(
- )
- 
- pkg.generate(
--    libraries : modulemd_v1_lib,
-+    libraries : '-l:libmodulemd.so.1',
-     subdirs : v1_header_path,
-     version : libmodulemd_v1_version,
-     name : 'modulemd',
meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch deleted +0 -71

71 lines not on this page · raw message

meta/recipes-devtools/libmodulemd/libmodulemd_git.bb deleted +0 -26
deleted file mode 100644
index 63d3fad6ab4..00000000000
@@ -1,26 +0,0 @@
-SUMMARY = "C Library for manipulating module metadata files"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
-
-SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \
-           file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
-           file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \
-           file://0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch \
-           "
-
-PV = "2.6.0"
-SRCREV = "7c7f88258491866cdb86d26cadfce37a78f242ec"
-
-S = "${WORKDIR}/git"
-
-inherit meson gobject-introspection
-
-EXTRA_OEMESON = "-Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true"
-
-DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
-
-BBCLASSEXTEND = "native nativesdk"
-
-GIR_MESON_OPTION = 'skip_introspection'
-GIR_MESON_ENABLE_FLAG = 'false'
-GIR_MESON_DISABLE_FLAG = 'true'
Signature · 1 line
2.17.1
#39 lore raw

PATCH 19/19 createrepo-c: upgrade to 0.15.1

In reply to Alexander Kanavin
---
 .../{createrepo-c_0.15.0.bb => createrepo-c_0.15.1.bb}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.15.0.bb => createrepo-c_0.15.1.bb} (95%)
meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb renamed from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb +1 -1
similarity index 95%
rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb
index dc1b851b2d7..797db738f47 100644
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
            file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            "
 
-SRCREV = "2077ba104eae04bb819e9e0c906c8c835b62e7a6"
+SRCREV = "bc67f19ed09593e3886ebeee2391e9d51cc3439f"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.17.1