[skip-ci] htop: update to 2.2.0

htop/0001-fix-option-string.patch

@@ -0,0 +1,25 @@
+From 731acc8bced18c90fbe0e18381c32f007f71e0d9 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Tue, 10 Apr 2018 16:21:46 +0200
+Subject: [PATCH 1/1] fix option string
+
+This broke with commit db05ba61065f64b59d0014518be0786b5439e54c.
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ htop.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/htop.c b/htop.c
+index 6db81dd..678a3b8 100644
+--- a/htop.c
++++ b/htop.c
+@@ -93,7 +93,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
+ 
+    int opt, opti=0;
+    /* Parse arguments */
+-   while ((opt = getopt_long(argc, argv, "hvCst::d:u:p:i", long_opts, &opti))) {
++   while ((opt = getopt_long(argc, argv, "hvCs:td:u:p:i", long_opts, &opti))) {
+       if (opt == EOF) break;
+       switch (opt) {
+          case 'h':

htop/PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=htop
-pkgver=2.1.0
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Interactive process viewer"
 arch=('x86_64')
@@ -9,12 +9,16 @@ depends=('ncurses')
 makedepends=('python2')
 optdepends=('lsof: show files opened by a process'
             'strace: attach to a running process')
-source=("http://hisham.hm/$pkgname/releases/$pkgver/$pkgname-$pkgver.tar.gz")
+source=("http://hisham.hm/$pkgname/releases/$pkgver/$pkgname-$pkgver.tar.gz"
-md5sums=('f262b66ad6c194782f4d3a80627e84c8')
+        '0001-fix-option-string.patch')
+md5sums=('0d816b6beed31edc75babcfbf863ffa8'
+         'fbeab356b156f00e5b9838d4f6bad37b')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
   
+  patch -Np1 < "${srcdir}"/0001-fix-option-string.patch
+
   sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure 
   sed -i 's|python|python2|' scripts/MakeHeader.py
 }
@@ -28,7 +32,8 @@ build() {
       --enable-unicode \
       --enable-openvz \
       --enable-vserver \
-      --enable-cgroup
+      --enable-cgroup \
+      --enable-delayacct
 
   make
 }