sysprof: upgrade 3.34.1 -> 3.36.0

* Move recipe recipes-kernel -> recipes-gnome * 0001-libsysprof-ui-Rename-environ-to-sys_environ.patch can go: upstream did raname variable differently * We can build help files these days * reworder patches / recipe cleanup Overview of changes in Sysprof 3.36.0 ===================================== * Preload library has been moved to $libdir from $libexecdir * Build system improvements * Fix whole-system capture setting when using "Record Again" feature * New SysprofCollector interfaces for samples, marks, and logs to sit alongside allocations * Translation updates Overview of changes in Sysprof 3.35.92 ====================================== * A new profiler for tracking memory allocations within processes that are spawned by Sysprof. Select "Track Allocations" to use an LD_PRELOAD module which monitors allocations within the target process. A callgraph is provided with allocations and their stack traces. This brings the main features of the venerable "Memprof" into Sysprof. * Port Sysprof to work on RHEL 7 * Improvements to marks and counters displays * A new data frame in libsysprof-capture for memory allocations with stack traces. * sysprof-cli --merge can now be used to merge multiple syscap files together. * sysprof <program-path> can now be used to open Sysprof directly to a program to execute. * Sysprof now builds with additional security protections and optimization flags such as -Bsymbolic, -Wl,-z,defs, -Wl,-z,now, and -Wl,-z,relro. * Fixes for macOS * The ELF symbol resolver is faster * sysprof-cli now properly adds supplemental information to the capture file such as decoded symbols. This makes sharing syscap files across machines easier and more reliable. * A new mmap()'d ring buffer can be shared between processes for faster data transfer to sysprof. We expect more features around this SysprofCollector interface in future releases. * A new set if icons has been provided for the collectors * Translation updates Overview of changes in Sysprof 3.35.2 ===================================== * Build and test fixes * Track changes to gdbus-codegen * Include additional pkg-config variable for access to D-Bus data * Translation updates Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
2026-06-05 02:50:46 +00:00 · 2020-06-01 23:45:15 +02:00
parent 86e8c35f11
commit 9c2ec3d81b
5 changed files with 52 additions and 79 deletions
@@ -19,7 +19,7 @@ index 3449961..3c2d186 100644
 --- a/src/libsysprof/meson.build
 +++ b/src/libsysprof/meson.build
@@ -84,7 +84,7 @@ libsysprof_deps = [
-   polkit_dep,
+   librax_dep,
 ]
 
 -if host_machine.system() == 'linux'
@@ -0,0 +1,31 @@
+From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001
+From: Rasmus Thomsen <oss@cogitri.dev>
+Date: Sat, 7 Mar 2020 10:44:16 +0100
+Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for
+ gsize
+
+This fixes the build on 32-bit platforms with -Werror-format
+
+fixes #32
+
+Upstream-Status: Applied[https://gitlab.gnome.org/GNOME/sysprof/-/commit/5dea152c7728f5a37370ad8a229115833e36b4f6]
+---
+ src/tests/allocs-by-size.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c
+index 666113a..6260d4b 100644
+--- a/src/tests/allocs-by-size.c
+++ b/src/tests/allocs-by-size.c
+@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader)
+     {
+       const Item *item = &g_array_index (ar, Item, i);
+ 
+-      g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n",
+      g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n",
+                item->size, item->cmp, item->count);
+     }
+ }
+-- 
+2.21.3
+
@@ -5,24 +5,29 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                    file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607"

 GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase gettext systemd upstream-version-is-even gsettings mime mime-xdg
+inherit gnomebase gnome-help gettext systemd upstream-version-is-even gsettings mime mime-xdg

-DEPENDS += "glib-2.0 libxml2-native glib-2.0-native"
+DEPENDS += " \
+    glib-2.0-native \
+    yelp-tools-native \
+    libxml2-native \
+    glib-2.0 \
+"

