From ff96debac5258bb720379b120e4e987d3ee43ea4 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Mon, 13 Dec 2021 02:31:04 +0100 Subject: [PATCH] sysprof: update to 3.42.0 Dropped upstreamed patches. Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- ...-Define-NT_GNU_BUILD_ID-if-undefined.patch | 35 ------------------- ...E_FORMAT-instead-of-G_GUINT64_FORMAT.patch | 31 ---------------- .../{sysprof_3.36.0.bb => sysprof_3.42.0.bb} | 7 +--- 3 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch delete mode 100644 meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch rename meta-gnome/recipes-gnome/sysprof/{sysprof_3.36.0.bb => sysprof_3.42.0.bb} (81%) diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch deleted file mode 100644 index 75aa86cdbf..0000000000 --- a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 18 Jul 2011 16:00:17 -0700 -Subject: [PATCH 1/2] sysprof: Define NT_GNU_BUILD_ID if undefined - -On uclibc elf.h does not have GNU extentions but we need this define -so we define it locally if its not getting it from elf.h - -Signed-off-by: Khem Raj - -Upstream-Status: Pending - -%% original patch: define-NT_GNU_BUILD_ID.patch ---- - src/libsysprof/elfparser.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/libsysprof/elfparser.h b/src/libsysprof/elfparser.h -index 160e4c9..94fa5c0 100644 ---- a/src/libsysprof/elfparser.h -+++ b/src/libsysprof/elfparser.h -@@ -18,6 +18,10 @@ - - #include - -+#ifndef NT_GNU_BUILD_ID -+#define NT_GNU_BUILD_ID 3 -+#endif -+ - typedef struct ElfSym ElfSym; - typedef struct ElfParser ElfParser; - --- -2.17.1 - diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch deleted file mode 100644 index d8fffbb7e9..0000000000 --- a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -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 - diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb b/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.0.bb similarity index 81% rename from meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb rename to meta-gnome/recipes-gnome/sysprof/sysprof_3.42.0.bb index 1f8351fc39..bb8f90c19b 100644 --- a/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb +++ b/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.0.bb @@ -14,12 +14,7 @@ DEPENDS += " \ glib-2.0 \ " -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-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \ -" +SRC_URI[archive.sha256sum] = "3c16e03efdfe5d3e71c4d239c67741ad37f72ce8971e2f7faf168dbd5e93e886" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'libsysprof', '', d)} \