package/atop: bump to version 2.10.0

This new version requires libglib2 as a dependency, which itself is
detected using pkg-config, so we need host-pkgconf as a dependency.

The patch 0001-atop.h-include-time.h.patch can be removed, it was
applied upstream as
03c5c4dd29.

A new patch (submitted upstream) is also needed to be able to provide
additional CFLAGS/LDFLAGS, without overriding the ones defined in the
upstream Makefile.

Signed-off-by: Kadambini Nema <kadambini.nema@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch

@@ -0,0 +1,33 @@
+From c8e9d2b885deca065bd7955019a6aa071974042d Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Mon, 5 Aug 2024 23:38:08 +0200
+Subject: [PATCH] Makefile: allow the user to pass additional CFLAGS and
+ LDFLAGS
+
+This is needed for some build systems. For example, Buildroot needs to
+disable optimizations on some CPU architectures.
+
+Upstream: https://github.com/Atoptool/atop/pull/314
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a6f196b..dae5cda 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,8 +20,8 @@ PMPATH1  = /usr/lib/pm-utils/sleep.d
+ PMPATH2  = /usr/lib64/pm-utils/sleep.d
+ PMPATHD  = /usr/lib/systemd/system-sleep
+ 
+-CFLAGS  += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
+-LDFLAGS  = $(shell pkg-config --libs glib-2.0)
++override CFLAGS  := -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security $(CFLAGS) # -DNOPERFEVENT   # -DHTTPSTATS
++override LDFLAGS  := $(shell pkg-config --libs glib-2.0) $(LDFLAGS)
+ OBJMOD0  = version.o
+ OBJMOD1  = various.o  deviate.o   procdbase.o
+ OBJMOD2  = acctproc.o photoproc.o photosyst.o  rawlog.o ifprop.o parseable.o
+-- 
+2.45.2
+

package/atop/0001-atop.h-include-time.h.patch

@@ -1,41 +0,0 @@
-From 03c5c4dd29bc7590baccb55a36d61e7f4b39c1fe Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 29 Oct 2023 18:56:35 +0100
-Subject: [PATCH] atop.h: include time.h
-
-Include time.h to avoid the following build failure with musl:
-
-atop.h:157:1: error: unknown type name 'time_t'
-  157 | time_t          normalize_epoch(time_t, long);
-      | ^~~~~~
-atop.h:157:1: note: 'time_t' is defined in header '<time.h>'; did you forget to '#include <time.h>'?
-atop.h:157:40: error: expected ')' before 'long'
-  157 | time_t          normalize_epoch(time_t, long);
-      |                                        ^~~~~
-      |                                        )
-
-Fixes:
- - http://autobuild.buildroot.org/results/e7ec8d16f2299320f374a0198c8e9b18a102b037
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Upstream: https://github.com/Atoptool/atop/pull/280
----
- atop.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/atop.h b/atop.h
-index 9274fc5..3d5fea4 100644
---- a/atop.h
-+++ b/atop.h
-@@ -24,6 +24,8 @@
- #ifndef __ATOP__
- #define __ATOP__
- 
-+#include <time.h>
-+
- #define	EQ		0
- #define SECONDSINDAY	86400
- #define RAWNAMESZ	256
--- 
-2.42.0
-

package/atop/Config.in

@@ -1,11 +1,13 @@
 config BR2_PACKAGE_ATOP
 	bool "atop"
-	depends on BR2_USE_MMU # fork()
-	depends on BR2_USE_WCHAR # ncurses wchar
+	depends on BR2_USE_MMU # fork(), libglib2
+	depends on BR2_USE_WCHAR # ncurses wchar, libglib2
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # PERF_FLAG_FD_CLOEXEC
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_NCURSES_WCHAR
 	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Atop is an ASCII full-screen performance monitor for Linux
 	  that is capable of reporting the activity of all processes
@@ -20,7 +22,8 @@ config BR2_PACKAGE_ATOP
 
 	  http://www.atoptool.nl
 
-comment "atop needs a toolchain w/ wchar, headers >= 3.14"
+comment "atop needs a toolchain w/ wchar, headers >= 3.14, threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
+		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 || \
+		!BR2_TOOLCHAIN_HAS_THREADS

package/atop/atop.hash

@@ -1,5 +1,5 @@
 # Locally computed:
-sha256  8d82f211b712a227000ef254c0a2b53bcb71235bf40d93316acce80b04bff926  atop-2.9.0.tar.gz
+sha256  e7a673cf2c82578e7dd82ecb0dec83fd9ecb30828b2561c28a9fa5aaf75d5f93  atop-2.10.0.tar.gz
 
 # Hash for license file:
 sha256  204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994  COPYING

package/atop/atop.mk

@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-ATOP_VERSION = 2.9.0
+ATOP_VERSION = 2.10.0
 ATOP_SITE = http://www.atoptool.nl/download
 ATOP_LICENSE = GPL-2.0+
 ATOP_LICENSE_FILES = COPYING
 ATOP_CPE_ID_VALID = YES
-ATOP_DEPENDENCIES = ncurses zlib
+ATOP_DEPENDENCIES = ncurses zlib libglib2 host-pkgconf
 
 ATOP_CFLAGS = $(TARGET_CFLAGS)