Merge pull request #1804 from CvH/9.0-htop-fix

htop: build fix

packages/addons/addon-depends/system-tools-depends/htop/patches/htop-01_netbsd-curses_support.patch

@@ -2,12 +2,7 @@ From: awiouy <awiouy@gmail.com>
 Date: Thu, 6 Jul 2017 18:51:24 +0200
 Subject: [PATCH] htop: netbsd-curses support
 
----
- RichString.c | 59 -----------------------------------------------------------
- 1 file changed, 59 deletions(-)
-
 diff --git a/RichString.c b/RichString.c
-index e7dd4e83..0ff1bb02 100644
 --- a/RichString.c
 +++ b/RichString.c
 @@ -18,21 +18,7 @@ in the source distribution for its full text.
@@ -103,3 +98,45 @@ index e7dd4e83..0ff1bb02 100644
  void RichString_prune(RichString* this) {
     if (this->chlen > RICHSTRING_MAXLEN)
        free(this->chptr);
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -183,36 +183,6 @@
+    ], [$4])
+ ])
+ 
+-AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
+-if test "x$enable_unicode" = xyes; then
+-   HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
+-    HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
+-     HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
+-      HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
+-       HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
+-        HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
+-      missing_libraries="$missing_libraries libncursesw"
+-      AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
+-   ))))))
+-
+-   AC_CHECK_HEADERS([ncursesw/curses.h],[:],
+-      [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+-         [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+-            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
+-else
+-   HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
+-    HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
+-     HTOP_CHECK_LIB([ncurses6],  [refresh], [HAVE_LIBNCURSES],
+-      HTOP_CHECK_LIB([ncurses],  [refresh], [HAVE_LIBNCURSES],
+-      missing_libraries="$missing_libraries libncurses"
+-   ))))
+-   
+-   AC_CHECK_HEADERS([curses.h],[:],
+-      [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+-         [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+-            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
+-fi
+-
+ if test "$my_htop_platform" = "freebsd"; then
+    AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
+ fi
+

packages/addons/addon-depends/system-tools-depends/htop/patches/htop-02_temp_remove_set_escdelay.patch

@@ -1,36 +0,0 @@
-From 308aed7fc91f40db7b7f69095c1a7b777bfeb934 Mon Sep 17 00:00:00 2001
-From: awiouy <awiouy@gmail.com>
-Date: Thu, 6 Jul 2017 18:50:57 +0200
-Subject: [PATCH] htop: remove set_escdelay - fixed in netbsd-curses 0.2.1
-
-drop this patch at netbsd-curses bump to 0.2.1 or higher
-
----
- InfoScreen.c    | 1 -
- ScreenManager.c | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/InfoScreen.c b/InfoScreen.c
-index e27494c7..28017c63 100644
---- a/InfoScreen.c
-+++ b/InfoScreen.c
-@@ -117,7 +117,6 @@ void InfoScreen_run(InfoScreen* this) {
- 
-       if (this->inc->active)
-          move(LINES-1, CRT_cursorX);
--      set_escdelay(25);
-       int ch = getch();
-       
-       if (ch == ERR) {
-diff --git a/ScreenManager.c b/ScreenManager.c
-index 05e1c024..5d1d07d1 100644
---- a/ScreenManager.c
-+++ b/ScreenManager.c
-@@ -189,7 +189,6 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
-       }
- 
-       int prevCh = ch;
--      set_escdelay(25);
-       ch = getch();
- 
-       HandlerResult result = IGNORED;