libkookie: update htop patch

infra/libkookie/overlays/patches/htop/0001-htop-untruncated-username.patch

@@ -1,25 +1,24 @@
 From: Alyssa Ross <hi@alyssa.is>
-Subject: [PATCH htop v3] Make "spacekookie" fit untruncated as a user name
-Date: Fri, 26 Feb 2021 16:14:13 +0000
+Subject: [PATCH htop v4] Make "spacekookie" fit untruncated as a user name
+Date: Wed, 27 Oct 2021 15:01:47 +0200
 
----
-Fixed for latest htop (3.0.5).
+Fixed for latest htop (3.1.0)
 
+---
  Process.c                          | 2 +-
  darwin/DarwinProcess.c             | 2 +-
  dragonflybsd/DragonFlyBSDProcess.c | 2 +-
  freebsd/FreeBSDProcess.c           | 2 +-
  linux/LinuxProcess.c               | 2 +-
- openbsd/OpenBSDProcess.c           | 2 +-
  solaris/SolarisProcess.c           | 2 +-
  unsupported/UnsupportedProcess.c   | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
+ 7 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/Process.c b/Process.c
-index a78fd23..1336897 100644
+index 556acf4..7cd712c 100644
 --- a/Process.c
 +++ b/Process.c
-@@ -370,7 +370,7 @@ void Process_writeField(const Process* this, RichString* str, ProcessField field
+@@ -902,7 +902,7 @@ void Process_writeField(const Process* this, RichString* str, ProcessField field
           attr = CRT_colors[PROCESS_SHADOW];
  
        if (this->user) {
@@ -29,96 +28,83 @@ index a78fd23..1336897 100644
        }
  
 diff --git a/darwin/DarwinProcess.c b/darwin/DarwinProcess.c
-index bedfefe..0db854e 100644
+index 20e91f7..c75d5bd 100644
 --- a/darwin/DarwinProcess.c
 +++ b/darwin/DarwinProcess.c
-@@ -40,7 +40,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
-    [ST_UID] = { .name = "ST_UID", .title = "  UID ", .description = "User ID of the process owner", .flags = 0, },
-    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
-    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+@@ -41,7 +41,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
 -   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
 +   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
-    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
     [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
     [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
 diff --git a/dragonflybsd/DragonFlyBSDProcess.c b/dragonflybsd/DragonFlyBSDProcess.c
-index 15b1a69..b176d5b 100644
+index 13cef0a..9bf5a97 100644
 --- a/dragonflybsd/DragonFlyBSDProcess.c
 +++ b/dragonflybsd/DragonFlyBSDProcess.c
-@@ -40,7 +40,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
-    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
-    [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, },
-    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+@@ -41,7 +41,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
 -   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
 +   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
-    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
     [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
     [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
 diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c
-index 28d482e..726afcd 100644
+index 9f0386b..f58327e 100644
 --- a/freebsd/FreeBSDProcess.c
 +++ b/freebsd/FreeBSDProcess.c
-@@ -41,7 +41,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
-    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
-    [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, },
-    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+@@ -40,7 +40,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
 -   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
 +   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
-    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
-    [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
+    [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, .defaultSortDesc = true, },
     [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
 diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
-index ce6d34d..3bb1143 100644
+index 75638e4..5724c9d 100644
 --- a/linux/LinuxProcess.c
 +++ b/linux/LinuxProcess.c
-@@ -63,7 +63,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
-    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
-    [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, },
-    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+@@ -60,7 +60,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
 -   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
 +   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
-    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
-    [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
+    [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, .defaultSortDesc = true, },
     [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
-diff --git a/openbsd/OpenBSDProcess.c b/openbsd/OpenBSDProcess.c
-index 00aea63..ae66bd5 100644
---- a/openbsd/OpenBSDProcess.c
-+++ b/openbsd/OpenBSDProcess.c
-@@ -150,7 +150,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
-    },
-    [USER] = {
-       .name = "USER",
--      .title = "USER      ",
-+      .title = "USER        ",
-       .description = "Username of the process owner (or user ID if name cannot be determined)",
-       .flags = 0,
-    },
 diff --git a/solaris/SolarisProcess.c b/solaris/SolarisProcess.c
-index d905f7a..d608c2d 100644
+index 57071ab..51000c2 100644
 --- a/solaris/SolarisProcess.c
 +++ b/solaris/SolarisProcess.c
-@@ -40,7 +40,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
-    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
-    [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, },
-    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+@@ -43,7 +43,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
 -   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
 +   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
-    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
     [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
     [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
 diff --git a/unsupported/UnsupportedProcess.c b/unsupported/UnsupportedProcess.c
-index eb52910..5ba591b 100644
+index 1b9159b..33d9898 100644
 --- a/unsupported/UnsupportedProcess.c
 +++ b/unsupported/UnsupportedProcess.c
-@@ -31,7 +31,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
-    [ST_UID] = { .name = "ST_UID", .title = "  UID ", .description = "User ID of the process owner", .flags = 0, },
-    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
-    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
+@@ -38,7 +38,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, },
+    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
 -   [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
 +   [USER] = { .name = "USER", .title = "USER        ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
-    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
+    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
     [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
     [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
 -- 
-2.30.0
+2.32.0