Removed all patches:
- 0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch:
  applied upstream in https://github.com/hishamhm/htop/commit/70ed51a303
- 0002-configure-check-for-ncurses-with-ncurses6-config.patch:
  replaced by setting HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config in
  HTOP_CONF_ENV

Fixes: 74ffd1f57d0d68a8918 ("htop: fix configure to discover ncurses6")
Cc: Ladislav Michl <la...@linux-mips.org>
Signed-off-by: Roland Hieber <r.hie...@pengutronix.de>

---
v2:
 - take care of the patches
 - set HTOP_NCURSES_CONFIG_SCRIPT. This is functionally equivalent to
   Ladislav's 0002.patch, but I prefer setting a small variable in
   htop.make to a configure.ac patch.
---
 ...ProcessList-fix-reading-of-number-of-read.patch | 28 ----------------------
 ...re-check-for-ncurses-with-ncurses6-config.patch | 20 ----------------
 patches/htop-2.1.0/autogen.sh                      |  1 -
 patches/htop-2.1.0/series                          |  5 ----
 rules/htop.make                                    |  5 ++--
 5 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 
patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
 delete mode 100644 
patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
 delete mode 120000 patches/htop-2.1.0/autogen.sh
 delete mode 100644 patches/htop-2.1.0/series

diff --git 
a/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
 
b/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
deleted file mode 100644
index e1267a32a..000000000
--- 
a/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Marc Kleine-Budde <m...@pengutronix.de>
-Date: Wed, 7 Feb 2018 23:16:37 +0100
-Subject: [PATCH] linux/LinuxProcessList: fix reading of number of read
- syscalls of process
-
-The "if" tests if the character at index "5" is 'r', as a first quick
-check. However at index "5" will always be a colon ":". This patch fixes
-the off-by-one error. htop now shows proper values in the RD_SYSC
-column.
-
-Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
----
- linux/LinuxProcessList.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
-index 6f2631afa12f..230770258084 100644
---- a/linux/LinuxProcessList.c
-+++ b/linux/LinuxProcessList.c
-@@ -436,7 +436,7 @@ static void LinuxProcessList_readIoFile(LinuxProcess* 
process, const char* dirna
-          }
-          break;
-       case 's':
--         if (line[5] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
-+         if (line[4] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
-             process->io_syscr = strtoull(line+7, NULL, 10);
-          } else if (strncmp(line+1, "yscw: ", 6) == 0) {
-             process->io_syscw = strtoull(line+7, NULL, 10);
diff --git 
a/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
 
b/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
deleted file mode 100644
index 04714a4bb..000000000
--- 
a/patches/htop-2.1.0/0002-configure-check-for-ncurses-with-ncurses6-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- htop-2.1.0/configure.ac.orig       2018-02-27 11:23:08.615702344 +0100
-+++ htop-2.1.0/configure.ac    2018-02-27 11:24:21.287425809 +0100
-@@ -202,11 +202,12 @@
-             
[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"
--   ))))
-+    HTOP_CHECK_SCRIPT([ncurses], [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],[:],
diff --git a/patches/htop-2.1.0/autogen.sh b/patches/htop-2.1.0/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/htop-2.1.0/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/htop-2.1.0/series b/patches/htop-2.1.0/series
deleted file mode 100644
index 87b59abe7..000000000
--- a/patches/htop-2.1.0/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
-0002-configure-check-for-ncurses-with-ncurses6-config.patch
-# f87a037f960f427f6ab7ebcbb54e5e4e  - git-ptx-patches magic
diff --git a/rules/htop.make b/rules/htop.make
index 4d3505f29..6ea05f15c 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
 #
 # Paths and names
 #
-HTOP_VERSION   := 2.1.0
-HTOP_MD5       := f262b66ad6c194782f4d3a80627e84c8
+HTOP_VERSION   := 2.2.0
+HTOP_MD5       := 0d816b6beed31edc75babcfbf863ffa8
 HTOP           := htop-$(HTOP_VERSION)
 HTOP_SUFFIX    := tar.gz
 HTOP_URL       := 
http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
@@ -34,6 +34,7 @@ HTOP_LICENSE  := GPL-2.0-only
 # autoconf
 #
 HTOP_CONF_TOOL := autoconf
+HTOP_CONF_ENV  := HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config
 HTOP_CONF_OPT  := \
        $(CROSS_AUTOCONF_USR) \
        --enable-proc \
-- 
2.16.3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to