Rebased patch on htop 2.0.0

4 files changed, 53 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8954bce3fb6..5a957ec00fd6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Feb  9 19:55:18 UTC 2016
+# Thu Feb 11 17:22:13 UTC 2016
 pkgbase = htop-solarized
 	pkgdesc = Interactive process viewer with solarized patch
-	pkgver = 1.0.3
-	pkgrel = 2
+	pkgver = 2.0.0
+	pkgrel = 1
 	url = http://htop.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -15,10 +15,10 @@ pkgbase = htop-solarized
 	provides = htop
 	conflicts = htop
 	options = !emptydirs
-	source = http://hisham.hm/htop/releases/1.0.3/htop-1.0.3.tar.gz
-	source = htop-1.0.3-solarized.patch
-	sha512sums = 4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232
-	sha512sums = 1e1eed2ca1f1d7908f125dd04165b84c722e23d45df4162c98e521312b7736daa88eca70e92f181d2058ad686ed0e4bdcaf95de079d1c04cbd0ed125dd341223
+	source = http://hisham.hm/htop/releases/2.0.0/htop-2.0.0.tar.gz
+	source = htop-2.0.0-solarized.patch
+	sha512sums = 2df1b96e4c07a1de360dc7b7b20db0e663d7fa2c9a8a9dcc3d7dc1ce5e5b59f72d927e8e7ae919631cf0e950a82450b45116a1f8d788f63c5762bd73332ec32c
+	sha512sums = d221942ea7843e802cfbbe01f24805944d831148eefc6a7a0bab38e883970bd6598a2e76ff45286566d732df0b193ef33451956d210bd4f44752336cadc79c57
 
 pkgname = htop-solarized
 
diff --git a/PKGBUILD b/PKGBUILD
index 045af42d3bc7..80985fce8ee8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 _pkgname=htop
 pkgname=$_pkgname-solarized
-pkgver=1.0.3
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="Interactive process viewer with solarized patch"
 arch=('i686' 'x86_64')
 url="http://htop.sourceforge.net/"
