diff mbox series

[meta-gnome,4/4] libgtop: Fix build with clang

Message ID 20220830213707.1413842-4-raj.khem@gmail.com
State New
Headers show
Series None | expand

Commit Message

Khem Raj Aug. 30, 2022, 9:37 p.m. UTC 
Backport a patch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../libgtop/0001-Pass-correct-parameter.patch | 29 +++++++++++++++++++
 .../recipes-gnome/libgtop/libgtop_2.40.0.bb   |  4 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch
diff mbox series

Patch

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"