[arch-commits] Commit in htop/trunk (0001-fix-option-string.patch PKGBUILD)

[Christian Hesse]

    Date: Wednesday, April 11, 2018 @ 06:15:39
  Author: eworm
Revision: 321521

upgpkg: htop 2.2.0-2

fix option string

Added:
  htop/trunk/0001-fix-option-string.patch
Modified:
  htop/trunk/PKGBUILD

------------------------------+
 0001-fix-option-string.patch |   25 +++++++++++++++++++++++++
 PKGBUILD                     |   14 +++++++++++---
 2 files changed, 36 insertions(+), 3 deletions(-)

Added: 0001-fix-option-string.patch
===================================================================
--- 0001-fix-option-string.patch	                        (rev 0)
+++ 0001-fix-option-string.patch	2018-04-11 06:15:39 UTC (rev 321521)
@@ -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':

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-11 03:21:48 UTC (rev 321520)
+++ PKGBUILD	2018-04-11 06:15:39 UTC (rev 321521)
@@ -6,7 +6,7 @@
 
 pkgname=htop
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive process viewer"
 arch=('x86_64')
 url="http://hisham.hm/htop/"
@@ -17,10 +17,18 @@
             '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})
+source=("https://hisham.hm/$pkgname/releases/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc}
+        '0001-fix-option-string.patch')
 sha256sums=('d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57'
-            'SKIP')
+            'SKIP'
+            'e0ea3a91dfbc7f8c516a19e0d8890314845e768ea4132dfaa49c4d4e89ec10ca')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 < "${srcdir}"/0001-fix-option-string.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"