htop: update to 3.0.5

root-packages/htop/build.sh

@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://htop.dev/
 TERMUX_PKG_DESCRIPTION="Interactive process viewer for Linux"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=3.0.1
+TERMUX_PKG_VERSION=3.0.5
 TERMUX_PKG_SRCURL=https://github.com/htop-dev/htop/archive/${TERMUX_PKG_VERSION}/htop-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=8465164bc085f5f1813e1d3f6c4b9b56bf4c95cc12226a5367e65794949b01ca
+TERMUX_PKG_SHA256=4c2629bd50895bd24082ba2f81f8c972348aa2298cc6edc6a21a7fa18b73990c
 # htop checks setlocale() return value for UTF-8 support, so use libandroid-support.
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses"
 TERMUX_PKG_BUILD_IN_SRC=true

root-packages/htop/fix-missing-macros.patch

@@ -1,8 +1,23 @@
-diff -uNr htop-2.1.0/linux/LinuxProcessList.c htop-2.1.0.mod/linux/LinuxProcessList.c
---- htop-2.1.0/linux/LinuxProcessList.c	2018-02-04 20:57:13.000000000 +0200
-+++ htop-2.1.0.mod/linux/LinuxProcessList.c	2018-03-05 17:57:46.901891199 +0200
-@@ -37,6 +37,14 @@
- #include <linux/taskstats.h>
+--- ./Process.c.orig	2021-02-13 11:57:02.747930225 +0000
++++ ./Process.c	2021-02-13 11:58:40.299938503 +0000
+@@ -35,6 +35,13 @@
+ #include <sys/sysmacros.h>
+ #endif
+ 
++#ifndef major
++#define major(rdev) ((rdev)>>8)
++#endif
++
++#ifndef minor
++#define minor(rdev) ((rdev) & 0xff)
++#endif
+ 
+ static uid_t Process_getuid = (uid_t)-1;
+ 
+--- ./linux/LinuxProcessList.c.orig	2021-02-13 11:57:02.747930225 +0000
++++ ./linux/LinuxProcessList.c	2021-02-13 11:59:30.411609089 +0000
+@@ -52,6 +52,14 @@
+ #include <sys/sysmacros.h>
  #endif
  
 +#ifndef major
@@ -13,24 +28,6 @@ diff -uNr htop-2.1.0/linux/LinuxProcessList.c htop-2.1.0.mod/linux/LinuxProcessL
 +#define minor(rdev) ((rdev) & 0xff)
 +#endif
 +
- /*{
- 
- #include "ProcessList.h"
-diff -uNr htop-2.1.0/Process.c htop-2.1.0.mod/Process.c
---- htop-2.1.0/Process.c	2018-02-04 20:57:13.000000000 +0200
-+++ htop-2.1.0.mod/Process.c	2018-03-05 17:59:16.522983619 +0200
-@@ -29,6 +29,14 @@
- #include <assert.h>
- #include <math.h>
- 
-+#ifndef major
-+#define major(rdev) ((rdev)>>8)
-+#endif
-+
-+#ifndef minor
-+#define minor(rdev) ((rdev) & 0xff)
-+#endif
-+
- #ifdef __ANDROID__
- #define SYS_ioprio_get __NR_ioprio_get
- #define SYS_ioprio_set __NR_ioprio_set
+ #ifdef HAVE_SENSORS_SENSORS_H
+ #include "LibSensors.h"
+ #endif