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 41b2dfb5c4..8044ab17c9 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 2ccf2016cae7dad83cbc3f00e3fefa3ca16ae707 Mon Sep 17 00:00:00 2001 +From 4b5c716146a03001c0006731f974e578672aeb44 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 15 Feb 2019 11:17:27 +0100 Subject: [PATCH] Do not prefix executables with $bindir in pkg-config files @@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gio/meson.build b/gio/meson.build -index f9aa0c8..48ff2a5 100644 +index a158823..e3ce982 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -934,17 +934,18 @@ libgio_dep = declare_dependency(link_with : libgio, +@@ -938,17 +938,18 @@ libgio_dep = declare_dependency(link_with : libgio, pkg.generate(libgio, requires : ['glib-2.0', 'gobject-2.0'], variables : [ 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 2b1a2134c8..a442f74064 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 8ec44223e9cdedc4ca5b0c2b806c02c215f07b45 Mon Sep 17 00:00:00 2001 +From f44ed0ae64f68713601ec0938c06fbb9f2b53101 Mon Sep 17 00:00:00 2001 From: Khem Raj 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 6968f725ed..a429e87e6a 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 e18fd4c362b3e23ec10ac1c223ad9c5ee6b5993a Mon Sep 17 00:00:00 2001 +From 952e8c37edf7dd8005b2131701816e95c8ff2f3a Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 22 Mar 2016 15:14:58 +0200 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM @@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/meson.build b/gio/meson.build -index a3e6f18..f9aa0c8 100644 +index 7adfd0e..a158823 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -1066,7 +1066,7 @@ executable('gresource', 'gresource-tool.c', +@@ -1070,7 +1070,7 @@ executable('gresource', 'gresource-tool.c', gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', install : true, 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 022094bb17..0037094875 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 b920bbb775210dc81fff3e12260ee0cd9d4e6ef1 Mon Sep 17 00:00:00 2001 +From 57d827fcba6a97423d977b2df38d51187137b83a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin 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 402859149a..52caedbdf7 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 d15b734a85ff94c8b80ccb1ad22154741140152e Mon Sep 17 00:00:00 2001 +From 9f365868765590f37262e56719c692bc9f4b0808 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 8 Jan 2020 18:22:46 +0100 Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test @@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/tests/resources.c b/gio/tests/resources.c -index ee9cee4..ff844c1 100644 +index decf921..4d5a466 100644 --- a/gio/tests/resources.c +++ b/gio/tests/resources.c -@@ -1196,7 +1196,7 @@ main (int argc, +@@ -1245,7 +1245,7 @@ main (int argc, g_test_add_func ("/resource/automatic", test_resource_automatic); /* This only uses automatic resources too, so it tests the constructors and destructors */ g_test_add_func ("/resource/module", test_resource_module); 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 bbb85c2355..49e32636e8 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 ebb658f1387978e88eee317920c15fae59d11ba1 Mon Sep 17 00:00:00 2001 +From 5ae1bdd68b20143616e6b7db695562a1932a390d Mon Sep 17 00:00:00 2001 From: Khem Raj 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 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 22ed181..87497b7 100644 +index efa7e89..00a12b6 100644 --- a/meson.build +++ b/meson.build -@@ -2100,7 +2100,7 @@ atomicdefine = ''' +@@ -2101,7 +2101,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 abf45bd809..996d69f123 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 b4b512340934801a004b69d37c83846ca63afc34 Mon Sep 17 00:00:00 2001 +From 4db29a5bb384187ba438973f37783633eb6cf435 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin 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 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 87497b7..6955b02 100644 +index 00a12b6..6c74707 100644 --- a/meson.build +++ b/meson.build -@@ -1098,7 +1098,8 @@ if cc.links('''#include +@@ -1095,7 +1095,8 @@ if cc.links('''#include 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 3ad5ab3f6d..d31bacce62 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 dedb9b25edc15c63c4068b87fb6ae2e205ab30da Mon Sep 17 00:00:00 2001 +From e0d4d304b62ea179fed8f9457ed5ff3f04fefd33 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 3 Oct 2017 10:45:55 +0300 Subject: [PATCH] Do not hardcode python path into various tools @@ -32,7 +32,7 @@ index 0578b74..56e8e2e 100755 # pylint: disable=too-many-lines, missing-docstring, invalid-name diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in -index f388714..37ed491 100755 +index 1f5a35a..d29e9a8 100755 --- a/gobject/glib-mkenums.in +++ b/gobject/glib-mkenums.in @@ -1,4 +1,4 @@ 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 d5d97f3a4a..1dccd77f82 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 c41b9b46ab9ada1c3a3e0d63ef1a0535a3c92457 Mon Sep 17 00:00:00 2001 +From e60b5c7f8cad49d23d42aa383721d6ab8aa7794e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds @@ -21,10 +21,10 @@ Signed-off-by: Peter Marko 1 file changed, 18 insertions(+) diff --git a/gio/giomodule.c b/gio/giomodule.c -index 7311775..abc2c79 100644 +index 4d09fe5..0b693d6 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -1312,6 +1312,24 @@ get_gio_module_dir (void) +@@ -1313,6 +1313,24 @@ get_gio_module_dir (void) module_dir = get_gio_module_dir_darwin (); #else module_dir = g_strdup (GIO_MODULE_DIR); diff --git a/meta/recipes-core/glib-2.0/files/skip-monotonic-time-similar.patch b/meta/recipes-core/glib-2.0/files/skip-monotonic-time-similar.patch index 9cb03bc65c..5fca8d172e 100644 --- a/meta/recipes-core/glib-2.0/files/skip-monotonic-time-similar.patch +++ b/meta/recipes-core/glib-2.0/files/skip-monotonic-time-similar.patch @@ -1,4 +1,4 @@ -From f663a6986d82001cc6f60c3625c3dc532651dcb1 Mon Sep 17 00:00:00 2001 +From d5fb9817e496d2fcbffc5a8e34158d79ad3795e9 Mon Sep 17 00:00:00 2001 From: Pratik Farkase Date: Wed, 5 Aug 2026 08:00:00 +0000 Subject: [PATCH] Skip /monotonic-time-ns/similar test @@ -19,10 +19,10 @@ Signed-off-by: Pratik Farkase 1 file changed, 1 deletion(-) diff --git a/glib/tests/monotonic-time.c b/glib/tests/monotonic-time.c -index 04ff898..dae0533 100644 +index b3d869e..c758a88 100644 --- a/glib/tests/monotonic-time.c +++ b/glib/tests/monotonic-time.c -@@ -153,7 +153,6 @@ main (int argc, char *argv[]) +@@ -159,7 +159,6 @@ main (int argc, char *argv[]) g_test_add_func ("/monotonic-time-ns/increasing", test_increasing_ns); g_test_add_func ("/monotonic-time/usleep", test_usleep); g_test_add_func ("/monotonic-time-ns/usleep", test_usleep_ns); 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 86e2883a27..06c0edbd17 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 8f34800e6f3ad201b3fd6f6b333f32c45b2df591 Mon Sep 17 00:00:00 2001 +From 2b11ed949e43bf6026e43c6048137a2f28f8a9f3 Mon Sep 17 00:00:00 2001 From: Ross Burton 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.90.0.bb b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.90.1.bb similarity index 100% rename from meta/recipes-core/glib-2.0/glib-2.0-initial_2.90.0.bb rename to meta/recipes-core/glib-2.0/glib-2.0-initial_2.90.1.bb diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.90.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.90.1.bb similarity index 100% rename from meta/recipes-core/glib-2.0/glib-2.0_2.90.0.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.90.1.bb diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 9af625e05a..7dfde64db5 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -240,7 +240,7 @@ SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ " -SRC_URI[archive.sha256sum] = "17d15cac2af80a33271127408e0abc2748eb297c595c2a26409e81e14e7d1b8f" +SRC_URI[archive.sha256sum] = "93c941aa17d5eb1d53fe838365f29a8b4e539c222a256d974ec8f30fc413e396" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON.