diff options
author | 2024-08-27 07:23:24 +0200 | |
---|---|---|
committer | 2024-08-27 12:01:04 +0100 | |
commit | 68ac84d6f4aa4f9342b53814b08a4a888f006a2c (patch) | |
tree | 4ce08043e53c6532b63806a271ba196fd01d5a9b | |
parent | 5250f021d73ba78ade312734b42fdbbe347cca03 (diff) | |
download | openembedded-core-68ac84d6f4aa4f9342b53814b08a4a888f006a2c.tar.gz |
glib-2.0: update 2.80.2 -> 2.80.4
Drop backport 0001-girepository-introspection-correctly-install-.gir-fi.patch
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
14 files changed, 15 insertions, 104 deletions
diff --git a/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch index 10568b7c9f..ae140b9930 100644 --- a/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 10b08af6c7dcb03f954da29b6c4f9636b8796f30 Mon Sep 17 00:00:00 2001 +From bcf62c2e776b9716880ac65e5d553d75d5fddc2e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 15 Feb 2019 11:17:27 +0100 Subject: [PATCH] Do not prefix executables with $bindir in pkg-config files diff --git a/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch index b9c9706fc4..6da9399569 100644 --- a/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +++ b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch @@ -1,4 +1,4 @@ -From 55c49c51d8db5af15132653003d2b65a5215eebf Mon Sep 17 00:00:00 2001 +From 1d88f52c42a0ed469cb5976f5788b4ba25bb14f9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 15 Mar 2014 22:42:29 -0700 Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux diff --git a/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index bc539fe3e8..8423f63cbb 100644 --- a/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -1,4 +1,4 @@ -From 53333cf3ec787cb7e60585237327390e2ca89f4c Mon Sep 17 00:00:00 2001 +From 75f9eaf2ef760ffb198b0b97a9054f435c79cde9 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 22 Mar 2016 15:14:58 +0200 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM diff --git a/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch index 5e543339d8..bd7ed77642 100644 --- a/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +++ b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch @@ -1,4 +1,4 @@ -From 3db055ce8029372096be534c5cfc385f068bab17 Mon Sep 17 00:00:00 2001 +From 22dcd727203d59a025c8be4280b4654a7054322f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 12 Jun 2015 17:08:46 +0300 Subject: [PATCH] Remove the warning about deprecated paths in schemas diff --git a/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch index aa7127b65b..8b4304462e 100644 --- a/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +++ b/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch @@ -1,4 +1,4 @@ -From 97b4f18c65c52c9e6412ecf8affc22f6f42d3465 Mon Sep 17 00:00:00 2001 +From 3f054111f991a9dd224b6201dafad7e2c28cb78d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 8 Jan 2020 18:22:46 +0100 Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test diff --git a/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch b/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch deleted file mode 100644 index 7be9cd8b84..0000000000 --- a/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch +++ /dev/null @@ -1,88 +0,0 @@ -From f1beef5c2d09fae3a5e5a314f984cb3f20abe732 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Tue, 23 Apr 2024 11:24:34 +0200 -Subject: [PATCH] girepository/introspection: correctly install .gir files into - custom locations provided via meson option - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4020] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - girepository/introspection/meson.build | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/girepository/introspection/meson.build b/girepository/introspection/meson.build -index 9405686..862ca61 100644 ---- a/girepository/introspection/meson.build -+++ b/girepository/introspection/meson.build -@@ -49,6 +49,7 @@ glib_gir = gnome.generate_gir(libglib, - export_packages: 'glib-2.0', - header: 'glib.h', - install: true, -+ install_dir_gir: glib_girdir, - dependencies: [ - libgobject_dep, - ], -@@ -76,6 +77,7 @@ if host_system == 'windows' - header: 'glib.h', - includes: [ glib_gir[0] ], - install: true, -+ install_dir_gir: glib_girdir, - dependencies: [ - libgobject_dep, - ], -@@ -104,6 +106,7 @@ else - header: 'glib.h', - includes: [ glib_gir[0] ], - install: true, -+ install_dir_gir: glib_girdir, - dependencies: [ - libgobject_dep, - ], -@@ -137,6 +140,7 @@ gobject_gir = gnome.generate_gir(libgobject, - header: 'glib-object.h', - includes: [ glib_gir[0] ], - install: true, -+ install_dir_gir: glib_girdir, - env: gi_gen_env_variables, - extra_args: gir_args + [ - '-DGOBJECT_COMPILATION', -@@ -162,6 +166,7 @@ gmodule_gir = gnome.generate_gir(libgmodule, - header: 'gmodule.h', - includes: [ glib_gir[0] ], - install: true, -+ install_dir_gir: glib_girdir, - dependencies: [ - libglib_dep, - ], -@@ -224,6 +229,7 @@ gio_gir = gnome.generate_gir(libgio, - header: 'gio/gio.h', - includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0] ], - install: true, -+ install_dir_gir: glib_girdir, - dependencies: [ - libglib_dep, - libgobject_dep, -@@ -249,6 +255,7 @@ if host_system == 'windows' - header: 'gio/gio.h', - includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ], - install: true, -+ install_dir_gir: glib_girdir, - dependencies: [ - libglib_dep, - libgobject_dep, -@@ -277,6 +284,7 @@ else - header: 'gio/gio.h', - includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ], - install: true, -+ install_dir_gir: glib_girdir, - dependencies: [ - libglib_dep, - libgobject_dep, -@@ -314,6 +322,7 @@ girepository_gir = gnome.generate_gir(libgirepository, - header: 'girepository/girepository.h', - includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ], - install: true, -+ install_dir_gir: glib_girdir, - dependencies: [ libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep ], - extra_args: gir_args + libgirepository_gir_args, - ) diff --git a/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch index 3a8d3596b0..ea1ab568d1 100644 --- a/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch +++ b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch @@ -1,4 +1,4 @@ -From f04ea29f9f96892ada81bd0acfcef70183138229 Mon Sep 17 00:00:00 2001 +From de3eabf9295816b4b4eb7428dee504fd505e723d Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 12 Oct 2019 17:46:26 -0700 Subject: [PATCH] meson: Run atomics test on clang as well @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 257afb5..5caa6e6 100644 +index b995ebc..a907736 100644 --- a/meson.build +++ b/meson.build -@@ -2024,7 +2024,7 @@ atomicdefine = ''' +@@ -2021,7 +2021,7 @@ atomicdefine = ''' # We know that we can always use real ("lock free") atomic operations with MSVC if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') have_atomic_lock_free = true diff --git a/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch index 9be04960aa..82a7a5ad23 100644 --- a/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch +++ b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch @@ -1,4 +1,4 @@ -From a63c865aa9a24f3230e8e2bcb5bce88f179c7e2b Mon Sep 17 00:00:00 2001 +From 546aa941d2fd42f69b3e2bd6625d65c145a5e265 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex@linutronix.de> Date: Sat, 16 Sep 2023 22:28:27 +0200 Subject: [PATCH] meson.build: do not enable pidfd features on native glib @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 5caa6e6..688f214 100644 +index a907736..53cffb5 100644 --- a/meson.build +++ b/meson.build -@@ -1022,7 +1022,8 @@ if cc.links('''#include <sys/syscall.h> +@@ -1019,7 +1019,8 @@ if cc.links('''#include <sys/syscall.h> waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG); return 0; }''', name : 'pidfd_open(2) system call') diff --git a/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch index 4dec252c1f..30a6bd4c3a 100644 --- a/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch +++ b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch @@ -1,4 +1,4 @@ -From dc7f09c4f52638a70768c528d186da6f83dedc97 Mon Sep 17 00:00:00 2001 +From 20f64ba4b48e46cf238dc638dc3305036358122b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 3 Oct 2017 10:45:55 +0300 Subject: [PATCH] Do not hardcode python path into various tools diff --git a/meta/recipes-core/glib-2.0/files/relocate-modules.patch b/meta/recipes-core/glib-2.0/files/relocate-modules.patch index a1ff198aa6..a00703cef8 100644 --- a/meta/recipes-core/glib-2.0/files/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/files/relocate-modules.patch @@ -1,4 +1,4 @@ -From 0133aeabd37a9137722abd86039d7d0797b5896f Mon Sep 17 00:00:00 2001 +From 41470a56d9ae12912e3f2f9cfb0c126b4f91cd53 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds diff --git a/meta/recipes-core/glib-2.0/files/skip-timeout.patch b/meta/recipes-core/glib-2.0/files/skip-timeout.patch index 0f8b51294b..5ede64fd59 100644 --- a/meta/recipes-core/glib-2.0/files/skip-timeout.patch +++ b/meta/recipes-core/glib-2.0/files/skip-timeout.patch @@ -1,4 +1,4 @@ -From ac75f5d9206e52eec64fef0db4cd91b58a764c99 Mon Sep 17 00:00:00 2001 +From 18d6798ba0e4e15d63a63485b729b6ef1b6a4457 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@arm.com> Date: Thu, 28 Mar 2024 16:27:09 +0000 Subject: [PATCH] Skip /timeout/rounding test diff --git a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.2.bb b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.4.bb index acec7e9676..acec7e9676 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.2.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.4.bb diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.80.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.80.4.bb index ef80cc47cf..ef80cc47cf 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.80.2.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.80.4.bb diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 690d1c162c..9e742c4d3b 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -226,13 +226,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://skip-timeout.patch \ - file://0001-girepository-introspection-correctly-install-.gir-fi.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ " -SRC_URI[sha256sum] = "b9cfb6f7a5bd5b31238fd5d56df226b2dda5ea37611475bf89f6a0f9400fe8bd" +SRC_URI[sha256sum] = "24e029c5dfc9b44e4573697adf33078a9827c48938555004b3b9096fa4ea034f" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. |