htop: Update to 2.0.0 (fixes #142)

diff --git a/packages/htop/build.sh b/packages/htop/build.sh
index fc051648fb2d4f59e2a5701ddecd1efeafa92e35..be11156339601113cc9c6c7286dc8888e58e5157 100644 (file)
--- a/packages/htop/build.sh
+++ b/packages/htop/build.sh
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://hisham.hm/htop/
 TERMUX_PKG_DESCRIPTION="Interactive process viewer for Linux"
 TERMUX_PKG_DEPENDS="ncurses, libandroid-support"
 TERMUX_PKG_HOMEPAGE=http://hisham.hm/htop/
 TERMUX_PKG_DESCRIPTION="Interactive process viewer for Linux"
 TERMUX_PKG_DEPENDS="ncurses, libandroid-support"

-TERMUX_PKG_VERSION=1.0.3
+TERMUX_PKG_VERSION=2.0.0

 TERMUX_PKG_SRCURL=http://hisham.hm/htop/releases/${TERMUX_PKG_VERSION}/htop-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_SRCURL=http://hisham.hm/htop/releases/${TERMUX_PKG_VERSION}/htop-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC="yes"

+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_ncursesw6_addnwstr=yes"

 TERMUX_PKG_RM_AFTER_INSTALL="share/applications share/pixmaps"
 
 # htop checks setlocale() return value for UTF-8 support, so use libandroid-support.
 TERMUX_PKG_RM_AFTER_INSTALL="share/applications share/pixmaps"
 
 # htop checks setlocale() return value for UTF-8 support, so use libandroid-support.

diff --git a/packages/htop/meter-h.patch b/packages/htop/meter-h.patch
deleted file mode 100644 (file)
index a948056..0000000
--- a/packages/htop/meter-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r ../htop-1.0.3/Meter.h ./Meter.h
---- ../htop-1.0.3/Meter.h      2014-04-21 23:59:02.000000000 +0200
-+++ ./Meter.h  2014-05-04 01:58:24.365877532 +0200
-@@ -13,6 +13,7 @@
- 
- #include "ListItem.h"
- #include "ProcessList.h"
-+#include <sys/time.h>
- 
- typedef struct Meter_ Meter;
-