diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-08-30 14:35:10 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-08-31 10:06:32 -0700 |
commit | 97045ab0132e7f0c1e4f262945552d028b0af52a (patch) | |
tree | a0f315bfb45389f8ef1dfe88dfc1b2b0390b0471 /meta-gnome | |
parent | 0ef6f75f4fe239ab280ff616097d416335cc9f09 (diff) | |
download | meta-openembedded-97045ab0132e7f0c1e4f262945552d028b0af52a.tar.gz |
libgtop: Fix build with clang
Backport a patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch | 29 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb | 4 |
2 files changed, 32 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch new file mode 100644 index 0000000000..5ea8eed516 --- /dev/null +++ b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch @@ -0,0 +1,29 @@ +From e969ac59335d3fb1cd228f8e7c4f6c2dda4fa536 Mon Sep 17 00:00:00 2001 +From: Avinash Sonawane <rootkea@gmail.com> +Date: Mon, 20 Dec 2021 13:33:42 +0530 +Subject: [PATCH] Pass correct parameter + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libgtop/-/merge_requests/35] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/daemon/main.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/daemon/main.c b/src/daemon/main.c +index b51addf..eaee3b3 100644 +--- a/src/daemon/main.c ++++ b/src/daemon/main.c +@@ -222,8 +222,9 @@ handle_parent_connection (int s) + 0, NULL); + break; + case GLIBTOP_CMND_PROC_IO: ++ memcpy (&pid, parameter, sizeof (pid_t)); + glibtop_get_proc_io_l +- (server, &resp->u.data.proc_io, parameter); ++ (server, &resp->u.data.proc_io, pid); + do_output (s, resp, _offset_data (proc_io), + 0, NULL); + break; +-- +2.37.2 + diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb index 2e60264e04..fa95e0bee0 100644 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb @@ -6,7 +6,9 @@ inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-ver ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch" +SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch \ + file://0001-Pass-correct-parameter.patch \ + " SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4" |