diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch index 5bdc55b3a5..3d78e188b5 100644 --- a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch +++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch @@ -1,4 +1,4 @@ -From 36fbd12df9258972f8ff1fbb24506f12751178eb Mon Sep 17 00:00:00 2001 +From 3d547c043f772fe1352c7beb0e3331e35c77e63e Mon Sep 17 00:00:00 2001 From: Pablo Saavedra Date: Mon, 11 Nov 2024 13:05:15 +0100 Subject: [PATCH] meson: Check for libunwind instead of libunwind-generic @@ -18,11 +18,11 @@ Signed-off-by: Pablo Saavedra 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 23fcea8..3d3feca 100644 +index 3907354..783f558 100644 --- a/meson.build +++ b/meson.build -@@ -110,7 +110,7 @@ polkit_dep = dependency('polkit-gobject-1', version: polkit_req_version, require - config_h.set10('HAVE_POLKIT', polkit_dep.found()) +@@ -114,7 +114,7 @@ if cc.has_header('asm/perf_regs.h') + endif if need_libsysprof - libunwind_dep = dependency('libunwind-generic', required: true) diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch index 6ed04eefac..61c75f08b4 100644 --- a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch +++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch @@ -1,4 +1,4 @@ -From ef2cb850bc24d57ddf3641cb1ba202a657422c66 Mon Sep 17 00:00:00 2001 +From 58619c59e72c796aa2686bc6ffbfa07a23dbc14d Mon Sep 17 00:00:00 2001 From: Carlos Alberto Lopez Perez 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 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 3d3feca..8da9b5f 100644 +index 783f558..8775fe6 100644 --- a/meson.build +++ b/meson.build -@@ -272,7 +272,7 @@ configure_file( +@@ -276,7 +276,7 @@ configure_file( configuration: config_h ) diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0003-libsysprof-Check-for-unw_set_caching_policy-before-u.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0003-libsysprof-Check-for-unw_set_caching_policy-before-u.patch index 60592bde4f..0f3703457d 100644 --- a/meta-gnome/recipes-gnome/sysprof/sysprof/0003-libsysprof-Check-for-unw_set_caching_policy-before-u.patch +++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0003-libsysprof-Check-for-unw_set_caching_policy-before-u.patch @@ -1,4 +1,4 @@ -From 5a2b4cdbc7f0a329245066c849592fe310bdefd7 Mon Sep 17 00:00:00 2001 +From 219920476d7b23370bfb456ee4ac1cf9b21479c6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 25 Jul 2024 20:18:17 -0700 Subject: [PATCH] libsysprof: Check for unw_set_caching_policy before using diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0005-Make-elf-loader-search-for-debug-links-in-.debug-dir.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0005-Make-elf-loader-search-for-debug-links-in-.debug-dir.patch new file mode 100644 index 0000000000..bd7305d77d --- /dev/null +++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0005-Make-elf-loader-search-for-debug-links-in-.debug-dir.patch @@ -0,0 +1,47 @@ +From 9c35912dba0597a241e9af4fe5c87bfc0931c46c Mon Sep 17 00:00:00 2001 +From: Pawel Lampe +Date: Fri, 16 May 2025 14:31:29 +0200 +Subject: [PATCH] Make elf loader search for debug links in .debug dirs + +When the distribution is built using yocto project, it's possible +to specify 'dbg-pkgs' image feature, see: +https://docs.yoctoproject.org/dev/ref-manual/features.html +This image feature makes files with package debug symbols being +placed under .debug directories accompanying the original binary +directories and mentioned in the .gnu_debuglink of the original binary. +Effectively the symbols of e.g. /x/y/libz.so will be placed in +/x/y/.debug/libz.so. + +This change makes sysprof's elf loader to search for debug links +in such a .debug directories. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/sysprof/-/merge_requests/140] +--- + src/libsysprof/sysprof-elf-loader.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/libsysprof/sysprof-elf-loader.c b/src/libsysprof/sysprof-elf-loader.c +index 2e52e26..e0b4089 100644 +--- a/src/libsysprof/sysprof-elf-loader.c ++++ b/src/libsysprof/sysprof-elf-loader.c +@@ -336,6 +336,7 @@ sysprof_elf_loader_annotate (SysprofElfLoader *self, + g_autofree char *directory_name = NULL; + g_autofree char *debug_path = NULL; + g_autofree char *short_debug_path = NULL; ++ g_autofree char *shorter_debug_path = NULL; + const char *short_directory_name; + const char *debug_dir = self->debug_dirs[i]; + const char *build_id; +@@ -360,6 +361,12 @@ sysprof_elf_loader_annotate (SysprofElfLoader *self, + sysprof_elf_set_debug_link_elf (elf, get_deepest_debuglink (debug_link_elf)); + return; + } ++ shorter_debug_path = g_build_filename (directory_name, ".debug", debug_link, NULL); ++ if ((debug_link_elf = sysprof_elf_loader_load (self, mount_namespace, shorter_debug_path, build_id, 0, NULL))) ++ { ++ sysprof_elf_set_debug_link_elf (elf, get_deepest_debuglink (debug_link_elf)); ++ return; ++ } + } + } + diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof_48.0.bb b/meta-gnome/recipes-gnome/sysprof/sysprof_48.1.bb similarity index 91% rename from meta-gnome/recipes-gnome/sysprof/sysprof_48.0.bb rename to meta-gnome/recipes-gnome/sysprof/sysprof_48.1.bb index 968b5d8e14..145c0bfe38 100644 --- a/meta-gnome/recipes-gnome/sysprof/sysprof_48.0.bb +++ b/meta-gnome/recipes-gnome/sysprof/sysprof_48.1.bb @@ -21,8 +21,9 @@ SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.pat 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 \ + file://0005-Make-elf-loader-search-for-debug-links-in-.debug-dir.patch \ " -SRC_URI[archive.sha256sum] = "1b0f0380f2f30708ba87829321a06fee1db36dfa87797bbf07f0a7acf4498d18" +SRC_URI[archive.sha256sum] = "54f157fdfef1edf1e2f22e542c462d90e1c21fca8c30eba4127cee739039bbe2" # reason: gtk4 requires opengl distro feature REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'gtk', 'opengl', '', d)}"