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

[Evangelos Foutras]

    Date: Friday, September 11, 2020 @ 05:00:13
  Author: foutrelis
Revision: 395761

archrelease: copy trunk to extra-x86_64

Added:
  htop/repos/extra-x86_64/0001-Fix-regression-in-u-optional-argument-handling.patch
    (from rev 395760, htop/trunk/0001-Fix-regression-in-u-optional-argument-handling.patch)
  htop/repos/extra-x86_64/PKGBUILD
    (from rev 395760, htop/trunk/PKGBUILD)
Deleted:
  htop/repos/extra-x86_64/PKGBUILD

-----------------------------------------------------------+
 0001-Fix-regression-in-u-optional-argument-handling.patch |   23 +++
 PKGBUILD                                                  |   90 ++++++------
 2 files changed, 70 insertions(+), 43 deletions(-)

Copied: htop/repos/extra-x86_64/0001-Fix-regression-in-u-optional-argument-handling.patch (from rev 395760, htop/trunk/0001-Fix-regression-in-u-optional-argument-handling.patch)
===================================================================
--- 0001-Fix-regression-in-u-optional-argument-handling.patch	                        (rev 0)
+++ 0001-Fix-regression-in-u-optional-argument-handling.patch	2020-09-11 05:00:13 UTC (rev 395761)
@@ -0,0 +1,23 @@
+From 0750ff7e76d845a70749cc00fa25dbe98a7147a1 Mon Sep 17 00:00:00 2001
+From: Nathan Scott <nathans at redhat.com>
+Date: Fri, 4 Sep 2020 09:49:30 +1000
+Subject: [PATCH] Fix regression in -u optional-argument handling
+
+Resolves https://github.com/htop-dev/htop/issues/91
+---
+ htop.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/htop.c b/htop.c
+index bbf3a91..37727d0 100644
+--- a/htop.c
++++ b/htop.c
+@@ -98,7 +98,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
+ 
+    int opt, opti=0;
+    /* Parse arguments */
+-   while ((opt = getopt_long(argc, argv, "hvmCs:td:u:Up:", long_opts, &opti))) {
++   while ((opt = getopt_long(argc, argv, "hvmCs:td:u::Up:", long_opts, &opti))) {
+       if (opt == EOF) break;
+       switch (opt) {
+          case 'h':

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-11 05:00:09 UTC (rev 395760)
+++ PKGBUILD	2020-09-11 05:00:13 UTC (rev 395761)
@@ -1,43 +0,0 @@
-# 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=3.0.1
-pkgrel=1
-pkgdesc='Interactive process viewer'
-arch=('x86_64')
-url='https://htop.dev/'
-license=('GPL')
-depends=('ncurses' 'libncursesw.so' 'libnl')
-optdepends=('lsof: show files opened by a process'
-            'strace: attach to a running process')
-options=('!emptydirs')
-source=("https://github.com/htop-dev/htop/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('8465164bc085f5f1813e1d3f6c4b9b56bf4c95cc12226a5367e65794949b01ca')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  autoreconf -fi
-}
-
-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
-}

Copied: htop/repos/extra-x86_64/PKGBUILD (from rev 395760, htop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-09-11 05:00:13 UTC (rev 395761)
@@ -0,0 +1,47 @@
+# 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=3.0.1
+pkgrel=2
+pkgdesc='Interactive process viewer'
+arch=('x86_64')
+url='https://htop.dev/'
+license=('GPL')
+depends=('ncurses' 'libncursesw.so' 'libnl')
+optdepends=('lsof: show files opened by a process'
+            'strace: attach to a running process')
+options=('!emptydirs')
+source=("https://github.com/htop-dev/htop/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        '0001-Fix-regression-in-u-optional-argument-handling.patch')
+sha256sums=('8465164bc085f5f1813e1d3f6c4b9b56bf4c95cc12226a5367e65794949b01ca'
+            'b06ea0ea03629ecd3b304a26251613de3290f65d89af5d73b5b9274aca8cb7e7')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 -i ../0001-Fix-regression-in-u-optional-argument-handling.patch
+
+  autoreconf -fi
+}
+
+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
+}