Verbump to 3.2.2, with minor updates to the patch.

Also touched up the PKGBUILD to remove small differences.

3 files changed, 24 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2eeb87baec8..1b83bf1eda57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = htop-solarized
 	pkgdesc = Interactive process viewer with solarized patch
-	pkgver = 3.2.1
+	pkgver = 3.2.2
 	pkgrel = 1
 	url = https://htop.dev/
 	arch = i686
@@ -20,11 +20,11 @@ pkgbase = htop-solarized
 	provides = htop
 	conflicts = htop
 	options = !emptydirs
-	source = git+https://github.com/htop-dev/htop.git#tag=f3be499104b3a394505ac00d026c0013cfd33676?signed
+	source = git+https://github.com/htop-dev/htop.git#tag=4dbd0b5c87f4225495d6e0591a1d7227f120ead1?signed
 	source = htop-solarized.patch
 	validpgpkeys = F7ABE8761E6FE68638E6283AFE0842EE36DD8C0C
 	validpgpkeys = 0D316B6ABE022C7798D0324BF1D35CB9E8E12EAD
 	sha256sums = SKIP
-	sha256sums = a89800696603ad3ccdfc9a51345f6b24d7de651e1e8691dc16671e951b4cc3e5
+	sha256sums = 2b8e0b3949abd5b45c862963bde55504cd55845e734ff24fb8a310ca091c40f5
 
 pkgname = htop-solarized
diff --git a/PKGBUILD b/PKGBUILD
index 57b67a935073..7aabbd603832 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 
 _pkgname=htop
 pkgname=$_pkgname-solarized
-_tag='f3be499104b3a394505ac00d026c0013cfd33676' # git rev-parse ${pkgver}
-pkgver=3.2.1
+_tag='4dbd0b5c87f4225495d6e0591a1d7227f120ead1' # git rev-parse ${pkgver}
+pkgver=3.2.2
 pkgrel=1
 pkgdesc='Interactive process viewer with solarized patch'
 arch=('i686' 'x86_64' 'armv7h')
@@ -23,12 +23,12 @@ optdepends=('lm_sensors: show cpu temperatures'
 provides=('htop')
 conflicts=('htop')
 options=('!emptydirs')
-validpgpkeys=('F7ABE8761E6FE68638E6283AFE0842EE36DD8C0C' # Nathan Scott <nathans@debian.org>
+validpgpkeys=('F7ABE8761E6FE68638E6283AFE0842EE36DD8C0C'  # Nathan Scott <nathans@debian.org>
               '0D316B6ABE022C7798D0324BF1D35CB9E8E12EAD') # Benny Baumann <BenBE@geshi.org>
 source=("git+https://github.com/htop-dev/htop.git#tag=${_tag}?signed"
         'htop-solarized.patch')
 sha256sums=('SKIP'
-            'a89800696603ad3ccdfc9a51345f6b24d7de651e1e8691dc16671e951b4cc3e5')
+            '2b8e0b3949abd5b45c862963bde55504cd55845e734ff24fb8a310ca091c40f5')
 
 prepare() {
   cd "${_pkgname}"
diff --git a/htop-solarized.patch b/htop-solarized.patch
index 433a743272bd..fb40735c4cd8 100644
--- a/htop-solarized.patch
+++ b/htop-solarized.patch
@@ -1,66 +1,66 @@
 diff --git a/CRT.c b/CRT.c
-index 2533f613..c549a0e4 100644
+index 64c259fc..14318b32 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -120,7 +120,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -129,7 +129,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [UPTIME] = A_BOLD | ColorPair(Cyan, Black),
        [BATTERY] = A_BOLD | ColorPair(Cyan, Black),
        [LARGE_NUMBER] = A_BOLD | ColorPair(Red, Black),
 -      [METER_SHADOW] = A_BOLD | ColorPairGrayBlack,
-+      [METER_SHADOW] = A_BOLD | ColorPair(Green,Black), // Solarized
++      [METER_SHADOW] = A_BOLD | ColorPair(Green, Black), // Solarized
        [METER_TEXT] = ColorPair(Cyan, Black),
        [METER_VALUE] = A_BOLD | ColorPair(Cyan, Black),
        [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red, Black),
-@@ -132,7 +132,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -141,7 +141,7 @@ static 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), // Solarized
++      [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),
-@@ -149,7 +149,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -158,7 +158,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [PROCESS_COMM] = ColorPair(Magenta, Black),
-       [PROCESS_THREAD_COMM] = ColorPair(Blue, Black),
+       [PROCESS_THREAD_COMM] = A_BOLD | ColorPair(Blue, Black),
        [BAR_BORDER] = A_BOLD,
 -      [BAR_SHADOW] = A_BOLD | ColorPairGrayBlack,
-+      [BAR_SHADOW] = A_BOLD | ColorPair(Green,Black), // Solarized
++      [BAR_SHADOW] = A_BOLD | ColorPair(Green, Black), // Solarized
        [SWAP] = ColorPair(Red, Black),
        [SWAP_CACHE] = ColorPair(Yellow, Black),
        [GRAPH_1] = A_BOLD | ColorPair(Cyan, Black),
-@@ -163,12 +163,12 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -172,12 +172,12 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [HUGEPAGE_2] = ColorPair(Yellow, Black),
        [HUGEPAGE_3] = ColorPair(Red, Black),
-       [HUGEPAGE_4] = ColorPair(Blue, Black),
+       [HUGEPAGE_4] = A_BOLD | ColorPair(Blue, Black),
 -      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Cyan, Black),
