Updated to htop 3.1.0.

The upstream arch PKGBUILD changed to using the git repo for the sources, so
this PKGBUILD was brought in line with it.

3 files changed, 31 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c1b1a501ef7..0d959c53a0e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,29 @@
 pkgbase = htop-solarized
 	pkgdesc = Interactive process viewer with solarized patch
-	pkgver = 3.0.3
+	pkgver = 3.1.0
 	pkgrel = 1
 	url = https://htop.dev/
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	license = GPL
+	makedepends = git
 	makedepends = lm_sensors
+	depends = libcap
+	depends = libcap.so
+	depends = libnl
 	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.3/htop-3.0.3.tar.gz
+	source = git+https://github.com/htop-dev/htop.git#tag=a8637afe0398f0be0131f73563b55ef9315ca351?signed
 	source = htop-solarized.patch
-	sha256sums = 725103929c925a7252b4dedeb29b3a1da86a2f74e96c50eb9ea6c8fec1942cd2
-	sha256sums = 9d2c3b48fa62023eedea61ccb96ff6b8ed90294c5dea2635056756c8ffabaeb9
+	validpgpkeys = F7ABE8761E6FE68638E6283AFE0842EE36DD8C0C
+	sha256sums = SKIP
+	sha256sums = 7c7526c4564eed5e725610f8024cc547468d208fb424a81b827fef844d5b638d
 
 pkgname = htop-solarized
-
diff --git a/PKGBUILD b/PKGBUILD
index 76a9a1c84c88..dbc4ea1b01c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,27 +8,29 @@
 
 _pkgname=htop
 pkgname=$_pkgname-solarized
-pkgver=3.0.3
+_tag='a8637afe0398f0be0131f73563b55ef9315ca351' # git rev-parse ${pkgver}
+pkgver=3.1.0
 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')
-makedepends=('lm_sensors')
+depends=('libcap' 'libcap.so' 'libnl' 'ncurses' 'libncursesw.so')
+makedepends=('git' '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"
+validpgpkeys=('F7ABE8761E6FE68638E6283AFE0842EE36DD8C0C') # Nathan Scott <nathans@debian.org>
+source=("git+https://github.com/htop-dev/htop.git#tag=${_tag}?signed"
         'htop-solarized.patch')
-sha256sums=('725103929c925a7252b4dedeb29b3a1da86a2f74e96c50eb9ea6c8fec1942cd2'
-            '9d2c3b48fa62023eedea61ccb96ff6b8ed90294c5dea2635056756c8ffabaeb9')
+sha256sums=('SKIP'
+            '7c7526c4564eed5e725610f8024cc547468d208fb424a81b827fef844d5b638d')
 
 prepare() {
-  cd "$_pkgname-$pkgver"
+  cd "${_pkgname}"
 
   autoreconf -fi
 
@@ -37,7 +39,7 @@ prepare() {
 }
 
 build() {
-  cd "$_pkgname-$pkgver"
+  cd "${_pkgname}"
 
   ./configure \
       --prefix=/usr \
@@ -52,7 +54,9 @@ build() {
 }
 
 package() {
-  make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install
+  cd "${_pkgname}"
+
+  make DESTDIR="${pkgdir}" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/htop-solarized.patch b/htop-solarized.patch
index fc74e413854c..65c397a11b78 100644
--- a/htop-solarized.patch
+++ b/htop-solarized.patch
@@ -1,8 +1,8 @@
 diff --git a/CRT.c b/CRT.c
-index 68f6405..95c230a 100644
+index 2533f613..c549a0e4 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -119,7 +119,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -132,7 +132,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [LED_COLOR] = ColorPair(Green, Black),
        [TASKS_RUNNING] = A_BOLD | ColorPair(Green, Black),
        [PROCESS] = A_NORMAL,
@@ -11,25 +11,25 @@ index 68f6405..95c230a 100644
        [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] = {
+@@ -149,7 +149,7 @@ static 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), // Solarized
        [SWAP] = ColorPair(Red, Black),
+       [SWAP_CACHE] = ColorPair(Yellow, 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),
+@@ -163,7 +163,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+       [HUGEPAGE_2] = ColorPair(Yellow, Black),
+       [HUGEPAGE_3] = ColorPair(Red, Black),
+       [HUGEPAGE_4] = ColorPair(Blue, 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,
-@@ -160,7 +160,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -180,7 +180,7 @@ static 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),