[arch-commits] Commit in htop/trunk (ChangeLog PKGBUILD htop.c.patch)

[Angel Velásquez]

    Date: Wednesday, May 18, 2011 @ 00:38:36
  Author: angvp
Revision: 124246

upgpkg: htop 0.9-2
Applying patch to fix FS#23224

Added:
  htop/trunk/htop.c.patch
Modified:
  htop/trunk/ChangeLog
  htop/trunk/PKGBUILD

--------------+
 ChangeLog    |    3 +++
 PKGBUILD     |   13 +++++++++----
 htop.c.patch |   15 +++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2011-05-17 20:51:03 UTC (rev 124245)
+++ ChangeLog	2011-05-18 04:38:36 UTC (rev 124246)
@@ -1,3 +1,6 @@
+2011-05-17  Angel Velasquez <angvp at archlinux.org>
+	* Added patch to fix --sort-key (closes FS#23224)
+
 2009-09-21  Eric Belanger  <eric at archlinux.org>
 
 	* htop 0.8.3-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-17 20:51:03 UTC (rev 124245)
+++ PKGBUILD	2011-05-18 04:38:36 UTC (rev 124246)
@@ -1,10 +1,11 @@
 # $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org> 
 # Contributor: Eric Belanger <eric at archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=htop
 pkgver=0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive process viewer"
 arch=('i686' 'x86_64')
 url="http://htop.sourceforge.net/"
@@ -12,13 +13,17 @@
 depends=('ncurses')
 makedepends=('python2')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7c5507f35f363f3f40183a2ba3c561f8')
+changelog=ChangeLog
+source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz
+        htop.c.patch)
+md5sums=('7c5507f35f363f3f40183a2ba3c561f8'
+         '750e8ad8476c5d9738da2a2bc7a7c2b6')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 	sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure 
 	sed -i 's|python|python2|' scripts/MakeHeader.py
+    patch -Np0 -i $srcdir/htop.c.patch
 	./configure --prefix=/usr --enable-unicode --enable-openvz \
 	    --enable-vserver 
 	make 

Added: htop.c.patch
===================================================================
--- htop.c.patch	                        (rev 0)
+++ htop.c.patch	2011-05-18 04:38:36 UTC (rev 124246)
@@ -0,0 +1,15 @@
+From: Roman Kosenko <madkite at gmail.com>
+Date: Thu, 10 Mar 2011 16:23:53 +0200
+Subject: [PATCH] Fix stupid bug with --sort-key
+
+--- htop.c.old	2010-11-24 20:45:38.000000000 +0200
++++ htop.c	2011-03-10 16:32:18.473716667 +0200
+@@ -282,7 +282,7 @@
+             printVersionFlag();
+             break;
+          case 's':
+-            if (strcmp(optarg, "help")) {
++            if (!strcmp(optarg, "help")) {
+                for (int j = 1; j < LAST_PROCESSFIELD; j++)
+                   printf ("%s\n", Process_fieldNames[j]);
+                exit(0);