@@ -1,4 +1,4 @@
-From 94f8f5bf51db5219022f6a646e784cb67d284282 Mon Sep 17 00:00:00 2001
+From 2ccf2016cae7dad83cbc3f00e3fefa3ca16ae707 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
@@ -1,4 +1,4 @@
-From c80659ca01051f8e83dccd4eda15a811b0ea377d Mon Sep 17 00:00:00 2001
+From 8ec44223e9cdedc4ca5b0c2b806c02c215f07b45 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
@@ -1,4 +1,4 @@
-From 25d6cb83b6b46181fbdad1a6f872a3788d6e4843 Mon Sep 17 00:00:00 2001
+From e18fd4c362b3e23ec10ac1c223ad9c5ee6b5993a 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
@@ -1,4 +1,4 @@
-From 29be4e2681b78d7856143056f769040be076b03d Mon Sep 17 00:00:00 2001
+From b920bbb775210dc81fff3e12260ee0cd9d4e6ef1 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
@@ -1,4 +1,4 @@
-From 12bf3fded3b4c0c7b2d7ae7810d6eef47ed747e5 Mon Sep 17 00:00:00 2001
+From d15b734a85ff94c8b80ccb1ad22154741140152e 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
deleted file mode 100644
@@ -1,35 +0,0 @@
-From ed5956d0000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
-Date: Thu, 30 Jul 2026 11:28:36 +0000
-Subject: [PATCH] gio/tests/services: Fix installed service file containing
- build path
-
-The refactoring in !5259 changed the installed service file's
-configure_file() to use the build output as input instead of the
-original .in template. Since @installed_tests_dir@ is already
-substituted in the build output, the installed version gets the
-build directory path instead of the install prefix.
-
-Use the .in template directly as input for the installed version.
-
-Closes #4011
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/ed5956d]
-Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
----
- gio/tests/services/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio/tests/services/meson.build b/gio/tests/services/meson.build
-index 1111111..2222222 100644
---- a/gio/tests/services/meson.build
-+++ b/gio/tests/services/meson.build
-@@ -18,7 +18,7 @@ foreach service_file_name : dbus_service_files
- # Build a second copy of the service file for the installed
- # version of the tests.
- installed_service_file = configure_file(
-- input: service_file,
-+ input: service_file_name + '.in',
- output: service_file_name + '.to-install',
- configuration: installed_cdata,
- )
deleted file mode 100644
@@ -1,44 +0,0 @@
-From 1567250294e9666747ee63f5c6364bbceadd300b Mon Sep 17 00:00:00 2001
-From: Sunil Dora <sunilkumar.dora@windriver.com>
-Date: Sun, 30 Aug 2026 11:39:28 +0530
-Subject: [PATCH] gtype: Mark the G_DEFINE_TYPE parent_class variable as unused
-
-clang 23 added -Wunused-but-set-global, which fires on the
-type_name##_parent_class variable that _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE
-emits whenever a type never chains up to its parent:
-
- error: variable 'my_thing_parent_class' set but not used
- [-Werror,-Wunused-but-set-global]
-
-Projects that promote the unused-but-set group to an error (pango, for
-one) now fail to build with clang 23, and they cannot fix it on their
-side because the variable comes from this macro.
-
-Annotate it G_GNUC_UNUSED, the same treatment the adjacent
-get_instance_private helper already gets.
-
-Signed-off-by: Sunil Dora <sunilkumar.dora@windriver.com>
-Fixes: #4038
-
-Upstream-Status: Backport [1567250294e9666747ee63f5c6364bbceadd300b]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- gobject/gtype.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gobject/gtype.h b/gobject/gtype.h
-index 1d383a8ea..de5188f9f 100644
---- a/gobject/gtype.h
-+++ b/gobject/gtype.h
-@@ -2295,7 +2295,7 @@ static void type_name##_class_intern_init (gpointer klass) \
- static void type_name##_init (TypeName *self); \
- static void type_name##_class_init (TypeName##Class *klass); \
- static GType type_name##_get_type_once (void); \
--static gpointer type_name##_parent_class = NULL; \
-+G_GNUC_UNUSED static gpointer type_name##_parent_class = NULL; \
- static gint TypeName##_private_offset; \
- \
- _G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
-2.43.0
-
@@ -1,4 +1,4 @@
-From 0530e624dd47ee18aab18c8d403da12bb297f26e Mon Sep 17 00:00:00 2001
+From ebb658f1387978e88eee317920c15fae59d11ba1 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
@@ -1,4 +1,4 @@
-From 0147fb147548e0657f298ab8e050ef8aaad3c850 Mon Sep 17 00:00:00 2001
+From b4b512340934801a004b69d37c83846ca63afc34 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
@@ -1,4 +1,4 @@
-From 2bafa636db0241952b9168c62f051900ebf8b058 Mon Sep 17 00:00:00 2001
+From dedb9b25edc15c63c4068b87fb6ae2e205ab30da 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
deleted file mode 100644
@@ -1,92 +0,0 @@
-From 9a59b64b294843842efc86148485c8b3530cdfd1 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <pwithnall@gnome.org>
-Date: Thu, 16 Apr 2026 15:27:37 +0100
-Subject: [PATCH] gdbusintrospection: Fix XML parser state handling for <node>
- element nesting
-
-The check for whether a `<node>` element in D-Bus introspection XML was
-nested correctly was broken. `<node>` elements can only be at the top
-level, or nested immediately within another `<node>` element.
-
-Fix the check and add some unit tests for it.
-
-Spotted by linhlhq as #YWH-PGM9867-204. The fix is mine, and the unit test
-uses example XML strings adapted from their report.
-
-Signed-off-by: Philip Withnall <pwithnall@gnome.org>
-
-Fixes: #3932
-
-CVE: CVE-2026-58016
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/c9da977c178fbfc0e4caf99f9fdf5dc433d6fcc2]
-
-Signed-off-by: Benjamin Robin <benjamin.robin@bootlin.com>
----
- gio/gdbusintrospection.c | 2 +-
- gio/tests/gdbus-introspection.c | 33 +++++++++++++++++++++++++++++++++
- 2 files changed, 34 insertions(+), 1 deletion(-)
-
-diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c
-index df5daa3..78a63e2 100644
---- a/gio/gdbusintrospection.c
-+++ b/gio/gdbusintrospection.c
-@@ -1258,7 +1258,7 @@ parser_start_element (GMarkupParseContext *context,
- /* ---------------------------------------------------------------------------------------------------- */
- if (strcmp (element_name, "node") == 0)
- {
-- if (!(g_slist_length (stack) >= 1 || strcmp (stack->next->data, "node") != 0))
-+ if (stack->next != NULL && strcmp (stack->next->data, "node") != 0)
- {
- g_set_error_literal (error,
- G_MARKUP_ERROR,
-diff --git a/gio/tests/gdbus-introspection.c b/gio/tests/gdbus-introspection.c
-index cb99c94..05710d4 100644
---- a/gio/tests/gdbus-introspection.c
-+++ b/gio/tests/gdbus-introspection.c
-@@ -300,6 +300,38 @@ test_extra_data (void)
- g_dbus_node_info_unref (info);
- }
-
-+static void
-+test_invalid (void)
-+{
-+ const struct
-+ {
-+ const char *xml;
-+ GMarkupError expected_error_code;
-+ }
-+ vectors[] =
-+ {
-+ { "", G_MARKUP_ERROR_EMPTY },
-+ { "<node><interface name=\"I\"><method name=\"M\"><node><interface name=\"I2\"></interface></node></method>", G_MARKUP_ERROR_INVALID_CONTENT },
-+ { "<node><interface name=\"I\"><signal name=\"S\"><node><interface name=\"I2\"><signal name=\"S2\"></signal></interface></node></signal>", G_MARKUP_ERROR_INVALID_CONTENT },
-+ { "<node><interface name=\"I\"><property name=\"P\" type=\"s\" access=\"read\"><node><interface name=\"I2\"></interface></node></property>", G_MARKUP_ERROR_INVALID_CONTENT },
-+ { "<node><interface name=\"I\"><method name=\"M\"><arg type=\"\"><node><interface name=\"I2\"><method name=\"M2\"></method></interface></node></arg>", G_MARKUP_ERROR_INVALID_CONTENT },
-+ };
-+
-+ for (size_t i = 0; i < G_N_ELEMENTS (vectors); i++)
-+ {
-+ GDBusNodeInfo *node;
-+ GError *local_error = NULL;
-+
-+ g_test_message ("Testing parsing of %s gives an error", vectors[i].xml);
-+
-+ node = g_dbus_node_info_new_for_xml (vectors[i].xml, &local_error);
-+ g_assert_error (local_error, G_MARKUP_ERROR, (int) vectors[i].expected_error_code);
-+ g_assert_null (node);
-+
-+ g_clear_error (&local_error);
-+ }
-+}
-+
- /* ---------------------------------------------------------------------------------------------------- */
-
- int
-@@ -317,6 +349,7 @@ main (int argc,
- g_test_add_func ("/gdbus/introspection-generate", test_generate);
- g_test_add_func ("/gdbus/introspection-default-direction", test_default_direction);
- g_test_add_func ("/gdbus/introspection-extra-data", test_extra_data);
-+ g_test_add_func ("/gdbus/introspection/invalid", test_invalid);
-
- ret = session_bus_run ();
-
deleted file mode 100644
@@ -1,96 +0,0 @@
-From 02e38caa6265e25da87836ec46c9e514d4a81159 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <pwithnall@gnome.org>
-Date: Thu, 16 Apr 2026 15:08:10 +0100
-Subject: [PATCH] gdbusintrospection: Add some assertions before array
- dereferences
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The state handling inside the D-Bus introspection XML parser is
-complicated, and it’s possible that these dereferences of the
-`len - 1`th element might get reached when the array is empty.
-
-Make failures like that more debuggable by adding an assertion on the
-length beforehand.
-
-Signed-off-by: Philip Withnall <pwithnall@gnome.org>
-
-Helps: #3932
-
-CVE: CVE-2026-58016
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/656ad4582cb1d7a7fa8bafe3ce8aec6aa3c17da0]
-
-Signed-off-by: Benjamin Robin <benjamin.robin@bootlin.com>
----
- gio/gdbusintrospection.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c
-index 78a63e2..4df8e87 100644
---- a/gio/gdbusintrospection.c
-+++ b/gio/gdbusintrospection.c
-@@ -1096,6 +1096,7 @@ parse_data_get_annotation (ParseData *data,
- {
- if (create_new)
- g_ptr_array_add (data->annotations, g_new0 (GDBusAnnotationInfo, 1));
-+ g_assert (data->annotations->len > 0);
- return data->annotations->pdata[data->annotations->len - 1];
- }
-
-@@ -1105,6 +1106,7 @@ parse_data_get_arg (ParseData *data,
- {
- if (create_new)
- g_ptr_array_add (data->args, g_new0 (GDBusArgInfo, 1));
-+ g_assert (data->args->len > 0);
- return data->args->pdata[data->args->len - 1];
- }
-
-@@ -1114,6 +1116,7 @@ parse_data_get_out_arg (ParseData *data,
- {
- if (create_new)
- g_ptr_array_add (data->out_args, g_new0 (GDBusArgInfo, 1));
-+ g_assert (data->out_args->len > 0);
- return data->out_args->pdata[data->out_args->len - 1];
- }
-
-@@ -1123,6 +1126,7 @@ parse_data_get_method (ParseData *data,
- {
- if (create_new)
- g_ptr_array_add (data->methods, g_new0 (GDBusMethodInfo, 1));
-+ g_assert (data->methods->len > 0);
- return data->methods->pdata[data->methods->len - 1];
- }
-
-@@ -1132,6 +1136,7 @@ parse_data_get_signal (ParseData *data,
- {
- if (create_new)
- g_ptr_array_add (data->signals, g_new0 (GDBusSignalInfo, 1));
-+ g_assert (data->signals->len > 0);
- return data->signals->pdata[data->signals->len - 1];
- }
-
-@@ -1141,6 +1146,7 @@ parse_data_get_property (ParseData *data,
- {
- if (create_new)
- g_ptr_array_add (data->properties, g_new0 (GDBusPropertyInfo, 1));
-+ g_assert (data->properties->len > 0);
- return data->properties->pdata[data->properties->len - 1];
- }
-
-@@ -1150,6 +1156,7 @@ parse_data_get_interface (ParseData *data,
- {
- if (create_new)
- g_ptr_array_add (data->interfaces, g_new0 (GDBusInterfaceInfo, 1));
-+ g_assert (data->interfaces->len > 0);
- return data->interfaces->pdata[data->interfaces->len - 1];
- }
-
-@@ -1159,6 +1166,7 @@ parse_data_get_node (ParseData *data,
- {
- if (create_new)
- g_ptr_array_add (data->nodes, g_new0 (GDBusNodeInfo, 1));
-+ g_assert (data->nodes->len > 0);
- return data->nodes->pdata[data->nodes->len - 1];
- }
-
@@ -1,4 +1,4 @@
-From 226f4955e53c6b3f360f346e41a0a22b74cbbaae Mon Sep 17 00:00:00 2001
+From c41b9b46ab9ada1c3a3e0d63ef1a0535a3c92457 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
@@ -1,6 +1,6 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From f663a6986d82001cc6f60c3625c3dc532651dcb1 Mon Sep 17 00:00:00 2001
From: Pratik Farkase <pratik.farkase@est.tech>
-Date: Tue, 5 Aug 2026 08:00:00 +0000
+Date: Wed, 5 Aug 2026 08:00:00 +0000
Subject: [PATCH] Skip /monotonic-time-ns/similar test
The test_similar test compares g_get_monotonic_time() and
@@ -19,7 +19,7 @@ Signed-off-by: Pratik Farkase <pratik.farkase@est.tech>
1 file changed, 1 deletion(-)
diff --git a/glib/tests/monotonic-time.c b/glib/tests/monotonic-time.c
-index 1234567..abcdef0 100644
+index 04ff898..dae0533 100644
--- a/glib/tests/monotonic-time.c
+++ b/glib/tests/monotonic-time.c
@@ -153,7 +153,6 @@ main (int argc, char *argv[])
@@ -1,4 +1,4 @@
-From 64e957f0fb32ed54748ceb4f220cb4773743d6ec Mon Sep 17 00:00:00 2001
+From 8f34800e6f3ad201b3fd6f6b333f32c45b2df591 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
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0-initial_2.88.3.bb
rename to meta/recipes-core/glib-2.0/glib-2.0-initial_2.90.0.bb
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.88.3.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.90.0.bb
@@ -225,7 +225,7 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\
PE = "1"
-SRC_URI += "\
+SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://run-ptest \
file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
@@ -236,16 +236,12 @@ SRC_URI += "\
file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
file://skip-timeout.patch \
file://skip-monotonic-time-similar.patch \
- file://CVE-2026-58016-1.patch \
- file://CVE-2026-58016-2.patch \
- file://0001-gio-tests-services-Fix-installed-service-file-using-.patch \
- file://0001-gtype-Mark-the-G_DEFINE_TYPE-parent_class-variable-a.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[archive.sha256sum] = "ab24d24e698dfa1e408b7bcdb508f4aafc906185a8b8ce72fdf79bbbdc9b383b"
+SRC_URI[archive.sha256sum] = "17d15cac2af80a33271127408e0abc2748eb297c595c2a26409e81e14e7d1b8f"
# Find any meson cross files in FILESPATH that are relevant for the current
# build (using siteinfo) and add them to EXTRA_OEMESON.
NEWS: https://gitlab.gnome.org/GNOME/glib/-/releases/2.90.0 https://gitlab.gnome.org/GNOME/glib/-/releases/2.89.4 - Remove below patches where are part of release now CVE-2026-58016-1.patch CVE-2026-58016-2.patch 0001-gio-tests-services-Fix-installed-service-file-using-.patch 0001-gtype-Mark-the-G_DEFINE_TYPE-parent_class-variable-a.patch Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech> --- ...t-write-bindir-into-pkg-config-files.patch | 2 +- ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 2 +- ...-gio-querymodules-as-libexec_PROGRAM.patch | 2 +- ...ng-about-deprecated-paths-in-schemas.patch | 2 +- ...ces.c-comment-out-a-build-host-only-.patch | 2 +- ...es-Fix-installed-service-file-using-.patch | 35 ------- ..._DEFINE_TYPE-parent_class-variable-a.patch | 44 --------- ...on-Run-atomics-test-on-clang-as-well.patch | 2 +- ...ot-enable-pidfd-features-on-native-g.patch | 2 +- ...dcode-python-path-into-various-tools.patch | 2 +- .../glib-2.0/files/CVE-2026-58016-1.patch | 92 ------------------ .../glib-2.0/files/CVE-2026-58016-2.patch | 96 ------------------- .../glib-2.0/files/relocate-modules.patch | 2 +- .../files/skip-monotonic-time-similar.patch | 6 +- .../glib-2.0/files/skip-timeout.patch | 2 +- ...l_2.88.3.bb => glib-2.0-initial_2.90.0.bb} | 0 ...{glib-2.0_2.88.3.bb => glib-2.0_2.90.0.bb} | 0 meta/recipes-core/glib-2.0/glib.inc | 8 +- 18 files changed, 15 insertions(+), 286 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/files/0001-gio-tests-services-Fix-installed-service-file-using-.patch delete mode 100644 meta/recipes-core/glib-2.0/files/0001-gtype-Mark-the-G_DEFINE_TYPE-parent_class-variable-a.patch delete mode 100644 meta/recipes-core/glib-2.0/files/CVE-2026-58016-1.patch delete mode 100644 meta/recipes-core/glib-2.0/files/CVE-2026-58016-2.patch rename meta/recipes-core/glib-2.0/{glib-2.0-initial_2.88.3.bb => glib-2.0-initial_2.90.0.bb} (100%) rename meta/recipes-core/glib-2.0/{glib-2.0_2.88.3.bb => glib-2.0_2.90.0.bb} (100%)