Date: Tuesday, November 22, 2011 @ 10:51:20 Author: angvp Revision: 143083
upgpkg: htop 1.0-1 Version bump to 1.0 Modified: htop/trunk/PKGBUILD Deleted: htop/trunk/fix-segfault-small-terminal.patch htop/trunk/fix-sort-key-bug.patch -----------------------------------+ PKGBUILD | 15 ++++----------- fix-segfault-small-terminal.patch | 24 ------------------------ fix-sort-key-bug.patch | 15 --------------- 3 files changed, 4 insertions(+), 50 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-11-22 13:27:59 UTC (rev 143082) +++ PKGBUILD 2011-11-22 15:51:20 UTC (rev 143083) @@ -4,8 +4,8 @@ # Contributor: Daniel J Griffiths <ghost1...@archlinux.us> pkgname=htop -pkgver=0.9 -pkgrel=3 +pkgver=1.0 +pkgrel=1 pkgdesc="Interactive process viewer" arch=('i686' 'x86_64') url="http://htop.sourceforge.net/" @@ -15,12 +15,8 @@ optdepends=('lsof' 'strace') options=('!emptydirs') changelog=ChangeLog -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - 'fix-sort-key-bug.patch' - 'fix-segfault-small-terminal.patch') -md5sums=('7c5507f35f363f3f40183a2ba3c561f8' - '750e8ad8476c5d9738da2a2bc7a7c2b6' - 'd93e39c9662522367dc3a73cc3057039') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('325112ca7947ea1f6d6441f631e00384') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,9 +24,6 @@ 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}/fix-sort-key-bug.patch" - patch -p1 -i "${srcdir}/fix-segfault-small-terminal.patch" - ./configure --prefix=/usr \ --enable-unicode \ --enable-openvz \ Deleted: fix-segfault-small-terminal.patch =================================================================== --- fix-segfault-small-terminal.patch 2011-11-22 13:27:59 UTC (rev 143082) +++ fix-segfault-small-terminal.patch 2011-11-22 15:51:20 UTC (rev 143083) @@ -1,24 +0,0 @@ ---- trunk/Meter.c 2011/08/26 20:52:35 229 -+++ trunk/Meter.c 2011/08/26 20:55:09 230 -@@ -264,13 +264,19 @@ - - w--; - x++; -- char bar[w]; -+ -+ if (w < 1) { -+ attrset(CRT_colors[RESET_COLOR]); -+ return; -+ } -+ char bar[w + 1]; - - int blockSizes[10]; - for (int i = 0; i < w; i++) - bar[i] = ' '; - -- sprintf(bar + (w-strlen(buffer)), "%s", buffer); -+ const size_t barOffset = w - MIN(strlen(buffer), w); -+ snprintf(bar + barOffset, w - barOffset + 1, "%s", buffer); - - // First draw in the bar[] buffer... - double total = 0.0; Deleted: fix-sort-key-bug.patch =================================================================== --- fix-sort-key-bug.patch 2011-11-22 13:27:59 UTC (rev 143082) +++ fix-sort-key-bug.patch 2011-11-22 15:51:20 UTC (rev 143083) @@ -1,15 +0,0 @@ -From: Roman Kosenko <madk...@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);