From 46c6667308c7b0d5d01bb32d3c64d2d714352479 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Fri, 12 Jan 2024 11:27:43 +0100 Subject: Apply upstream b6b9384 as 001_fix_number_of_running_tasks.patch, Release 3.3.0-2 --- debian/changelog | 6 +++++ .../patches/001_fix_number_of_running_tasks.patch | 26 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) create mode 100644 debian/patches/001_fix_number_of_running_tasks.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 6a18a69..60815a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +htop (3.3.0-2) unstable; urgency=medium + + * Apply upstream fix for number of running tasks show as zero + + -- Daniel Lange Fri, 12 Jan 2024 11:26:00 +0100 + htop (3.3.0-1) unstable; urgency=medium * Import upstream 3.3.0 release 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 +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/series b/debian/patches/series new file mode 100644 index 0000000..811a4a4 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +001_fix_number_of_running_tasks.patch -- cgit v1.2.3