From 10dd01c9aacb85797518ed53c42f5093b6a511fb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 7 Jul 2021 17:08:00 +0200 Subject: [PATCH] sysprof: update to 3.40.1. --- srcpkgs/sysprof/patches/build.patch | 10 -- srcpkgs/sysprof/patches/musl.patch | 157 ---------------------------- srcpkgs/sysprof/template | 12 +-- 3 files changed, 4 insertions(+), 175 deletions(-) delete mode 100644 srcpkgs/sysprof/patches/build.patch delete mode 100644 srcpkgs/sysprof/patches/musl.patch diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch deleted file mode 100644 index 4d99d6bc3f3..00000000000 --- a/srcpkgs/sysprof/patches/build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/libsysprof-capture/sysprof-capture-condition.c -+++ b/src/libsysprof-capture/sysprof-capture-condition.c -@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self) - } - - sysprof_assert_not_reached (); -+ return NULL; - } - - static void diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch deleted file mode 100644 index abaac692fb3..00000000000 --- a/srcpkgs/sysprof/patches/musl.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001 -From: q66 -Date: Sun, 6 Sep 2020 18:21:37 +0200 -Subject: [PATCH] fix build on musl - ---- - .../sysprof-capture-cursor.c | 1 + - .../sysprof-capture-reader.c | 1 + - src/libsysprof-capture/sysprof-capture-util.c | 1 + - .../sysprof-capture-writer-cat.c | 1 + - src/libsysprof-capture/sysprof-collector.c | 1 + - src/libsysprof-capture/sysprof-compat.h | 28 +++++++++++++++++++ - src/libsysprof-capture/sysprof-platform.c | 1 + - 7 files changed, 34 insertions(+) - create mode 100644 src/libsysprof-capture/sysprof-compat.h - -diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c -index 24563f0..bb77a60 100644 ---- a/src/libsysprof-capture/sysprof-capture-cursor.c -+++ b/src/libsysprof-capture/sysprof-capture-cursor.c -@@ -59,6 +59,7 @@ - #include - #include - -+#include "sysprof-compat.h" - #include "sysprof-capture-condition.h" - #include "sysprof-capture-cursor.h" - #include "sysprof-capture-reader.h" -diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c -index 67c6b28..252d006 100644 ---- a/src/libsysprof-capture/sysprof-capture-reader.c -+++ b/src/libsysprof-capture/sysprof-capture-reader.c -@@ -68,6 +68,7 @@ - #include - #include - -+#include "sysprof-compat.h" - #include "sysprof-capture-reader.h" - #include "sysprof-capture-util-private.h" - #include "sysprof-capture-writer.h" -diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c -index 0bbea06..0e5f7e7 100644 ---- a/src/libsysprof-capture/sysprof-capture-util.c -+++ b/src/libsysprof-capture/sysprof-capture-util.c -@@ -56,6 +56,7 @@ - - #include "config.h" - -+#include - #include - #include - #include -diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c -index 66171b9..9febbbb 100644 ---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c -+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c -@@ -63,6 +63,7 @@ - #include - #include - -+#include "sysprof-compat.h" - #include "sysprof-capture.h" - #include "sysprof-macros-internal.h" - -diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c -index 1d7a0d6..7af6c96 100644 ---- a/src/libsysprof-capture/sysprof-collector.c -+++ b/src/libsysprof-capture/sysprof-collector.c -@@ -73,6 +73,7 @@ - - #include "mapped-ring-buffer.h" - -+#include "sysprof-compat.h" - #include "sysprof-capture-util-private.h" - #include "sysprof-collector.h" - #include "sysprof-macros-internal.h" -diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h -new file mode 100644 -index 0000000..ae9bf10 ---- /dev/null -+++ b/src/libsysprof-capture/sysprof-compat.h -@@ -0,0 +1,28 @@ -+/* added by q66 @ void to fix build on musl */ -+ -+#pragma once -+ -+#ifndef __GLIBC__ -+ -+#include -+#include -+ -+/* from glibc */ -+#ifndef TEMP_FAILURE_RETRY -+# define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ -+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) { -+ if (sz && (nmemb > ((size_t)-1 / sz))) { -+ errno = ENOMEM; -+ return NULL; -+ } -+ return realloc(p, nmemb * sz); -+} -+ -+#endif -diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c -index a80ab89..05bd590 100644 ---- a/src/libsysprof-capture/sysprof-platform.c -+++ b/src/libsysprof-capture/sysprof-platform.c -@@ -60,6 +60,7 @@ - #include - #include - -+#include "sysprof-compat.h" - #include "sysprof-capture-util-private.h" - #include "sysprof-platform.h" - --- -2.28.0 - -From here onward, blame sgn -Index: meson.build -=================================================================== ---- a/meson.build -+++ b/meson.build -@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL - config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h')) - - config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy')) -+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray')) - - if get_option('libunwind') - libunwind_dep = dependency('libunwind-generic', required: false) -Index: src/libsysprof-capture/sysprof-compat.h -=================================================================== ---- a/src/libsysprof-capture/sysprof-compat.h 2021-02-05 23:39:58.352258624 +0100 -+++ b/src/libsysprof-capture/sysprof-compat.h 2021-02-05 23:47:07.662841454 +0100 -@@ -17,6 +17,7 @@ - __result; })) - #endif - -+#ifndef HAVE_REALLOCARRAY - static inline void *reallocarray(void *p, size_t nmemb, size_t sz) { - if (sz && (nmemb > ((size_t)-1 / sz))) { - errno = ENOMEM; -@@ -24,5 +25,5 @@ - } - return realloc(p, nmemb * sz); - } -- -+#endif - #endif diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index eae51ea7356..2e24cd7de54 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -1,27 +1,23 @@ # Template file for 'sysprof' pkgname=sysprof -version=3.38.0 +version=3.40.1 revision=1 build_style=meson configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme" hostmakedepends="gettext pkg-config itstool glib-devel" -makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel" +makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel" short_desc="System-wide profiler for Linux" maintainer="Enno Boland " license="GPL-2.0-or-later, GPL-3.0-or-later" -homepage="http://sysprof.com/" +homepage="https://gitlab.gnome.org/GNOME/sysprof" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce +checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437 # for ITS rules if [ "$CROSS_BUILD" ]; then hostmakedepends+=" polkit-devel" fi -pre_build() { - export SHELL=/bin/bash -} - post_install() { rm -rf ${DESTDIR}/usr/deleteme }