diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-11-22 16:41:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-23 23:32:10 +0000 |
commit | c2a63b10300cab8bc896fdd2509bb06cc08ac420 (patch) | |
tree | 74c788b1b19bb169fab6fa9db40f8450309f26f4 | |
parent | df7a2a50b20fcbae17b87d0291cbc405b04c37d7 (diff) | |
download | openembedded-core-contrib-c2a63b10300cab8bc896fdd2509bb06cc08ac420.tar.gz |
sysprof: update to 3.30.2
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch | 34 | ||||
-rw-r--r-- | meta/recipes-kernel/sysprof/files/wordsize.patch | 38 | ||||
-rw-r--r-- | meta/recipes-kernel/sysprof/sysprof_3.30.2.bb (renamed from meta/recipes-kernel/sysprof/sysprof_3.30.0.bb) | 6 |
3 files changed, 2 insertions, 76 deletions
diff --git a/meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch b/meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch deleted file mode 100644 index 38f9f5f66a..0000000000 --- a/meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch +++ /dev/null @@ -1,34 +0,0 @@ -From de13d1f908335cc882c447e4d7c4360b9e5da190 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 6 Sep 2018 17:49:44 -0700 -Subject: [PATCH] fix non-literal format string issues - -clang errors out when using -Werror=format-nonliteral -since the definition of g_strdup_vprintf() from glib-2.0 -is using va_list and clangs still warns where as -gcc doesn't do that for va_list arguments - -Fixes -src/sp-window.c:96:27: error: format string is not a string literal [-Werror,-Wformat-nonliteral] -| str = g_strdup_vprintf (format, args); -| ^~~~~~ - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/merge_requests/6] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/sp-window.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sp-window.c b/src/sp-window.c -index 4dfac2d..aff4779 100644 ---- a/src/sp-window.c -+++ b/src/sp-window.c -@@ -80,7 +80,7 @@ static guint signals [N_SIGNALS]; - static void sp_window_set_profiler (SpWindow *self, - SpProfiler *profiler); - --static void -+static G_GNUC_PRINTF(3, 4) void - sp_window_notify_user (SpWindow *self, - GtkMessageType message_type, - const gchar *format, diff --git a/meta/recipes-kernel/sysprof/files/wordsize.patch b/meta/recipes-kernel/sysprof/files/wordsize.patch deleted file mode 100644 index d65b13a682..0000000000 --- a/meta/recipes-kernel/sysprof/files/wordsize.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/merge_requests/5] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From bc7e3e27c28d0bab8bea72f2314191532b2e7840 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Fri, 7 Sep 2018 01:30:09 +0100 -Subject: [PATCH] capture: use size of void* instead of glibc-specific - __WORDSIZE - -__WORDSIZE is glibc-specific so sp-capture-types.h doesn't work with musl. ---- - lib/capture/sp-capture-types.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/lib/capture/sp-capture-types.h b/lib/capture/sp-capture-types.h -index 48fcfb8..1d6cd1d 100644 ---- a/lib/capture/sp-capture-types.h -+++ b/lib/capture/sp-capture-types.h -@@ -32,12 +32,14 @@ G_BEGIN_DECLS - #define SP_CAPTURE_MAGIC (GUINT32_TO_LE(0xFDCA975E)) - #define SP_CAPTURE_ALIGN (sizeof(SpCaptureAddress)) - --#if __WORDSIZE == 64 -+#if GLIB_SIZEOF_VOID_P == 8 - # define SP_CAPTURE_JITMAP_MARK G_GUINT64_CONSTANT(0xE000000000000000) - # define SP_CAPTURE_ADDRESS_FORMAT "0x%016lx" --#else -+#elif GLIB_SIZEOF_VOID_P == 4 - # define SP_CAPTURE_JITMAP_MARK G_GUINT64_CONSTANT(0xE0000000) - # define SP_CAPTURE_ADDRESS_FORMAT "0x%016llx" -+#else -+#error Unknown GLIB_SIZEOF_VOID_P - #endif - - #define SP_CAPTURE_CURRENT_TIME (sp_clock_get_current_time()) --- -2.11.0 - diff --git a/meta/recipes-kernel/sysprof/sysprof_3.30.0.bb b/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb index 19dcf25a51..866642cd1e 100644 --- a/meta/recipes-kernel/sysprof/sysprof_3.30.0.bb +++ b/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb @@ -9,13 +9,11 @@ inherit gnomebase gettext systemd upstream-version-is-even DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" -SRC_URI[archive.md5sum] = "ae896a8a2364e18c07fafa9573202f59" -SRC_URI[archive.sha256sum] = "29cd2c4be277f00698dce48259219557c4fddc2c01254b8fac95900a8c663f63" +SRC_URI[archive.md5sum] = "80cb47906eced2e7b9976bf00deec323" +SRC_URI[archive.sha256sum] = "e90878e5a509bd79d170a7a51d47cc5508ab1363afaf0d97654373dfd9c8ba0b" SRC_URI += " \ file://define-NT_GNU_BUILD_ID.patch \ file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ - file://wordsize.patch \ - file://0001-fix-non-literal-format-string-issues.patch \ " RECIPE_NO_UPDATE_REASON = "Waiting for resolution of https://bugzilla.gnome.org/show_bug.cgi?id=794625" |