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 8b783e81ea..c22ef9fdb3 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 6fe3965383d94b3030e85ab899955858710fec5c Mon Sep 17 00:00:00 2001 +From 94f8f5bf51db5219022f6a646e784cb67d284282 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,7 +15,7 @@ Signed-off-by: Alexander Kanavin 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gio/meson.build b/gio/meson.build -index 2f8f188..57c48d2 100644 +index f9aa0c8..48ff2a5 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -934,17 +934,18 @@ libgio_dep = declare_dependency(link_with : libgio, @@ -46,7 +46,7 @@ index 2f8f188..57c48d2 100644 uninstalled_variables : [ 'gio=${prefix}/gio/gio', diff --git a/glib/meson.build b/glib/meson.build -index 209bcbf..a86cfd3 100644 +index 0fb6e26..9eebf73 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -480,9 +480,10 @@ pkg.generate(libglib, 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 b91624da8b..bd7a04cccf 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 966c58aae35f9e2bcef5238e0331a119e0e51abd Mon Sep 17 00:00:00 2001 +From c80659ca01051f8e83dccd4eda15a811b0ea377d 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 5b7c323996..8f6fd98472 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 0de3a3a791ca32f2330eb3a8ad9da0fe6dce950c Mon Sep 17 00:00:00 2001 +From 25d6cb83b6b46181fbdad1a6f872a3788d6e4843 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 @@ -9,18 +9,19 @@ renamer does not cope with library packages with files in ${bindir} Signed-off-by: Jussi Kukkonen 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 39256d3..2f8f188 100644 +index a3e6f18..f9aa0c8 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -1071,6 +1071,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -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, ++ install_dir : glib_libexecdir, + install_tag : 'bin', c_args : gio_c_args, # intl.lib is not compatible with SAFESEH - link_args : noseh_link_args, -+ install_dir: glib_libexecdir, - dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, app_profile_dep]) - - glib_compile_schemas = executable('glib-compile-schemas', 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 d6dd66357a..d64576b11e 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 b829f3205e4d8390f02eaa8e7a7bf85e51cbb7ed Mon Sep 17 00:00:00 2001 +From 29be4e2681b78d7856143056f769040be076b03d 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 7a2fc0b7ef..579999fd6d 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 912e674bb0a3b51dabaa58da1834491ef94e6a2a Mon Sep 17 00:00:00 2001 +From 12bf3fded3b4c0c7b2d7ae7810d6eef47ed747e5 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 diff --git a/meta/recipes-core/glib-2.0/files/0001-gio-tests-services-Fix-installed-service-file-using-.patch b/meta/recipes-core/glib-2.0/files/0001-gio-tests-services-Fix-installed-service-file-using-.patch new file mode 100644 index 0000000000..755e51cdd3 --- /dev/null +++ b/meta/recipes-core/glib-2.0/files/0001-gio-tests-services-Fix-installed-service-file-using-.patch @@ -0,0 +1,35 @@ +From ed5956d0000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jaipaul Cheernam +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 +--- + 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, + ) 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 149833dc43..3f9b9e4741 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 26ddae02d7677bcff7c3933ee856d34df41b548f Mon Sep 17 00:00:00 2001 +From 0530e624dd47ee18aab18c8d403da12bb297f26e 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,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index dab1d61..cc3a5ed 100644 +index 22ed181..87497b7 100644 --- a/meson.build +++ b/meson.build @@ -2100,7 +2100,7 @@ atomicdefine = ''' 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 efd5d3de1b..0912859698 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 c6cd3c0a66ae8f210185e0cb05b2172dc192ce9e Mon Sep 17 00:00:00 2001 +From 0147fb147548e0657f298ab8e050ef8aaad3c850 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,7 +14,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index cc3a5ed..58dd87a 100644 +index 87497b7..6955b02 100644 --- a/meson.build +++ b/meson.build @@ -1098,7 +1098,8 @@ if cc.links('''#include 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 8dbdf746b7..c032d575eb 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 40e40230e6a3c52b79c6f92e8c060bd4d93f0374 Mon Sep 17 00:00:00 2001 +From 2bafa636db0241952b9168c62f051900ebf8b058 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 7e794e9..4b619f8 100755 +index f388714..37ed491 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/CVE-2026-58016-1.patch b/meta/recipes-core/glib-2.0/files/CVE-2026-58016-1.patch index 9beafd106d..f6883ba85c 100644 --- a/meta/recipes-core/glib-2.0/files/CVE-2026-58016-1.patch +++ b/meta/recipes-core/glib-2.0/files/CVE-2026-58016-1.patch @@ -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 Date: Thu, 16 Apr 2026 15:27:37 +0100 -Subject: [PATCH 1/2] gdbusintrospection: Fix XML parser state handling for - element nesting +Subject: [PATCH] gdbusintrospection: Fix XML parser state handling for + element nesting The check for whether a `` element in D-Bus introspection XML was nested correctly was broken. `` elements can only be at the top @@ -27,7 +27,7 @@ Signed-off-by: Benjamin Robin 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 @@ -1258,7 +1258,7 @@ parser_start_element (GMarkupParseContext *context, @@ -40,7 +40,7 @@ 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 @@ -300,6 +300,38 @@ test_extra_data (void) @@ -89,6 +89,4 @@ index 44cb7a96af45..daca313f77e7 100644 + g_test_add_func ("/gdbus/introspection/invalid", test_invalid); ret = session_bus_run (); - --- -2.54.0 + diff --git a/meta/recipes-core/glib-2.0/files/CVE-2026-58016-2.patch b/meta/recipes-core/glib-2.0/files/CVE-2026-58016-2.patch index a07aa529ae..3acb16f75d 100644 --- a/meta/recipes-core/glib-2.0/files/CVE-2026-58016-2.patch +++ b/meta/recipes-core/glib-2.0/files/CVE-2026-58016-2.patch @@ -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 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,7 +27,7 @@ Signed-off-by: Benjamin Robin 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 @@ -1096,6 +1096,7 @@ parse_data_get_annotation (ParseData *data, @@ -93,6 +93,4 @@ index 6f722ee6153d..ed0d291f99f0 100644 + g_assert (data->nodes->len > 0); return data->nodes->pdata[data->nodes->len - 1]; } - --- -2.54.0 + 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 4c2638ae61..6c982ca735 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 14bbc77bc465b42454112bc6a33264c2c3e013e5 Mon Sep 17 00:00:00 2001 +From 226f4955e53c6b3f360f346e41a0a22b74cbbaae 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,7 +21,7 @@ Signed-off-by: Peter Marko 1 file changed, 18 insertions(+) diff --git a/gio/giomodule.c b/gio/giomodule.c -index 38761e4..afa7878 100644 +index 7311775..abc2c79 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -1312,6 +1312,24 @@ get_gio_module_dir (void) 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 8ef140d0d7..7bc83adf6b 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 f77b9dd72dd0103c7a28dd7e1cdf6e316ecbf030 Mon Sep 17 00:00:00 2001 +From 64e957f0fb32ed54748ceb4f220cb4773743d6ec 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.88.2.bb b/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-initial_2.88.2.bb rename to meta/recipes-core/glib-2.0/glib-2.0-initial_2.88.3.bb diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.88.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_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 diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index cad74f53f7..50cdeff158 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -237,12 +237,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.