[arch-commits] Commit in htop/repos (3 files)

[Christian Hesse]

    Date: Tuesday, January 21, 2020 @ 20:13:20
  Author: eworm
Revision: 373770

archrelease: copy trunk to testing-x86_64

Added:
  htop/repos/testing-x86_64/
  htop/repos/testing-x86_64/0001-fix-option-string.patch
    (from rev 373769, htop/trunk/0001-fix-option-string.patch)
  htop/repos/testing-x86_64/PKGBUILD
    (from rev 373769, htop/trunk/PKGBUILD)

------------------------------+
 0001-fix-option-string.patch |   25 +++++++++++++++++++++
 PKGBUILD                     |   48 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

Copied: htop/repos/testing-x86_64/0001-fix-option-string.patch (from rev 373769, htop/trunk/0001-fix-option-string.patch)
===================================================================
--- testing-x86_64/0001-fix-option-string.patch	                        (rev 0)
+++ testing-x86_64/0001-fix-option-string.patch	2020-01-21 20:13:20 UTC (rev 373770)
@@ -0,0 +1,25 @@
+From 731acc8bced18c90fbe0e18381c32f007f71e0d9 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Tue, 10 Apr 2018 16:21:46 +0200
+Subject: [PATCH 1/1] fix option string
+
+This broke with commit db05ba61065f64b59d0014518be0786b5439e54c.
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ htop.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/htop.c b/htop.c
+index 6db81dd..678a3b8 100644
+--- a/htop.c
++++ b/htop.c
+@@ -93,7 +93,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
+ 
+    int opt, opti=0;
+    /* Parse arguments */
+-   while ((opt = getopt_long(argc, argv, "hvCst::d:u:p:i", long_opts, &opti))) {
++   while ((opt = getopt_long(argc, argv, "hvCs:td:u:p:i", long_opts, &opti))) {
+       if (opt == EOF) break;
+       switch (opt) {
+          case 'h':

Copied: htop/repos/testing-x86_64/PKGBUILD (from rev 373769, htop/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2020-01-21 20:13:20 UTC (rev 373770)
@@ -0,0 +1,48 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=htop
+pkgver=2.2.0
+pkgrel=3
+pkgdesc='Interactive process viewer'
+arch=('x86_64')
+url='https://hisham.hm/htop/'
+license=('GPL')
+depends=('ncurses' 'libnl')
+makedepends=('python')
+optdepends=('lsof: show files opened by a process'
+            'strace: attach to a running process')
+options=('!emptydirs' debug)
+validpgpkeys=('8460980B2B79786DE0C7FCC83FD8F43C2BB3C478') # Hisham Muhammad <h at hisham.hm>
+source=("https://hisham.hm/$pkgname/releases/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc}
+        '0001-fix-option-string.patch')
+sha256sums=('d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57'
+            'SKIP'
+            'e0ea3a91dfbc7f8c516a19e0d8890314845e768ea4132dfaa49c4d4e89ec10ca')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 < "${srcdir}"/0001-fix-option-string.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+      --prefix=/usr \
+      --sysconfdir=/etc \
+      --enable-cgroup \
+      --enable-delayacct \
+      --enable-openvz \
+      --enable-unicode \
+      --enable-vserver
+
+  make
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}