Adding debian version 3.3.0-4.debian/3.3.0-4debian

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 116 insertions, 0 deletions

diff --git a/debian/patches/001_fix_number_of_running_tasks.patch b/debian/patches/001_fix_number_of_running_tasks.patch
new file mode 100644
index 0000000..1d59b26
--- /dev/null
+++ b/debian/patches/001_fix_number_of_running_tasks.patch
@@ -0,0 +1,26 @@
+From b6b9384678fa111d47a8d3074c31490863619d12 Mon Sep 17 00:00:00 2001
+From: Benny Baumann <BenBE@geshi.org>
+Date: Thu, 11 Jan 2024 21:09:43 +0100
+Subject: [PATCH] Fix the display of number of running tasks
+
+This was broken by a logic change in 72235d8e.
+
+Fixes: #1369
+---
+ linux/LinuxMachine.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/linux/LinuxMachine.c b/linux/LinuxMachine.c
+index ae2930d40..50d181e16 100644
+--- a/linux/LinuxMachine.c
++++ b/linux/LinuxMachine.c
+@@ -489,8 +489,7 @@ static void LinuxMachine_scanCPUTime(LinuxMachine* this) {
+    char buffer[PROC_LINE_LENGTH + 1];
+    while (fgets(buffer, sizeof(buffer), file)) {
+       if (String_startsWith(buffer, "procs_running")) {
+-         ProcessTable* pt = (ProcessTable*) super->processTable;
+-         pt->runningTasks = strtoul(buffer + strlen("procs_running"), NULL, 10);
++         this->runningTasks = strtoul(buffer + strlen("procs_running"), NULL, 10);
+          break;
+       }
+    }
diff --git a/debian/patches/002_fix_tree_mode_sorting.patch b/debian/patches/002_fix_tree_mode_sorting.patch
new file mode 100644
index 0000000..81391f0
--- /dev/null
+++ b/debian/patches/002_fix_tree_mode_sorting.patch
@@ -0,0 +1,26 @@
+From 5d778eaacc78c69d5597b57afb4f98062d8856ef Mon Sep 17 00:00:00 2001
+From: Nathan Scott <nathans@redhat.com>
+Date: Wed, 17 Jan 2024 14:04:24 +1100
+Subject: [PATCH] Undo too-aggressive code collapsing from tree mode
+ refactoring
+
+---
+ Process.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Process.c b/Process.c
+index a36ab6c77..1497503f0 100644
+--- a/Process.c
++++ b/Process.c
+@@ -902,7 +902,10 @@ int Process_compare(const void* v1, const void* v2) {
+ }
+ 
+ int Process_compareByParent(const Row* r1, const Row* r2) {
+-   int result = Row_compareByParent_Base(r1, r2);
++   int result = SPACESHIP_NUMBER(
++      r1->isRoot ? 0 : Row_getGroupOrParent(r1),
++      r2->isRoot ? 0 : Row_getGroupOrParent(r2)
++   );
+ 
+    if (result != 0)
+       return result;
diff --git a/debian/patches/003_fix_column_header_update.patch b/debian/patches/003_fix_column_header_update.patch
new file mode 100644
index 0000000..7122d04
--- /dev/null
+++ b/debian/patches/003_fix_column_header_update.patch
@@ -0,0 +1,23 @@
+From 91990b1a34927a4136a85e4ff9adcdbfa500286a Mon Sep 17 00:00:00 2001
+From: Daniel Lange <DLange@git.local>
+Date: Wed, 17 Jan 2024 10:18:31 +0100
+Subject: [PATCH] Clicking on column headers needs to also update the sort
+ direction arrow
+
+---
+ MainPanel.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/MainPanel.c b/MainPanel.c
+index 83490236e..47b2f92fe 100644
+--- a/MainPanel.c
++++ b/MainPanel.c
+@@ -92,7 +92,7 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) {
+       } else {
+          reaction |= Action_setSortKey(settings, field);
+       }
+-      reaction |= HTOP_RECALCULATE | HTOP_REDRAW_BAR | HTOP_SAVE_SETTINGS;
++      reaction |= HTOP_RECALCULATE | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR | HTOP_SAVE_SETTINGS;
+       result = HANDLED;
+    } else if (EVENT_IS_SCREEN_TAB_CLICK(ch)) {
+       int x = EVENT_SCREEN_TAB_GET_X(ch);
diff --git a/debian/patches/004_fix_ktread_display.patch b/debian/patches/004_fix_ktread_display.patch
new file mode 100644
index 0000000..8fff974
--- /dev/null
+++ b/debian/patches/004_fix_ktread_display.patch
@@ -0,0 +1,37 @@
+From 71b099a8df9e8c2bf4361a9a93bebc409f513460 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
+Date: Sat, 27 Jan 2024 23:22:31 +0100
+Subject: [PATCH] Disable basename matching for kernel threads
+
+Kernel threads are commonly not based on an executable and their cmdline
+therefore just a human readable string.
+On Linux this string might contain slashes, e.g. kworker/7:5H-ttm, which
+cause Process_writeCommand() to print only the trailing parts if the
+option *Show Program Path* is disabled.
+
+Reported-and-Suggested-By: mmrmaximuzz
+---
+ Process.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Process.c b/Process.c
+index 1497503f0..9179c0eaf 100644
+--- a/Process.c
++++ b/Process.c
+@@ -1038,8 +1038,14 @@ void Process_updateCmdline(Process* this, const char* cmdline, int basenameStart
+ 
+    free(this->cmdline);
+    this->cmdline = cmdline ? xStrdup(cmdline) : NULL;
+-   this->cmdlineBasenameStart = (basenameStart || !cmdline) ? basenameStart : skipPotentialPath(cmdline, basenameEnd);
+-   this->cmdlineBasenameEnd = basenameEnd;
++   if (Process_isKernelThread(this)) {
++      /* kernel threads have no basename */
++      this->cmdlineBasenameStart = 0;
++      this->cmdlineBasenameEnd = 0;
++   } else {
++      this->cmdlineBasenameStart = (basenameStart || !cmdline) ? basenameStart : skipPotentialPath(cmdline, basenameEnd);
++      this->cmdlineBasenameEnd = basenameEnd;
++   }
+ 
+    this->mergedCommand.lastUpdate = 0;
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..80c3f36
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+001_fix_number_of_running_tasks.patch
+002_fix_tree_mode_sorting.patch
+003_fix_column_header_update.patch
+004_fix_ktread_display.patch