libgtop: update 2.40.0 -> 2.41.1

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk 2023-03-25 09:02:48 +01:00 committed by Khem Raj
parent d348914e40
commit 89ed607ea5
4 changed files with 1 additions and 117 deletions

View File

@ -1,29 +0,0 @@
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

View File

@ -1,37 +0,0 @@
From e865a93000913b4597607289356114cd159f4e28 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 21 May 2021 03:02:29 +0000
Subject: [PATCH] fix compile error for cross compile
On some distros, such as fedora32, cross compile failed with following
error since host library is used. undefined reference to
`stat64@GLIBC_2.33'
According doc of ld, set searchdir begins with "=", but not hardcoded
locations.
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libgtop/-/merge_requests/26]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 472f44b..ed6a4d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -270,8 +270,8 @@ AC_ARG_ENABLE(fatal-warnings,
[Define to enable fatal warnings]))
dnl These definitions are expanded in make.
-LIBGTOP_LIBS='-L$(libdir)'
-LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
+LIBGTOP_LIBS='-L=$(libdir)'
+LIBGTOP_INCS='-I=$(includedir)/libgtop-2.0'
if test x$libgtop_have_sysinfo = xyes ; then
LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO"
--
2.26.2

View File

@ -1,46 +0,0 @@
From 3c6f70e50cb586ac4add4dea627c316242691040 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 13 Jul 2017 09:17:29 -0700
Subject: [PATCH] netload: Include libc net headers unconditionally
This fixes compile with musl, and this conditional
is not needed now a days if we are still using glibc < 1.0
we have other bigger problems
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
sysdeps/linux/netload.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c
index c275db2..446bddd 100644
--- a/sysdeps/linux/netload.c
+++ b/sysdeps/linux/netload.c
@@ -34,8 +34,6 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
-/* GNU LibC */
#include <net/if.h>
#include <netinet/ip_icmp.h>
#include <netinet/in.h>
@@ -43,15 +41,6 @@
#include <netinet/tcp.h>
#include <netinet/udp.h>
#include <net/if.h>
-#else /* Libc 5 */
-#include <linux/if.h>
-#include <linux/in.h>
-#include <linux/ip.h>
-#include <linux/icmp.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#endif
-
#ifdef HAVE_IFADDRS_H
/* needed for IPV6 support */
--
2.13.2

View File

@ -6,10 +6,6 @@ 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 \
file://0001-Pass-correct-parameter.patch \
"
SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4"
SRC_URI[archive.sha256sum] = "43ea9ad13f7caf98303e64172b191be9b96bab340b019deeec72251ee140fe3b"
DEPENDS = "glib-2.0 libxau"