Apply upstream patches, Release 3.3.0-3debian/3.3.0-3

* 5d778ea as 002_fix_tree_mode_sorting.patch
* 91990b1 as 003_fix_column_header_update.patch

1 files changed, 26 insertions, 0 deletions

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;