@@ -1,4 +1,4 @@
-From 779bbfebcd414a2cb4ab73ff1c4eb987cfdab456 Mon Sep 17 00:00:00 2001
+From 36fbd12df9258972f8ff1fbb24506f12751178eb Mon Sep 17 00:00:00 2001
From: Pablo Saavedra <psaavedra@igalia.com>
Date: Mon, 11 Nov 2024 13:05:15 +0100
Subject: [PATCH] meson: Check for libunwind instead of libunwind-generic
@@ -18,10 +18,10 @@ Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index 96c1d09..86b9df4 100644
+index 23fcea8..3d3feca 100644
--- a/meson.build
+++ b/meson.build
-@@ -107,7 +107,7 @@ polkit_dep = dependency('polkit-gobject-1', version: polkit_req_version, require
+@@ -110,7 +110,7 @@ polkit_dep = dependency('polkit-gobject-1', version: polkit_req_version, require
config_h.set10('HAVE_POLKIT', polkit_dep.found())
if need_libsysprof
@@ -1,4 +1,4 @@
-From cc0c0b518d46bf82ad34eeea8d40496c9ad971dd Mon Sep 17 00:00:00 2001
+From ef2cb850bc24d57ddf3641cb1ba202a657422c66 Mon Sep 17 00:00:00 2001
From: Carlos Alberto Lopez Perez <clopez@igalia.com>
Date: Wed, 24 Jul 2024 15:51:05 +0100
Subject: [PATCH] meson: Do not invoke the commands to update the icon caches
@@ -15,10 +15,10 @@ Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index 86b9df4..fe75ef9 100644
+index 3d3feca..8da9b5f 100644
--- a/meson.build
+++ b/meson.build
-@@ -269,7 +269,7 @@ configure_file(
+@@ -272,7 +272,7 @@ configure_file(
configuration: config_h
)
@@ -1,4 +1,4 @@
-From 68425b541e88f9f03a418cfda052b46b2a185e4e Mon Sep 17 00:00:00 2001
+From 5a2b4cdbc7f0a329245066c849592fe310bdefd7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 25 Jul 2024 20:18:17 -0700
Subject: [PATCH] libsysprof: Check for unw_set_caching_policy before using
new file mode 100644
@@ -0,0 +1,37 @@
+From f65c492e93db122ac9623c7b0ee590801f90e366 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Mon, 11 Aug 2025 14:10:08 -0700
+Subject: [PATCH] sysprof/greeter: fix environ with shadowing
+
+Fixes: #150
+
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/-/issues/150]
+Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
+---
+ src/sysprof/sysprof-greeter.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/sysprof/sysprof-greeter.c b/src/sysprof/sysprof-greeter.c
+index 5f44cb6..80e07ae 100644
+--- a/src/sysprof/sysprof-greeter.c
++++ b/src/sysprof/sysprof-greeter.c
+@@ -626,14 +626,14 @@ sysprof_greeter_init (SysprofGreeter *self)
+
+ if (self->recording_template)
+ {
+- g_auto(GStrv) environ = NULL;
++ g_auto(GStrv) environ_ = NULL;
+ g_object_get (self->recording_template,
+- "environ", &environ,
++ "environ", &environ_,
+ NULL);
+- if (environ)
++ if (environ_)
+ {
+- for (guint i = 0; environ[i]; i++)
+- gtk_string_list_append (self->envvars, environ[i]);
++ for (guint i = 0; environ_[i]; i++)
++ gtk_string_list_append (self->envvars, environ_[i]);
+ }
+ }
+
similarity index 83%
rename from meta-gnome/recipes-gnome/sysprof/sysprof_47.2.bb
rename to meta-gnome/recipes-gnome/sysprof/sysprof_48.0.bb
@@ -18,10 +18,11 @@ DEPENDS += " \
"
SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch \
- file://0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch \
- file://0003-libsysprof-Check-for-unw_set_caching_policy-before-u.patch \
+ file://0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch \
+ file://0003-libsysprof-Check-for-unw_set_caching_policy-before-u.patch \
+ file://0004-sysprof-greeter-fix-environ-with-shadowing.patch \
"
-SRC_URI[archive.sha256sum] = "e4b5ede9fd978ec3f0d5a0d44d0429a6d201c362bf6cb4527319031ae462c54f"
+SRC_URI[archive.sha256sum] = "1b0f0380f2f30708ba87829321a06fee1db36dfa87797bbf07f0a7acf4498d18"
# reason: gtk4 requires opengl distro feature
REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'gtk', 'opengl', '', d)}"
Changes: * Ensure local dbus-monitor is reaped after capturing * Modernization for various GTK deprecations * Add new symbolizer for debuginfod which is enabled by default * Many performance improvements for capture loading * Support for unwinding without frame-pointers on distributions lacking -fno-omit-frame-pointer at the toolchain level. This uses a new "sysprof-live-unwinder" elevated helper process which takes data from perf and unwinds the stack as soon as it can without capturing the perf data to disk. Thank you to Red Hat and the tools team for enabling this work for RHEL. * The greeter now persists your settings and restores them the next time you run Sysprof. * Various graph drawing improvements. * Fixes for time display in various formats. * Translation updates. * Fix drawing of Y-reversed data point markers * Make greeter save environment variables to state file for reuse * Use D-Bus power profiles bus name rather than legacy D-Bus bus name Also: * Add new patch to fix environ shadowing in sysprof greeter Signed-off-by: Pablo Saavedra <psaavedra@igalia.com> --- ...libunwind-instead-of-libunwind-gener.patch | 6 +-- ...oke-the-commands-to-update-the-icon-.patch | 6 +-- ...-for-unw_set_caching_policy-before-u.patch | 2 +- ...f-greeter-fix-environ-with-shadowing.patch | 37 +++++++++++++++++++ .../{sysprof_47.2.bb => sysprof_48.0.bb} | 7 ++-- 5 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 meta-gnome/recipes-gnome/sysprof/sysprof/0004-sysprof-greeter-fix-environ-with-shadowing.patch rename meta-gnome/recipes-gnome/sysprof/{sysprof_47.2.bb => sysprof_48.0.bb} (83%)