Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
procps-ng
Commits:
68aa7dc5 by Christian Hesse at 2026-06-15T10:16:56+02:00
support easy cherry-picking and reverting
- - - - -
c1c1c426 by Christian Hesse at 2026-06-15T10:21:12+02:00
upgpkg: 4.0.6-2: apply upstream fixes for watch
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = procps-ng
pkgdesc = Utilities for monitoring your system and its processes
pkgver = 4.0.6
- pkgrel = 1
+ pkgrel = 2
url = https://gitlab.com/procps-ng/procps
arch = x86_64
license = GPL
=====================================
PKGBUILD
=====================================
@@ -6,7 +6,7 @@
pkgname=procps-ng
pkgver=4.0.6
-pkgrel=1
+pkgrel=2
pkgdesc='Utilities for monitoring your system and its processes'
url='https://gitlab.com/procps-ng/procps'
license=(GPL LGPL)
@@ -22,9 +22,31 @@
source=("git+https://gitlab.com/procps-ng/procps.git?signed#tag=v${pkgver}";)
sha256sums=('160aa30e2a133f44e7cc6e90c16cc018360a786f043aef84614ce595062fc894')
b2sums=('fe36c3c3c38882e09c47f7865015c5f8fc82e7432cb427ca21ad3712a112025daeba395b118ba81245727443407fb6666cf4ffea1f2ce1f605a8c5bbe8508db2')
+_backports=(
+ # watch: Don't remove 2 lines with -t option
+ 'd089943ab4e1ce1f5e3d44847416a89ceab75147'
+ # watch: Handle resizing better
+ '389ded19680a7a792c943d5552dd8803851778be'
+)
+
+_reverts=(
+)
+
prepare() {
cd procps
+ 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
+
./autogen.sh
}
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/procps-ng/-/compare/94eb0edfba37fd0f97a740a2a36e03877d1f8bd0...c1c1c42695215047ffd622855f6592554b7e2e45
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/procps-ng/-/compare/94eb0edfba37fd0f97a740a2a36e03877d1f8bd0...c1c1c42695215047ffd622855f6592554b7e2e45
You're receiving this email because of your account on gitlab.archlinux.org.
Manage all notifications: https://gitlab.archlinux.org/-/profile/notifications
| Help: https://gitlab.archlinux.org/help
