From fb45fce2f7d5a479f6c75e993bd830ad211e2f28 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 6 Feb 2024 08:22:12 -0800 Subject: [PATCH] sysprof: update to 45.2. --- common/shlibs | 3 +- srcpkgs/libsysprof | 1 + srcpkgs/sysprof-cli | 1 + .../patches/musl-missing-include.patch | 13 ++++++ srcpkgs/sysprof/template | 45 ++++++++++++++----- 5 files changed, 50 insertions(+), 13 deletions(-) create mode 120000 srcpkgs/libsysprof create mode 120000 srcpkgs/sysprof-cli create mode 100644 srcpkgs/sysprof/patches/musl-missing-include.patch diff --git a/common/shlibs b/common/shlibs index 42a267d4961..496b55d0876 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3052,8 +3052,7 @@ libgutenprint.so.9 gutenprint-5.3.3_1 libunbound.so.8 libunbound-1.13.1_2 libmirage.so.11 libmirage-3.1.0_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 -libsysprof-4.so sysprof-3.37.90_1 -libsysprof-ui-5.so sysprof-3.46.0_1 +libsysprof-6.so.6 libsysprof-45.1_1 libvala-0.56.so.0 libvala-0.56.0_1 libvaladoc-0.56.so.0 libvaladoc-0.56.0_1 libvalaccodegen.so libvala-0.44.0_1 diff --git a/srcpkgs/libsysprof b/srcpkgs/libsysprof new file mode 120000 index 00000000000..b36b72f12d0 --- /dev/null +++ b/srcpkgs/libsysprof @@ -0,0 +1 @@ +sysprof \ No newline at end of file diff --git a/srcpkgs/sysprof-cli b/srcpkgs/sysprof-cli new file mode 120000 index 00000000000..b36b72f12d0 --- /dev/null +++ b/srcpkgs/sysprof-cli @@ -0,0 +1 @@ +sysprof \ No newline at end of file diff --git a/srcpkgs/sysprof/patches/musl-missing-include.patch b/srcpkgs/sysprof/patches/musl-missing-include.patch new file mode 100644 index 00000000000..6160428eef8 --- /dev/null +++ b/srcpkgs/sysprof/patches/musl-missing-include.patch @@ -0,0 +1,13 @@ +Fix build for gcc 14 and musl + +diff -rup src/libsysprof/sysprof-elf-loader.c.orig src/libsysprof/sysprof-elf-loader.c +--- a/src/libsysprof/sysprof-elf-loader.c ++++ b/src/libsysprof/sysprof-elf-loader.c +@@ -22,6 +22,7 @@ + + #include + #include ++#include + + #include "sysprof-elf-private.h" + #include "sysprof-elf-loader-private.h" diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index 0a40abfb42b..77ffa22cb6f 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -1,25 +1,47 @@ # Template file for 'sysprof' pkgname=sysprof -version=3.46.0 -revision=2 +version=45.2 +revision=1 build_style=meson -configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd" +configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd -Db_lto=false" hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils - gtk-update-icon-cache" -makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel - json-glib-devel libunwind-devel libadwaita-devel" + polkit-devel gtk4-update-icon-cache" +makedepends="gtk4-devel libadwaita-devel libdex-devel + json-glib-devel libpanel-devel polkit-devel libunwind-devel" +depends="sysprof-cli" short_desc="System-wide profiler for Linux" maintainer="Enno Boland " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/sysprof" changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS" distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz" -checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071 +checksum=29e0dc15eac46da09146f9c9f11cbd05f230403f9a01e9164eeb0907c4420c8d -# for ITS rules -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" polkit-devel" -fi +sysprof-cli_package() { + # turbostat is necessary for recording power usage + # but it is only avaliable on x86 + case "$XBPS_TARGET_MACHINE" in + i686*|x86_64*) + depends="turbostat" + esac + short_desc+=" - command line utilities" + pkg_install() { + vmove "usr/bin/sysprof-*" + vmove usr/libexec + vmove usr/share/dbus-1/system-services/org.gnome.Sysprof3.service + vmove usr/share/dbus-1/system.d/org.gnome.Sysprof3.conf + vmove usr/share/polkit-1/actions/org.gnome.sysprof3.policy + vmove usr/lib/systemd/sysprof3.service + } +} + +libsysprof_package() { + short_desc+=" - runtime libraries and plugins" + pkg_install() { + vmove "usr/lib/libsysprof-6.so.*" + vmove "usr/lib/libsysprof-*-6.so" + } +} sysprof-devel_package() { depends="${sourcepkg}>=${version}_${revision} libglib-devel @@ -28,6 +50,7 @@ sysprof-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove usr/lib/libsysprof-6.so vmove "usr/lib/*.a" } }