[arch-commits] Commit in htop/repos/testing-x86_64 (3 files)
Christian Hesse
eworm at archlinux.org
Wed Apr 11 06:15:45 UTC 2018
Date: Wednesday, April 11, 2018 @ 06:15:45
Author: eworm
Revision: 321522
archrelease: copy trunk to testing-x86_64
Added:
htop/repos/testing-x86_64/0001-fix-option-string.patch
(from rev 321521, htop/trunk/0001-fix-option-string.patch)
htop/repos/testing-x86_64/PKGBUILD
(from rev 321521, htop/trunk/PKGBUILD)
Deleted:
htop/repos/testing-x86_64/PKGBUILD
------------------------------+
0001-fix-option-string.patch | 25 +++++++++++
PKGBUILD | 90 ++++++++++++++++++++++-------------------
2 files changed, 74 insertions(+), 41 deletions(-)
Copied: htop/repos/testing-x86_64/0001-fix-option-string.patch (from rev 321521, htop/trunk/0001-fix-option-string.patch)
===================================================================
--- 0001-fix-option-string.patch (rev 0)
+++ 0001-fix-option-string.patch 2018-04-11 06:15:45 UTC (rev 321522)
@@ -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':
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-11 06:15:39 UTC (rev 321521)
+++ PKGBUILD 2018-04-11 06:15:45 UTC (rev 321522)
@@ -1,41 +0,0 @@
-# $Id$
-# 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=1
-pkgdesc="Interactive process viewer"
-arch=('x86_64')
-url="http://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})
-sha256sums=('d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57'
- 'SKIP')
-
-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/testing-x86_64/PKGBUILD (from rev 321521, htop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-04-11 06:15:45 UTC (rev 321522)
@@ -0,0 +1,49 @@
+# $Id$
+# 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=2
+pkgdesc="Interactive process viewer"
+arch=('x86_64')
+url="http://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
+}
More information about the arch-commits
mailing list