Updated to htop 3.0.3.

3 files changed, 44 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 963b71ceb5e2..2c1b1a501ef7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
 pkgbase = htop-solarized
 	pkgdesc = Interactive process viewer with solarized patch
-	pkgver = 3.0.2
+	pkgver = 3.0.3
 	pkgrel = 1
 	url = https://htop.dev/
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	license = GPL
+	makedepends = lm_sensors
 	depends = ncurses
 	depends = libncursesw.so
 	depends = libnl
+	optdepends = lm_sensors: show cpu temperatures
 	optdepends = lsof: show files opened by a process
 	optdepends = strace: attach to a running process
 	provides = htop
 	conflicts = htop
 	options = !emptydirs
-	source = https://github.com/htop-dev/htop/archive/3.0.2/htop-3.0.2.tar.gz
+	source = https://github.com/htop-dev/htop/archive/3.0.3/htop-3.0.3.tar.gz
 	source = htop-solarized.patch
-	sha256sums = b4744a3bea279f2a3725ed8e5e35ffd9cb10d66673bf07c8fe21feb3c4661305
-	sha256sums = d602046cf90caed976061a09c34c8156de5023b93245de53b6ae115651b78ccb
+	sha256sums = 725103929c925a7252b4dedeb29b3a1da86a2f74e96c50eb9ea6c8fec1942cd2
+	sha256sums = 9d2c3b48fa62023eedea61ccb96ff6b8ed90294c5dea2635056756c8ffabaeb9
 
 pkgname = htop-solarized
 
diff --git a/PKGBUILD b/PKGBUILD
index c18042eb0a92..76a9a1c84c88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,22 +8,24 @@
 
 _pkgname=htop
 pkgname=$_pkgname-solarized
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="Interactive process viewer with solarized patch"
 arch=('i686' 'x86_64' 'armv7h')
 url='https://htop.dev/'
 license=('GPL')
 depends=('ncurses' 'libncursesw.so' 'libnl')
-optdepends=('lsof: show files opened by a process'
+makedepends=('lm_sensors')
+optdepends=('lm_sensors: show cpu temperatures'
+            'lsof: show files opened by a process'
             'strace: attach to a running process')
 provides=('htop')
 conflicts=('htop')
 options=('!emptydirs')
 source=("https://github.com/htop-dev/htop/archive/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
         'htop-solarized.patch')
-sha256sums=('b4744a3bea279f2a3725ed8e5e35ffd9cb10d66673bf07c8fe21feb3c4661305'
-            'd602046cf90caed976061a09c34c8156de5023b93245de53b6ae115651b78ccb')
+sha256sums=('725103929c925a7252b4dedeb29b3a1da86a2f74e96c50eb9ea6c8fec1942cd2'
+            '9d2c3b48fa62023eedea61ccb96ff6b8ed90294c5dea2635056756c8ffabaeb9')
 
 prepare() {
   cd "$_pkgname-$pkgver"
diff --git a/htop-solarized.patch b/htop-solarized.patch
index 8d407f9a0b1c..fc74e413854c 100644
--- a/htop-solarized.patch
+++ b/htop-solarized.patch
@@ -1,38 +1,40 @@
+diff --git a/CRT.c b/CRT.c
+index 68f6405..95c230a 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -241,7 +241,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
-       [LED_COLOR] = ColorPair(Green,Black),
-       [TASKS_RUNNING] = A_BOLD | ColorPair(Green,Black),
+@@ -119,7 +119,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+       [LED_COLOR] = ColorPair(Green, Black),
+       [TASKS_RUNNING] = A_BOLD | ColorPair(Green, Black),
        [PROCESS] = A_NORMAL,
 -      [PROCESS_SHADOW] = A_BOLD | ColorPairGrayBlack,
-+      [PROCESS_SHADOW] = A_BOLD | ColorPair(Green,Black),
-       [PROCESS_TAG] = A_BOLD | ColorPair(Yellow,Black),
-       [PROCESS_MEGABYTES] = ColorPair(Cyan,Black),
-       [PROCESS_BASENAME] = A_BOLD | ColorPair(Cyan,Black),
-@@ -253,7 +253,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
-       [PROCESS_THREAD] = ColorPair(Green,Black),
-       [PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Green,Black),
++      [PROCESS_SHADOW] = A_BOLD | ColorPair(Green,Black), // Solarized
+       [PROCESS_TAG] = A_BOLD | ColorPair(Yellow, Black),
+       [PROCESS_MEGABYTES] = ColorPair(Cyan, Black),
+       [PROCESS_GIGABYTES] = ColorPair(Green, Black),
+@@ -136,7 +136,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+       [PROCESS_COMM] = ColorPair(Magenta, Black),
+       [PROCESS_THREAD_COMM] = ColorPair(Blue, Black),
        [BAR_BORDER] = A_BOLD,
 -      [BAR_SHADOW] = A_BOLD | ColorPairGrayBlack,
-+      [BAR_SHADOW] = A_BOLD | ColorPair(Green,Black),
-       [SWAP] = ColorPair(Red,Black),
-       [GRAPH_1] = A_BOLD | ColorPair(Cyan,Black),
-       [GRAPH_2] = ColorPair(Cyan,Black),
-@@ -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),
--      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Cyan,Black),
-+      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Green,Black),
-       [LOAD_AVERAGE_FIVE] = A_BOLD | ColorPair(Cyan,Black),
-       [LOAD_AVERAGE_ONE] = A_BOLD | ColorPair(White,Black),
++      [BAR_SHADOW] = A_BOLD | ColorPair(Green,Black), // Solarized
+       [SWAP] = ColorPair(Red, Black),
+       [GRAPH_1] = A_BOLD | ColorPair(Cyan, Black),
+       [GRAPH_2] = ColorPair(Cyan, Black),
+@@ -144,7 +144,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),
+-      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Cyan, Black),
++      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Green,Black), // Solarized
+       [LOAD_AVERAGE_FIVE] = A_BOLD | ColorPair(Cyan, Black),
+       [LOAD_AVERAGE_ONE] = A_BOLD | ColorPair(White, Black),
        [LOAD] = A_BOLD,
-@@ -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_SYSTEM] = ColorPair(Red,Black),
+@@ -160,7 +160,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+       [CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue, Black),
+       [CPU_NORMAL] = 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),
++      [CPU_IOWAIT] = A_BOLD | ColorPair(Green,Black), // Solarized
+       [CPU_IRQ] = ColorPair(Yellow, Black),
+       [CPU_SOFTIRQ] = ColorPair(Magenta, Black),
+       [CPU_STEAL] = ColorPair(Cyan, Black),