-+      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Green,Black), // Solarized
++      [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,
        [HELP_BOLD] = A_BOLD | ColorPair(Cyan, Black),
 -      [HELP_SHADOW] = A_BOLD | ColorPairGrayBlack,
-+      [HELP_SHADOW] = A_BOLD | ColorPair(Green,Black), // Solarized
++      [HELP_SHADOW] = A_BOLD | ColorPair(Green, Black), // Solarized
        [CLOCK] = A_BOLD,
        [DATE] = A_BOLD,
        [DATETIME] = A_BOLD,
-@@ -180,7 +180,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -189,7 +189,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),
 -      [CPU_IOWAIT] = A_BOLD | ColorPairGrayBlack,
-+      [CPU_IOWAIT] = A_BOLD | ColorPair(Green,Black), // Solarized
++      [CPU_IOWAIT] = A_BOLD | ColorPair(Green, Black), // Solarized
        [CPU_IRQ] = ColorPair(Yellow, Black),
        [CPU_SOFTIRQ] = ColorPair(Magenta, Black),
        [CPU_STEAL] = ColorPair(Cyan, Black),
-@@ -196,8 +196,8 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -743,8 +743,8 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [ZFS_COMPRESSED] = ColorPair(Blue, Black),
        [ZFS_RATIO] = ColorPair(Magenta, Black),
        [ZRAM] = ColorPair(Yellow, Black),
 -      [DYNAMIC_GRAY] = ColorPairGrayBlack,
 -      [DYNAMIC_DARKGRAY] = A_BOLD | ColorPairGrayBlack,
-+      [DYNAMIC_GRAY] = ColorPair(Green,Black), // Solarized
-+      [DYNAMIC_DARKGRAY] = A_BOLD | ColorPair(Green,Black), // Solarized
++      [DYNAMIC_GRAY] = ColorPair(Green, Black), // Solarized
++      [DYNAMIC_DARKGRAY] = A_BOLD | ColorPair(Green, Black), // Solarized
        [DYNAMIC_RED] = ColorPair(Red, Black),
        [DYNAMIC_GREEN] = ColorPair(Green, Black),
        [DYNAMIC_BLUE] = ColorPair(Blue, Black),