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

[Christian Hesse]

    Date: Thursday, August 27, 2020 @ 12:26:44
  Author: eworm
Revision: 394762

upgpkg: htop 3.0.0-1: new upstream, new release

Modified:
  htop/trunk/PKGBUILD
Deleted:
  htop/trunk/0001-fix-option-string.patch
  htop/trunk/0002-gcc10.patch

------------------------------+
 0001-fix-option-string.patch |   25 -------------------------
 0002-gcc10.patch             |   39 ---------------------------------------
 PKGBUILD                     |   24 ++++++++----------------
 3 files changed, 8 insertions(+), 80 deletions(-)

Deleted: 0001-fix-option-string.patch
===================================================================
--- 0001-fix-option-string.patch	2020-08-27 12:10:13 UTC (rev 394761)
+++ 0001-fix-option-string.patch	2020-08-27 12:26:44 UTC (rev 394762)
@@ -1,25 +0,0 @@
-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':

Deleted: 0002-gcc10.patch
===================================================================
--- 0002-gcc10.patch	2020-08-27 12:10:13 UTC (rev 394761)
+++ 0002-gcc10.patch	2020-08-27 12:26:44 UTC (rev 394762)
@@ -1,39 +0,0 @@
-From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001
-From: David Seifert <soap at gentoo.org>
-Date: Thu, 23 Jan 2020 17:27:10 +0100
-Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default
-
----
- CRT.h                | 6 +++---
- linux/LinuxProcess.h | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CRT.h b/CRT.h
-index 933fe068..65998ac6 100644
---- a/CRT.h
-+++ b/CRT.h
-@@ -140,7 +140,7 @@ extern const char **CRT_treeStr;
- 
- extern int CRT_delay;
- 
--int* CRT_colors;
-+extern int* CRT_colors;
- 
- extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
- 
-@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount;
- 
- extern int CRT_scrollWheelVAmount;
- 
--char* CRT_termType;
-+extern char* CRT_termType;
- 
- // TODO move color scheme to Settings, perhaps?
- 
- extern int CRT_colorScheme;
- 
--void *backtraceArray[128];
-+extern void *backtraceArray[128];
- 
- #if HAVE_SETUID_ENABLED
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-27 12:10:13 UTC (rev 394761)
+++ PKGBUILD	2020-08-27 12:26:44 UTC (rev 394762)
@@ -4,31 +4,23 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=htop
-pkgver=2.2.0
-pkgrel=3
+pkgver=3.0.0
+pkgrel=1
 pkgdesc='Interactive process viewer'
 arch=('x86_64')
-url='https://hisham.hm/htop/'
+url='https://htop.dev/'
 license=('GPL')
-depends=('ncurses' 'libnl')
-makedepends=('python')
+depends=('ncurses' 'libncursesw.so' 'libnl')
 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'
-        '0002-gcc10.patch')
-sha256sums=('d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57'
-            'SKIP'
-            'e0ea3a91dfbc7f8c516a19e0d8890314845e768ea4132dfaa49c4d4e89ec10ca'
-            'f715a87cffc6375eb3915530f4b27455b00b9324b8ee9168c0b983ba2a536938')
+options=('!emptydirs')
+source=("https://github.com/htop-dev/htop/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('1c0661f0ae5f4e2874da250b60cd515e4ac4c041583221adfe95f10e18d1a4e6')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  patch -Np1 < "${srcdir}"/0001-fix-option-string.patch
-  patch -Np1 < "${srcdir}"/0002-gcc10.patch
+  autoreconf -fi
 }
 
 build() {