@@ -20,9 +20,9 @@ provides=('htop')
 conflicts=('htop')
 options=('!emptydirs')
 source=("http://hisham.hm/$_pkgname/releases/$pkgver/$_pkgname-$pkgver.tar.gz"
-        'htop-1.0.3-solarized.patch')
-sha512sums=('4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232'
-            '1e1eed2ca1f1d7908f125dd04165b84c722e23d45df4162c98e521312b7736daa88eca70e92f181d2058ad686ed0e4bdcaf95de079d1c04cbd0ed125dd341223')
+        "htop-$pkgver-solarized.patch")
+sha512sums=('2df1b96e4c07a1de360dc7b7b20db0e663d7fa2c9a8a9dcc3d7dc1ce5e5b59f72d927e8e7ae919631cf0e950a82450b45116a1f8d788f63c5762bd73332ec32c'
+            'd221942ea7843e802cfbbe01f24805944d831148eefc6a7a0bab38e883970bd6598a2e76ff45286566d732df0b193ef33451956d210bd4f44752336cadc79c57')
 
 prepare() {
   cd "$_pkgname-$pkgver"
@@ -31,7 +31,7 @@ prepare() {
   sed -i 's|python|python2|' scripts/MakeHeader.py
 
   # Solarized patch: https://gist.github.com/ooesili/11292686
-  patch -p1 -N -i ../htop-1.0.3-solarized.patch
+  patch -p1 -N -i "../htop-$pkgver-solarized.patch"
 }
 
 build() {
diff --git a/htop-1.0.3-solarized.patch b/htop-1.0.3-solarized.patch
deleted file mode 100644
index 3052b015101d..000000000000
--- a/htop-1.0.3-solarized.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/CRT.c b/CRT.c
-index c0d1b82..f8d5f70 100644
---- a/CRT.c
-+++ b/CRT.c
-@@ -587,7 +587,7 @@ void CRT_setColors(int colorScheme) {
-       CRT_colors[LED_COLOR] = ColorPair(Green,Black);
-       CRT_colors[TASKS_RUNNING] = A_BOLD | ColorPair(Green,Black);
-       CRT_colors[PROCESS] = A_NORMAL;
--      CRT_colors[PROCESS_SHADOW] = A_BOLD | ColorPair(Black,Black);
-+      CRT_colors[PROCESS_SHADOW] = A_BOLD | ColorPair(Green,Black);
-       CRT_colors[PROCESS_TAG] = A_BOLD | ColorPair(Yellow,Black);
-       CRT_colors[PROCESS_MEGABYTES] = ColorPair(Cyan,Black);
-       CRT_colors[PROCESS_BASENAME] = A_BOLD | ColorPair(Cyan,Black);
-@@ -598,7 +598,7 @@ void CRT_setColors(int colorScheme) {
-       CRT_colors[PROCESS_THREAD] = ColorPair(Green,Black);
-       CRT_colors[PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Green,Black);
-       CRT_colors[BAR_BORDER] = A_BOLD;
--      CRT_colors[BAR_SHADOW] = A_BOLD | ColorPair(Black,Black);
-+      CRT_colors[BAR_SHADOW] = A_BOLD | ColorPair(Green,Black);
-       CRT_colors[SWAP] = ColorPair(Red,Black);
-       CRT_colors[GRAPH_1] = A_BOLD | ColorPair(Red,Black);
-       CRT_colors[GRAPH_2] = ColorPair(Red,Black);
-@@ -608,12 +608,12 @@ void CRT_setColors(int colorScheme) {
-       CRT_colors[GRAPH_6] = ColorPair(Cyan,Black);
-       CRT_colors[GRAPH_7] = A_BOLD | ColorPair(Blue,Black);
-       CRT_colors[GRAPH_8] = ColorPair(Blue,Black);
--      CRT_colors[GRAPH_9] = A_BOLD | ColorPair(Black,Black);
-+      CRT_colors[GRAPH_9] = A_BOLD | ColorPair(Green,Black);
-       CRT_colors[MEMORY_USED] = ColorPair(Green,Black);
-       CRT_colors[MEMORY_BUFFERS] = ColorPair(Blue,Black);
-       CRT_colors[MEMORY_BUFFERS_TEXT] = A_BOLD | ColorPair(Blue,Black);
-       CRT_colors[MEMORY_CACHE] = ColorPair(Yellow,Black);
--      CRT_colors[LOAD_AVERAGE_FIFTEEN] = A_BOLD | ColorPair(Black,Black);
-+      CRT_colors[LOAD_AVERAGE_FIFTEEN] = A_BOLD | ColorPair(Green,Black);
-       CRT_colors[LOAD_AVERAGE_FIVE] = A_NORMAL;
-       CRT_colors[LOAD_AVERAGE_ONE] = A_BOLD;
-       CRT_colors[LOAD] = A_BOLD;
-@@ -627,7 +627,7 @@ void CRT_setColors(int colorScheme) {
-       CRT_colors[CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue,Black);
-       CRT_colors[CPU_NORMAL] = ColorPair(Green,Black);
-       CRT_colors[CPU_KERNEL] = ColorPair(Red,Black);
--      CRT_colors[CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black);
-+      CRT_colors[CPU_IOWAIT] = A_BOLD | ColorPair(Green,Black);
-       CRT_colors[CPU_IRQ] = ColorPair(Yellow,Black);
-       CRT_colors[CPU_SOFTIRQ] = ColorPair(Magenta,Black);
-       CRT_colors[CPU_STEAL] = ColorPair(Cyan,Black);
diff --git a/htop-2.0.0-solarized.patch b/htop-2.0.0-solarized.patch
new file mode 100644
index 000000000000..4866b357cd79
--- /dev/null
+++ b/htop-2.0.0-solarized.patch
@@ -0,0 +1,40 @@
+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] = {
+       [LED_COLOR] = ColorPair(Green,Black),
+       [TASKS_RUNNING] = A_BOLD | ColorPair(Green,Black),
+       [PROCESS] = A_NORMAL,
+-      [PROCESS_SHADOW] = A_BOLD | ColorPair(Black,Black),
++      [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),
+@@ -193,7 +193,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,
+-      [BAR_SHADOW] = A_BOLD | ColorPair(Black,Black),
++      [BAR_SHADOW] = A_BOLD | ColorPair(Green,Black),
+       [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] = {
+       [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),
+       [LOAD] = A_BOLD,
+@@ -215,7 +215,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_IRQ] = ColorPair(Yellow,Black),
+       [CPU_SOFTIRQ] = ColorPair(Magenta,Black),
+       [CPU_STEAL] = ColorPair(Cyan,Black),