diff mbox series

[wrynose] glib-2.0: upgrade 2.88.3 -> 2.88.4

Message ID 20261020111620.3186263-1-daniel.turull@ericsson.com
State Under Review
Delegated to: Yoann Congal
Headers show
Series [wrynose] glib-2.0: upgrade 2.88.3 -> 2.88.4 | expand

Commit Message

Daniel Turull Oct. 20, 2026, 11:16 a.m. UTC 
From: Daniel Turull <daniel.turull@ericsson.com>

Changelog: https://gitlab.gnome.org/GNOME/glib/-/blob/2.88.4/NEWS

Source: NEWS

Overview of changes in GLib 2.88.4, 2026-10-08
==============================================

* Bugs fixed:
  - #4011 gio/tests/services: Installed service file contains build path after
    !5259 (Jaipaul Cheernam)
  - #4020 'TLS callback not invoked' error on msys2-clang64 CI job (Luca Bacci)
  - !5262 Backport !5261 "gio/tests/services: Fix installed service file
    containing build path" to glib-2-88
  - !5273 Backport !5266 "docs: Fix gio gi-docgen docs_url" to glib-2-88
  - !5285 Backport !5283 "gconstructor: Reference _tls_used also on GCC, CLang"
    to glib-2-88
  - !5323 Backport !5311 "fix: handle long filenames in trash by truncating from
    front" to glib-2-88
  - !5379 Update Norwegian Nynorsk translation
  - !5394 Backport various security fixes to glib-2-88

Drop 0001-gio-tests-services-Fix-installed-service-file-using-.patch
(local backport of #4011/!5262) as the fix is now included upstream.

Assisted-by: kiro:claude-sonnet-5
Signed-off-by: Daniel Turull <daniel.turull@ericsson.com>
---
 ...es-Fix-installed-service-file-using-.patch | 35 -------------------
 ...l_2.88.3.bb => glib-2.0-initial_2.88.4.bb} |  0
 ...{glib-2.0_2.88.3.bb => glib-2.0_2.88.4.bb} |  0
 meta/recipes-core/glib-2.0/glib.inc           |  3 +-
 4 files changed, 1 insertion(+), 37 deletions(-)
 delete 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.3.bb => glib-2.0-initial_2.88.4.bb} (100%)
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.88.3.bb => glib-2.0_2.88.4.bb} (100%)
diff mbox series

Patch

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
deleted file mode 100644
index 755e51cdd3..0000000000
--- a/meta/recipes-core/glib-2.0/files/0001-gio-tests-services-Fix-installed-service-file-using-.patch
+++ /dev/null
@@ -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,
-     )
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.88.3.bb b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.88.4.bb
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.88.4.bb
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.88.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.88.4.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.88.4.bb
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 50cdeff158..7e7725f9bd 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -237,13 +237,12 @@  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] = "ab24d24e698dfa1e408b7bcdb508f4aafc906185a8b8ce72fdf79bbbdc9b383b"
+SRC_URI[archive.sha256sum] = "25fd169f3b2f91fe2391ad297883ce0fcf30c69fc789ffd1c9672d1332b1c5a8"
 
 # Find any meson cross files in FILESPATH that are relevant for the current
 # build (using siteinfo) and add them to EXTRA_OEMESON.