@@ -1,4 +1,4 @@
-From 83282a978c5107c682ab4c75ac7407961bb17788 Mon Sep 17 00:00:00 2001
+From 94f8f5bf51db5219022f6a646e784cb67d284282 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
@@ -15,7 +15,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/gio/meson.build b/gio/meson.build
-index c7da257..8a00989 100644
+index f9aa0c8..48ff2a5 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -934,17 +934,18 @@ libgio_dep = declare_dependency(link_with : libgio,
@@ -1,4 +1,4 @@
-From d02e061f830b7051878e8a467f393e85110e4e1a Mon Sep 17 00:00:00 2001
+From c80659ca01051f8e83dccd4eda15a811b0ea377d 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 72a58d19ae7f80985d9c91751fd6c359464ce292 Mon Sep 17 00:00:00 2001
+From 25d6cb83b6b46181fbdad1a6f872a3788d6e4843 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
@@ -9,15 +9,15 @@ renamer does not cope with library packages with files in ${bindir}
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Upstream-Status: Inappropriate [OE specific]
---
- gio/meson.build | 1 +
- 1 file changed, 1 insertion(+)
+ gio/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gio/meson.build b/gio/meson.build
-index a3e6f18..c7da257 100644
+index a3e6f18..f9aa0c8 100644
--- a/gio/meson.build
+++ b/gio/meson.build
-@@ -1067,7 +1066,7 @@ executable('gresource', 'gresource-tool.c',
-
+@@ -1066,7 +1066,7 @@ executable('gresource', 'gresource-tool.c',
+
gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
install : true,
- install_dir : multiarch_bindir,
@@ -1,4 +1,4 @@
-From c1eaa4dd2e2c09e9930949d4a9ee08e3e21b1a88 Mon Sep 17 00:00:00 2001
+From 29be4e2681b78d7856143056f769040be076b03d 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 d9c75aef8b68887ef4f1dd9bb73542cc0ff02b20 Mon Sep 17 00:00:00 2001
+From 12bf3fded3b4c0c7b2d7ae7810d6eef47ed747e5 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
new file mode 100644
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
+Date: Wed, 30 Jul 2026 06:26:00 +0000
+Subject: [PATCH] gio/tests/services: Fix installed service file using build
+ path
+
+The installed version of the service file was incorrectly using the
+already-substituted build output as input for configure_file(). Since
+@installed_tests_dir@ had already been replaced with the build directory
+path in the first configure_file() call, the second call just copied the
+build path as-is into the installed version.
+
+Fix this by using the original .in template as input for the installed
+version and giving it a distinct output name, following the same pattern
+used for desktop files in the parent meson.build.
+
+Upstream-Status: Reported [https://gitlab.gnome.org/GNOME/glib/-/work_items/4011]
+Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
+---
+ gio/tests/services/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+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,8 +18,8 @@ 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,
+- output: service_file_name + '.to-install',
++ input: service_file_name + '.in',
++ output: service_file_name + '-installed',
+ configuration: installed_cdata,
+ )
+ install_data(installed_service_file,
@@ -1,4 +1,4 @@
-From f72296cbd6f04f4f74b49b961f3cb405efa112f0 Mon Sep 17 00:00:00 2001
+From 0530e624dd47ee18aab18c8d403da12bb297f26e 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,7 +14,7 @@ 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 25802aa..c53d216 100644
+index 22ed181..87497b7 100644
--- a/meson.build
+++ b/meson.build
@@ -2100,7 +2100,7 @@ atomicdefine = '''
@@ -1,4 +1,4 @@
-From 03614474ac998422d0348c16c588a9ad50c97398 Mon Sep 17 00:00:00 2001
+From 0147fb147548e0657f298ab8e050ef8aaad3c850 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,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index c53d216..330ccf3 100644
+index 87497b7..6955b02 100644
--- a/meson.build
+++ b/meson.build
@@ -1098,7 +1098,8 @@ if cc.links('''#include <sys/syscall.h>
@@ -1,4 +1,4 @@
-From f37cec951e3c564d96afcfee1279f4a9fafcc822 Mon Sep 17 00:00:00 2001
+From 2bafa636db0241952b9168c62f051900ebf8b058 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
@@ -1,8 +1,8 @@
-From 38eee3870fbcf6bdf8e6b1281bc7a98d32b68521 Mon Sep 17 00:00:00 2001
+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 1/2] gdbusintrospection: Fix XML parser state handling for
- <node> element nesting
+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
@@ -27,10 +27,10 @@ Signed-off-by: Benjamin Robin <benjamin.robin@bootlin.com>
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c
-index c7be334ce2f7..6f722ee6153d 100644
+index df5daa3..78a63e2 100644
--- a/gio/gdbusintrospection.c
+++ b/gio/gdbusintrospection.c
-@@ -1272,7 +1272,7 @@ parser_start_element (GMarkupParseContext *context,
+@@ -1258,7 +1258,7 @@ parser_start_element (GMarkupParseContext *context,
/* ---------------------------------------------------------------------------------------------------- */
if (strcmp (element_name, "node") == 0)
{
@@ -40,13 +40,13 @@ index c7be334ce2f7..6f722ee6153d 100644
g_set_error_literal (error,
G_MARKUP_ERROR,
diff --git a/gio/tests/gdbus-introspection.c b/gio/tests/gdbus-introspection.c
-index 44cb7a96af45..daca313f77e7 100644
+index cb99c94..05710d4 100644
--- a/gio/tests/gdbus-introspection.c
+++ b/gio/tests/gdbus-introspection.c
-@@ -299,6 +299,38 @@ test_extra_data (void)
+@@ -300,6 +300,38 @@ test_extra_data (void)
g_dbus_node_info_unref (info);
}
-
+
+static void
+test_invalid (void)
+{
@@ -80,15 +80,13 @@ index 44cb7a96af45..daca313f77e7 100644
+}
+
/* ---------------------------------------------------------------------------------------------------- */
-
+
int
-@@ -316,6 +348,7 @@ main (int argc,
+@@ -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 ();
-
---
-2.54.0
+
@@ -1,7 +1,7 @@
-From a75052ceeebea434f271b670766acd5416bc83b9 Mon Sep 17 00:00:00 2001
+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 2/2] gdbusintrospection: Add some assertions before array
+Subject: [PATCH] gdbusintrospection: Add some assertions before array
dereferences
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -27,72 +27,70 @@ Signed-off-by: Benjamin Robin <benjamin.robin@bootlin.com>
1 file changed, 8 insertions(+)
diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c
-index 6f722ee6153d..ed0d291f99f0 100644
+index 78a63e2..4df8e87 100644
--- a/gio/gdbusintrospection.c
+++ b/gio/gdbusintrospection.c
-@@ -1110,6 +1110,7 @@ parse_data_get_annotation (ParseData *data,
+@@ -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];
}
-
-@@ -1119,6 +1120,7 @@ parse_data_get_arg (ParseData *data,
+
+@@ -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];
}
-
-@@ -1128,6 +1130,7 @@ parse_data_get_out_arg (ParseData *data,
+
+@@ -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];
}
-
-@@ -1137,6 +1140,7 @@ parse_data_get_method (ParseData *data,
+
+@@ -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];
}
-
-@@ -1146,6 +1150,7 @@ parse_data_get_signal (ParseData *data,
+
+@@ -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];
}
-
-@@ -1155,6 +1160,7 @@ parse_data_get_property (ParseData *data,
+
+@@ -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];
}
-
-@@ -1164,6 +1170,7 @@ parse_data_get_interface (ParseData *data,
+
+@@ -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];
}
-
-@@ -1173,6 +1180,7 @@ parse_data_get_node (ParseData *data,
+
+@@ -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];
}
-
---
-2.54.0
+
@@ -1,4 +1,4 @@
-From d99e85f606530950514446a3113fe39c8c67934c Mon Sep 17 00:00:00 2001
+From 226f4955e53c6b3f360f346e41a0a22b74cbbaae 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,4 +1,4 @@
-From e19423cec5b32bfa5ff1bcd567e51fa55713f94e Mon Sep 17 00:00:00 2001
+From 64e957f0fb32ed54748ceb4f220cb4773743d6ec 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.2.bb
rename to meta/recipes-core/glib-2.0/glib-2.0-initial_2.88.3.bb
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.88.2.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.88.3.bb
@@ -235,12 +235,13 @@ SRC_URI += "\
file://skip-timeout.patch \
file://CVE-2026-58016-1.patch \
file://CVE-2026-58016-2.patch \
+ file://0001-gio-tests-services-Fix-installed-service-file-using-.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] = "cf3f215a640c8a4257f14317586b8f1fdd25a10a93cb4bdda147c0f9ad88e74f"
+SRC_URI[archive.sha256sum] = "ab24d24e698dfa1e408b7bcdb508f4aafc906185a8b8ce72fdf79bbbdc9b383b"
# Find any meson cross files in FILESPATH that are relevant for the current
# build (using siteinfo) and add them to EXTRA_OEMESON.
Changelog: https://gitlab.gnome.org/GNOME/glib/-/blob/2.88.3/NEWS#L1-L17 Overview of changes in GLib 2.88.3, 2026-07-29 ============================================== * Fix potential miscompilation with GCC 17 with G_GNUC_CONST on get_type() functions (#3984, work by Sam James) * Bugs fixed: - #3984 G_GNUC_CONST vs get_type comes home to roost (Sam James) - #3985 (CVE-2026-15588) Security report: GDBusServer pre-authentication DoS via unbounded SASL line buffering (Philip Withnall) - !5225 Backport !5223 "Drop G_GNUC_CONST for *_get_type" to glib-2-88 - !5241 Backport !5240 "gdbusauth: Limit length of lines read from client" to glib-2-88 - !5242 Backport !5238 "gpoll: Correctly zero-out heap-allocated fd_sets on macOS" to glib-2-88 - !5243 gdbusauth: Unmark a new string as translatable - !5259 Backport !5248, !5249: several Meson/gcc fixes to glib-2-88 CVE-2026-58016 patches refreshed due to context changes in the new version. The patch content is unchanged, only line offsets updated. Fix buildpaths QA error from upstream !5259: use the .in template as input for the installed service file. Reported upstream: [https://gitlab.gnome.org/GNOME/glib/-/work_items/4011] ptest results (qemux86-64): 2.88.2 2.88.3 diff Test binaries: 308 308 0 Sub-tests: 6207 6207 0 Passed: 306 306 0 Failed: 1 1 0 Skipped: 1 1 0 Pre-existing failure: glib/gdbus-server-auth.test (SIGABRT, same in both versions) Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech> --- ...t-write-bindir-into-pkg-config-files.patch | 4 +- ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 2 +- ...-gio-querymodules-as-libexec_PROGRAM.patch | 12 +++--- ...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 | 37 +++++++++++++++++ ...on-Run-atomics-test-on-clang-as-well.patch | 4 +- ...ot-enable-pidfd-features-on-native-g.patch | 4 +- ...dcode-python-path-into-various-tools.patch | 2 +- .../glib-2.0/files/CVE-2026-58016-1.patch | 26 ++++++------ .../glib-2.0/files/CVE-2026-58016-2.patch | 40 +++++++++---------- .../glib-2.0/files/relocate-modules.patch | 2 +- .../glib-2.0/files/skip-timeout.patch | 2 +- ...l_2.88.2.bb => glib-2.0-initial_2.88.3.bb} | 0 ...{glib-2.0_2.88.2.bb => glib-2.0_2.88.3.bb} | 0 meta/recipes-core/glib-2.0/glib.inc | 3 +- 16 files changed, 88 insertions(+), 54 deletions(-) create mode 100644 meta/recipes-core/glib-2.0/files/0001-gio-tests-services-Fix-installed-service-file-using-.patch rename meta/recipes-core/glib-2.0/{glib-2.0-initial_2.88.2.bb => glib-2.0-initial_2.88.3.bb} (100%) rename meta/recipes-core/glib-2.0/{glib-2.0_2.88.2.bb => glib-2.0_2.88.3.bb} (100%)