Skip to contentSkip to conversation

glib-2.0: Upgrade 2.88.3 -> 2.90.0

PATCH New Jaipaul Cheernam 1 participant 1 message Sep 17 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 glib-2.0: Upgrade 2.88.3 -> 2.90.0

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

---
Changes since v1:
- Fix SRC_URI

 ...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           |  9 +-
 18 files changed, 15 insertions(+), 287 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%)
meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch +1 -1
index c22ef9fdb3..41b2dfb5c4 100644
@@ -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 <[email protected]>
 Date: Fri, 15 Feb 2019 11:17:27 +0100
 Subject: [PATCH] Do not prefix executables with $bindir in pkg-config files
meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +1 -1
index bd7a04cccf..2b1a2134c8 100644
@@ -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 <[email protected]>
 Date: Sat, 15 Mar 2014 22:42:29 -0700
 Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +1 -1
index 8f6fd98472..6968f725ed 100644
@@ -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 <[email protected]>
 Date: Tue, 22 Mar 2016 15:14:58 +0200
 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +1 -1
index d64576b11e..022094bb17 100644
@@ -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 <[email protected]>
 Date: Fri, 12 Jun 2015 17:08:46 +0300
 Subject: [PATCH] Remove the warning about deprecated paths in schemas
meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +1 -1
index 579999fd6d..402859149a 100644
@@ -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 <[email protected]>
 Date: Wed, 8 Jan 2020 18:22:46 +0100
 Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
meta/recipes-core/glib-2.0/files/0001-gio-tests-services-Fix-installed-service-file-using-.patch deleted +0 -35
deleted file mode 100644
index 755e51cdd3..0000000000
@@ -1,35 +0,0 @@
-From ed5956d0000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jaipaul Cheernam <[email protected]>
-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 <[email protected]>
----
- 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,
-     )
meta/recipes-core/glib-2.0/files/0001-gtype-Mark-the-G_DEFINE_TYPE-parent_class-variable-a.patch deleted +0 -44

44 lines not on this page · raw message

meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch +1 -1
index 3f9b9e4741..bbb85c2355 100644
@@ -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 <[email protected]>
 Date: Sat, 12 Oct 2019 17:46:26 -0700
 Subject: [PATCH] meson: Run atomics test on clang as well
meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch +1 -1
index 0912859698..abf45bd809 100644
@@ -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 <[email protected]>
 Date: Sat, 16 Sep 2023 22:28:27 +0200
 Subject: [PATCH] meson.build: do not enable pidfd features on native glib
meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch +1 -1
index c032d575eb..3ad5ab3f6d 100644
@@ -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 <[email protected]>
 Date: Tue, 3 Oct 2017 10:45:55 +0300
 Subject: [PATCH] Do not hardcode python path into various tools
meta/recipes-core/glib-2.0/files/CVE-2026-58016-1.patch deleted +0 -92

92 lines not on this page · raw message

meta/recipes-core/glib-2.0/files/CVE-2026-58016-2.patch deleted +0 -96

96 lines not on this page · raw message

meta/recipes-core/glib-2.0/files/relocate-modules.patch +1 -1
index 6c982ca735..d5d97f3a4a 100644
@@ -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 <[email protected]>
 Date: Fri, 11 Mar 2016 15:35:55 +0000
 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
meta/recipes-core/glib-2.0/files/skip-monotonic-time-similar.patch +3 -3
index 2ccefb6f3f..9cb03bc65c 100644
@@ -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 <[email protected]>
-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 <[email protected]>
  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[])
meta/recipes-core/glib-2.0/files/skip-timeout.patch +1 -1
index 7bc83adf6b..86e2883a27 100644
@@ -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 <[email protected]>
 Date: Thu, 28 Mar 2024 16:27:09 +0000
 Subject: [PATCH] Skip /timeout/rounding test
meta/recipes-core/glib-2.0/glib-2.0-initial_2.90.0.bb renamed from meta/recipes-core/glib-2.0/glib-2.0-initial_2.88.3.bb +0 -0
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
meta/recipes-core/glib-2.0/glib-2.0_2.90.0.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.88.3.bb +0 -0
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
meta/recipes-core/glib-2.0/glib.inc +2 -7
index d80cf6f267..91c9795547 100644
@@ -225,8 +225,7 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\
 
 PE = "1"
 
-SRC_URI += "\
-           file://run-ptest \
+SRC_URI += "file://run-ptest \
            file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
            file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
            file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
@@ -236,16 +235,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.