Updated to htop 3.0.2.

Brought in line with upstream PKGBUILD wherever possible.

3 files changed, 32 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 016bfe4279eb..963b71ceb5e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = htop-solarized
 	pkgdesc = Interactive process viewer with solarized patch
-	pkgver = 2.2.0
+	pkgver = 3.0.2
 	pkgrel = 1
-	url = http://hisham.hm/htop/
+	url = https://htop.dev/
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	license = GPL
-	makedepends = python2
 	depends = ncurses
+	depends = libncursesw.so
+	depends = libnl
 	optdepends = lsof: show files opened by a process
 	optdepends = strace: attach to a running process
 	provides = htop
 	conflicts = htop
 	options = !emptydirs
-	source = http://hisham.hm/htop/releases/2.2.0/htop-2.2.0.tar.gz
-	source = htop-2.2.0-solarized.patch
-	sha512sums = ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
-	sha512sums = 5fa6d5627d3157bedb0b5d22b2d9c932af02bcf61bfed3f6f335f47eabef29d58820570c70f8babbd76ca0b938fda567cd51c6d8ec1c50f87b6d43d8b57c22dd
+	source = https://github.com/htop-dev/htop/archive/3.0.2/htop-3.0.2.tar.gz
+	source = htop-solarized.patch
+	sha256sums = b4744a3bea279f2a3725ed8e5e35ffd9cb10d66673bf07c8fe21feb3c4661305
+	sha256sums = d602046cf90caed976061a09c34c8156de5023b93245de53b6ae115651b78ccb
 
 pkgname = htop-solarized
 
diff --git a/PKGBUILD b/PKGBUILD
index b877c3ef863d..c18042eb0a92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Lars Rustand <rustand dot lars at gmail dot com>
+# Maintainer: Sean Greenslade <aur AT seangreenslade DOT com>
+# Contributor: Lars Rustand <rustand dot lars at gmail dot com>
 # Contributor: Boohbah <boohbah at gmail.com>
 # Contributor: Eric Belanger <eric at archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
@@ -7,32 +8,30 @@
 
 _pkgname=htop
 pkgname=$_pkgname-solarized
-pkgver=2.2.0
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Interactive process viewer with solarized patch"
 arch=('i686' 'x86_64' 'armv7h')
-url="http://hisham.hm/htop/"
+url='https://htop.dev/'
 license=('GPL')
-depends=('ncurses')
-makedepends=('python2')
+depends=('ncurses' 'libncursesw.so' 'libnl')
 optdepends=('lsof: show files opened by a process'
             'strace: attach to a running process')
 provides=('htop')
 conflicts=('htop')
 options=('!emptydirs')
-source=("http://hisham.hm/$_pkgname/releases/$pkgver/$_pkgname-$pkgver.tar.gz"
-        'htop-2.2.0-solarized.patch')
-sha512sums=('ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e'
-            '5fa6d5627d3157bedb0b5d22b2d9c932af02bcf61bfed3f6f335f47eabef29d58820570c70f8babbd76ca0b938fda567cd51c6d8ec1c50f87b6d43d8b57c22dd')
+source=("https://github.com/htop-dev/htop/archive/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
+        'htop-solarized.patch')
+sha256sums=('b4744a3bea279f2a3725ed8e5e35ffd9cb10d66673bf07c8fe21feb3c4661305'
+            'd602046cf90caed976061a09c34c8156de5023b93245de53b6ae115651b78ccb')
 
 prepare() {
   cd "$_pkgname-$pkgver"
 
-  #sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure
-  #sed -i 's|python|python2|' scripts/MakeHeader.py
+  autoreconf -fi
 
-  # Solarized patch: https://gist.github.com/ooesili/11292686
-  patch -p1 -N -i "$srcdir/htop-2.2.0-solarized.patch"
+  # Solarized patch
+  patch -p1 -N -i "${srcdir}/htop-solarized.patch"
 }
 
 build() {
@@ -40,11 +39,12 @@ build() {
 
   ./configure \
       --prefix=/usr \
-      --enable-unicode \
-      --enable-openvz \
-      --enable-vserver \
+      --sysconfdir=/etc \
       --enable-cgroup \
-      --enable-oom
+      --enable-delayacct \
+      --enable-openvz \
+      --enable-unicode \
+      --enable-vserver
 
   make
 }
diff --git a/htop-2.2.0-solarized.patch b/htop-solarized.patch
index 0b031e3a961f..8d407f9a0b1c 100644
--- a/htop-2.2.0-solarized.patch
+++ b/htop-solarized.patch
@@ -1,8 +1,6 @@
-diff --git a/CRT.c b/CRT.c
-index 2ab20c2..74a1d78 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -181,7 +181,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -241,7 +241,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [LED_COLOR] = ColorPair(Green,Black),
        [TASKS_RUNNING] = A_BOLD | ColorPair(Green,Black),
        [PROCESS] = A_NORMAL,
@@ -11,7 +9,7 @@ index 2ab20c2..74a1d78 100644
        [PROCESS_TAG] = A_BOLD | ColorPair(Yellow,Black),
        [PROCESS_MEGABYTES] = ColorPair(Cyan,Black),
        [PROCESS_BASENAME] = A_BOLD | ColorPair(Cyan,Black),
-@@ -193,7 +193,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -253,7 +253,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [PROCESS_THREAD] = ColorPair(Green,Black),
        [PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Green,Black),
        [BAR_BORDER] = A_BOLD,
@@ -20,7 +18,7 @@ index 2ab20c2..74a1d78 100644
        [SWAP] = ColorPair(Red,Black),
        [GRAPH_1] = A_BOLD | ColorPair(Cyan,Black),
        [GRAPH_2] = ColorPair(Cyan,Black),
-@@ -201,7 +201,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -261,7 +261,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [MEMORY_BUFFERS] = ColorPair(Blue,Black),
        [MEMORY_BUFFERS_TEXT] = A_BOLD | ColorPair(Blue,Black),
        [MEMORY_CACHE] = ColorPair(Yellow,Black),
@@ -29,12 +27,12 @@ index 2ab20c2..74a1d78 100644
        [LOAD_AVERAGE_FIVE] = A_BOLD | ColorPair(Cyan,Black),
        [LOAD_AVERAGE_ONE] = A_BOLD | ColorPair(White,Black),
        [LOAD] = A_BOLD,
-@@ -215,7 +215,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -274,7 +274,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue,Black),
        [CPU_NORMAL] = ColorPair(Green,Black),
-       [CPU_KERNEL] = ColorPair(Red,Black),
--      [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black),
-+      [CPU_IOWAIT] = A_BOLD | ColorPair(Green, Black),
+       [CPU_SYSTEM] = ColorPair(Red,Black),
+-      [CPU_IOWAIT] = A_BOLD | ColorPairGrayBlack,
++      [CPU_IOWAIT] = A_BOLD | ColorPair(Green,Black),
        [CPU_IRQ] = ColorPair(Yellow,Black),
        [CPU_SOFTIRQ] = ColorPair(Magenta,Black),
        [CPU_STEAL] = ColorPair(Cyan,Black),