From 391d338215b4832dd03da10e7e658d6c964e4994 Mon Sep 17 00:00:00 2001
From: kth5 <alex.bldck@gmail.com>
Date: Wed, 19 Jun 2024 13:36:23 +0200
Subject: [PATCH] * update htop to 3.3.0-3

---
 htop/PKGBUILD | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/htop/PKGBUILD b/htop/PKGBUILD
index 82491d652e..2bcb51b96b 100644
--- a/htop/PKGBUILD
+++ b/htop/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=htop
 pkgver=3.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Interactive process viewer'
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url='https://htop.dev/'
@@ -23,9 +23,35 @@ validpgpkeys=('F7ABE8761E6FE68638E6283AFE0842EE36DD8C0C'  # Nathan Scott <nathan
 source=("git+https://github.com/htop-dev/htop.git#tag=${pkgver}")
 sha256sums=('a894206ecef4b690b97813d7b1626c98bacc9c82129b372d84680da8f6225761')
 
+_backports=(
+  # Fix the display of number of running tasks
+  'b6b9384678fa111d47a8d3074c31490863619d12'
+  # Undo too-aggressive code collapsing from tree mode refactoring
+  '5d778eaacc78c69d5597b57afb4f98062d8856ef'
+  # Clicking on column headers needs to also update the sort direction arrow
+  '91990b1a34927a4136a85e4ff9adcdbfa500286a'
+  # Disable basename matching for kernel threads
+  '71b099a8df9e8c2bf4361a9a93bebc409f513460'
+)
+
+_reverts=(
+)
+
 prepare() {
   cd "${pkgname}"
 
+  local _c _l
+  for _c in "${_backports[@]}"; do
+    if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi
+    git log --oneline "${_l}" "${_c}"
+    git cherry-pick --mainline 1 --no-commit "${_c}"
+  done
+  for _c in "${_reverts[@]}"; do
+    if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi
+    git log --oneline "${_l}" "${_c}"
+    git revert --mainline 1 --no-commit "${_c}"
+  done
+
   autoreconf -fi
 }