diff --git a/root-packages/htop/build.sh b/root-packages/htop/build.sh deleted file mode 100644 index 19cb0e545..000000000 --- a/root-packages/htop/build.sh +++ /dev/null @@ -1,21 +0,0 @@ -TERMUX_PKG_HOMEPAGE=https://htop.dev/ -TERMUX_PKG_DESCRIPTION="Interactive process viewer for Linux" -TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.0.5 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SRCURL=https://github.com/htop-dev/htop/archive/${TERMUX_PKG_VERSION}/htop-${TERMUX_PKG_VERSION}.tar.gz -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 -TERMUX_PKG_RM_AFTER_INSTALL="share/applications share/pixmaps" - -TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -ac_cv_lib_ncursesw6_addnwstr=yes -LIBS=-landroid-support -" - -termux_step_pre_configure() { - ./autogen.sh -} diff --git a/root-packages/htop/fix-missing-macros.patch b/root-packages/htop/fix-missing-macros.patch deleted file mode 100644 index d2b06abaf..000000000 --- a/root-packages/htop/fix-missing-macros.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- ./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 - #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 - #endif - -+#ifndef major -+#define major(rdev) ((rdev)>>8) -+#endif -+ -+#ifndef minor -+#define minor(rdev) ((rdev) & 0xff) -+#endif -+ - #ifdef HAVE_SENSORS_SENSORS_H - #include "LibSensors.h" - #endif diff --git a/root-packages/htop/no-proc-stat.patch b/root-packages/htop/no-proc-stat.patch deleted file mode 100644 index 91c75829a..000000000 --- a/root-packages/htop/no-proc-stat.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -uNr htop-3.0.0/linux/LinuxProcessList.c htop-3.0.0.mod/linux/LinuxProcessList.c ---- htop-3.0.0/linux/LinuxProcessList.c 2020-08-27 02:36:56.000000000 +0300 -+++ htop-3.0.0.mod/linux/LinuxProcessList.c 2020-08-29 11:55:19.994514529 +0300 -@@ -265,7 +265,7 @@ - // Update CPU count: - file = fopen(PROCSTATFILE, "r"); - if (file == NULL) { -- CRT_fatalError("Cannot open " PROCSTATFILE); -+ CRT_fatalError("Cannot open '/proc/stat'.\nOn Android 8 and higher access to this file is restricted by SELinux.\nRoot your device in order to get 'htop' working properly.\n"); - } - int cpus = 0; - do { -@@ -1127,7 +1127,7 @@ - - FILE* file = fopen(PROCSTATFILE, "r"); - if (file == NULL) { -- CRT_fatalError("Cannot open " PROCSTATFILE); -+ CRT_fatalError("Cannot open '/proc/stat'.\nOn Android 8 and higher access to this file is restricted by SELinux.\nRoot your device in order to get 'htop' working properly.\n"); - } - int cpus = this->super.cpuCount; - assert(cpus > 0);