From c8ec9138e22cf15c9191cded22ab5a6b784191ea Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 16 Aug 2020 05:28:14 +0200 Subject: [PATCH] sysprof: update to 3.38.0 --- common/shlibs | 4 +- .../patches/allocs-by-size-gsize-format.patch | 12 -- srcpkgs/sysprof/patches/build.patch | 10 ++ srcpkgs/sysprof/patches/musl.patch | 125 ++++++++++++++++++ srcpkgs/sysprof/template | 4 +- 5 files changed, 139 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch create mode 100644 srcpkgs/sysprof/patches/build.patch create mode 100644 srcpkgs/sysprof/patches/musl.patch diff --git a/common/shlibs b/common/shlibs index ed1e2ad770..c08bcb7478 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3153,8 +3153,8 @@ libmirage.so.11 libmirage-3.1.0_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 libixml.so.10 libupnp1.8-1.8.2_1 libupnp.so.13 libupnp1.8-1.8.4_1 -libsysprof-3.so sysprof-3.34.0_1 -libsysprof-ui-3.so sysprof-3.34.0_1 +libsysprof-4.so sysprof-3.37.90_1 +libsysprof-ui-4.so sysprof-3.37.90_1 libmozjs-52.so mozjs52-52.3.0_1 libmozjs-52.so.0 mozjs52-52.3.0_1 libvala-0.50.so.0 libvala-0.50.0_1 diff --git a/srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch b/srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch deleted file mode 100644 index afee07ebbc..0000000000 --- a/srcpkgs/sysprof/patches/allocs-by-size-gsize-format.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rauN src/tests/allocs-by-size.c src/tests/allocs-by-size.c ---- src/tests/allocs-by-size.c 2020-03-22 20:00:12.677048822 +0100 -+++ src/tests/allocs-by-size.c 2020-03-22 20:01:07.000418361 +0100 -@@ -109,7 +109,7 @@ - { - 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); - } - } diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch new file mode 100644 index 0000000000..ab7c2c1c16 --- /dev/null +++ b/srcpkgs/sysprof/patches/build.patch @@ -0,0 +1,10 @@ +--- src/libsysprof-capture/sysprof-capture-condition.c ++++ 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 new file mode 100644 index 0000000000..51f4212889 --- /dev/null +++ b/srcpkgs/sysprof/patches/musl.patch @@ -0,0 +1,125 @@ +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 +--- src/libsysprof-capture/sysprof-capture-cursor.c ++++ 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 +--- src/libsysprof-capture/sysprof-capture-reader.c ++++ 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 +--- src/libsysprof-capture/sysprof-capture-util.c ++++ 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 +--- src/libsysprof-capture/sysprof-capture-writer-cat.c ++++ 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 +--- src/libsysprof-capture/sysprof-collector.c ++++ 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 ++++ 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 +--- src/libsysprof-capture/sysprof-platform.c ++++ 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 + diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index 68bca60255..eae51ea735 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -1,6 +1,6 @@ # Template file for 'sysprof' pkgname=sysprof -version=3.36.0 +version=3.38.0 revision=1 build_style=meson configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="http://sysprof.com/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108 +checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce # for ITS rules if [ "$CROSS_BUILD" ]; then