Updated to htop 2.2.0

3 files changed, 18 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b29767351612..016bfe4279eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,8 @@
-# Generated by mksrcinfo v8
-# Mon Aug 29 17:57:34 UTC 2016
 pkgbase = htop-solarized
 	pkgdesc = Interactive process viewer with solarized patch
-	pkgver = 2.0.2
+	pkgver = 2.2.0
 	pkgrel = 1
-	url = http://htop.sourceforge.net/
+	url = http://hisham.hm/htop/
 	arch = i686
 	arch = x86_64
 	arch = armv7h
@@ -16,10 +14,10 @@ pkgbase = htop-solarized
 	provides = htop
 	conflicts = htop
 	options = !emptydirs
-	source = http://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz
-	source = htop-2.0.1-solarized.patch
-	sha512sums = 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
-	sha512sums = d221942ea7843e802cfbbe01f24805944d831148eefc6a7a0bab38e883970bd6598a2e76ff45286566d732df0b193ef33451956d210bd4f44752336cadc79c57
+	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
 
 pkgname = htop-solarized
 
diff --git a/PKGBUILD b/PKGBUILD
index f9949cb3e608..b877c3ef863d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Boohbah <boohbah at gmail.com>
+# Maintainer: 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>
 # Contributor: Wesley Merkel <ooesili at gmail.com>
@@ -6,11 +7,11 @@
 
 _pkgname=htop
 pkgname=$_pkgname-solarized
-pkgver=2.0.2
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Interactive process viewer with solarized patch"
 arch=('i686' 'x86_64' 'armv7h')
-url="http://htop.sourceforge.net/"
+url="http://hisham.hm/htop/"
 license=('GPL')
 depends=('ncurses')
 makedepends=('python2')
@@ -20,18 +21,18 @@ provides=('htop')
 conflicts=('htop')
 options=('!emptydirs')
 source=("http://hisham.hm/$_pkgname/releases/$pkgver/$_pkgname-$pkgver.tar.gz"
-        'htop-2.0.1-solarized.patch')
-sha512sums=('1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda'
-            'd221942ea7843e802cfbbe01f24805944d831148eefc6a7a0bab38e883970bd6598a2e76ff45286566d732df0b193ef33451956d210bd4f44752336cadc79c57')
+        'htop-2.2.0-solarized.patch')
+sha512sums=('ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e'
+            '5fa6d5627d3157bedb0b5d22b2d9c932af02bcf61bfed3f6f335f47eabef29d58820570c70f8babbd76ca0b938fda567cd51c6d8ec1c50f87b6d43d8b57c22dd')
 
 prepare() {
   cd "$_pkgname-$pkgver"
 
-  sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure
-  sed -i 's|python|python2|' scripts/MakeHeader.py
+  #sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure
+  #sed -i 's|python|python2|' scripts/MakeHeader.py
 
   # Solarized patch: https://gist.github.com/ooesili/11292686
-  patch -p1 -N -i "$srcdir/htop-2.0.1-solarized.patch"
+  patch -p1 -N -i "$srcdir/htop-2.2.0-solarized.patch"
 }
 
 build() {
diff --git a/htop-2.0.1-solarized.patch b/htop-2.2.0-solarized.patch
index 4866b357cd79..0b031e3a961f 100644
--- a/htop-2.0.1-solarized.patch
+++ b/htop-2.2.0-solarized.patch
@@ -6,7 +6,7 @@ index 2ab20c2..74a1d78 100644
        [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 | ColorPairGrayBlack,
 +      [PROCESS_SHADOW] = A_BOLD | ColorPair(Green,Black),
        [PROCESS_TAG] = A_BOLD | ColorPair(Yellow,Black),
        [PROCESS_MEGABYTES] = ColorPair(Cyan,Black),
@@ -15,7 +15,7 @@ index 2ab20c2..74a1d78 100644
        [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 | ColorPairGrayBlack,
 +      [BAR_SHADOW] = A_BOLD | ColorPair(Green,Black),
        [SWAP] = ColorPair(Red,Black),
        [GRAPH_1] = A_BOLD | ColorPair(Cyan,Black),