-SRC_URI[archive.md5sum] = "cc32455277b31afb1965d627ae3e3629"
-SRC_URI[archive.sha256sum] = "844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0"
-SRC_URI += "file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \
-            file://0001-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch \
-            file://0001-libsysprof-ui-Rename-environ-to-sys_environ.patch \
-            "
+SRC_URI[archive.md5sum] = "3956e82b8744715006dde59e0ce8910b"
+SRC_URI[archive.sha256sum] = "8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108"
+SRC_URI += " \
+    file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \
+    file://0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch \
+    file://0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \
+"

 PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
 PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle"
 PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit"
 PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit"

-# Enablig this requries yelp
-EXTRA_OEMESON += "-Dhelp=false -Dsystemdunitdir=${systemd_unitdir}/system"
+EXTRA_OEMESON += "-Dsystemdunitdir=${systemd_unitdir}/system"

 SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
@@ -30,8 +35,8 @@ FILES_SOLIBSDEV = ""
 SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service sysprof3.service', '', d)}"

 FILES_${PN} += " \
-               ${datadir}/dbus-1/system-services \
-               ${datadir}/dbus-1/system.d \
-               ${datadir}/dbus-1/interfaces \
-               ${datadir}/metainfo \
-               "
+    ${datadir}/dbus-1/system-services \
+    ${datadir}/dbus-1/system.d \
+    ${datadir}/dbus-1/interfaces \
+    ${datadir}/metainfo \
+"
@@ -1,63 +0,0 @@
-From 4bd0d5d5dd6841fbac8385527617d18e7731244d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 15 Jan 2020 13:17:58 -0800
-Subject: [PATCH] libsysprof-ui: Rename environ to sys_environ
-
-This helps avoid namesapace conflict with glibc headers
-
-Fixes
-/usr/include/unistd.h:545:15: note: previous declaration is here
-
-extern char **environ;
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/libsysprof-ui/sysprof-profiler-assistant.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/libsysprof-ui/sysprof-profiler-assistant.c b/src/libsysprof-ui/sysprof-profiler-assistant.c
-index 22e3e24..c55d551 100644
--- a/src/libsysprof-ui/sysprof-profiler-assistant.c
-+++ b/src/libsysprof-ui/sysprof-profiler-assistant.c
-@@ -235,7 +235,7 @@ sysprof_profiler_assistant_record_clicked_cb (SysprofProfilerAssistant *self,
-     {
-       g_auto(GStrv) argv = NULL;
-       g_auto(GStrv) env = NULL;
-      SysprofEnviron *environ;
-+      SysprofEnviron *sys_environ;
-       const gchar *command;
-       gint argc;
- 
-@@ -245,8 +245,8 @@ sysprof_profiler_assistant_record_clicked_cb (SysprofProfilerAssistant *self,
-       sysprof_profiler_set_spawn (profiler, TRUE);
-       sysprof_profiler_set_spawn_argv (profiler, (const gchar * const *)argv);
- 
-      environ = sysprof_environ_editor_get_environ (self->environ_editor);
-      env = sysprof_environ_get_environ (environ);
-+      sys_environ = sysprof_environ_editor_get_environ (self->environ_editor);
-+      env = sysprof_environ_get_environ (sys_environ);
-       sysprof_profiler_set_spawn_env (profiler, (const gchar * const *)env);
- 
-       sysprof_profiler_set_spawn_inherit_environ (profiler,
-@@ -405,7 +405,7 @@ sysprof_profiler_assistant_class_init (SysprofProfilerAssistantClass *klass)
- static void
- sysprof_profiler_assistant_init (SysprofProfilerAssistant *self)
- {
-  g_autoptr(SysprofEnviron) environ = sysprof_environ_new ();
-+  g_autoptr(SysprofEnviron) sys_environ = sysprof_environ_new ();
- 
-   gtk_widget_init_template (GTK_WIDGET (self));
- 
-@@ -445,7 +445,7 @@ sysprof_profiler_assistant_init (SysprofProfilerAssistant *self)
-                            self,
-                            G_CONNECT_SWAPPED);
- 
-  sysprof_environ_editor_set_environ (self->environ_editor, environ);
-+  sysprof_environ_editor_set_environ (self->environ_editor, sys_environ);
- }
- 
- void
-- 
-2.25.0
-