diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
| commit | c3b94090a6330f678ade2f767e76ab7802d3463e (patch) | |
| tree | e3d2321dce46bfdbc070fcee19e2852566510fe8 /extra/htop | |
| parent | 652c41cc5fd8dc5f23ef6a6c93f488911e1054c7 (diff) | |
| parent | 33feb015eb09eee76827f359e685fce981d88111 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/flumotion/PKGBUILD
community/gnash/PKGBUILD
community/kadu/PKGBUILD
community/mythplugins/PKGBUILD
community/performous/PKGBUILD
community/sleuthkit/PKGBUILD
community/virtualbox/PKGBUILD
community/wbar/PKGBUILD
core/attr/PKGBUILD
core/binutils/PKGBUILD
core/heimdal/PKGBUILD
core/sqlite3/PKGBUILD
extra/acpid/PKGBUILD
extra/apache-ant/PKGBUILD
extra/aria2/PKGBUILD
extra/boost/PKGBUILD
extra/bs/PKGBUILD
extra/bzr/PKGBUILD
extra/cvsps/PKGBUILD
extra/dosbox/PKGBUILD
extra/ettercap-gtk/PKGBUILD
extra/fetchmail/PKGBUILD
extra/gnome-desktop-sharp/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gptfdisk/PKGBUILD
extra/gqmpeg/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk-theme-switch2/PKGBUILD
extra/icecast/PKGBUILD
extra/kdeedu/PKGBUILD
extra/kmldonkey/PKGBUILD
extra/kmplayer/PKGBUILD
extra/libbtctl/PKGBUILD
extra/libftdi/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpst/PKGBUILD
extra/libx86/PKGBUILD
extra/lsdvd/PKGBUILD
extra/mc/PKGBUILD
extra/monotone/PKGBUILD
extra/multitail/PKGBUILD
extra/nbsmtp/PKGBUILD
extra/nickle/PKGBUILD
extra/nppangband/PKGBUILD
extra/numlockx/PKGBUILD
extra/pidgin/PKGBUILD
extra/poppler/PKGBUILD
extra/python-gtkglext/PKGBUILD
extra/scim/PKGBUILD
extra/socat/PKGBUILD
extra/speedcrunch/PKGBUILD
extra/transmission/PKGBUILD
extra/vbetool/PKGBUILD
extra/vlc/PKGBUILD
extra/xchat-gnome/xchat-gnome.install
libre/kernel26-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/xchat-gnome-libre/PKGBUILD
libre/xchat-gnome-libre/gtk2-2.20.patch
libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
libre/xchat-gnome-libre/xchat-gnome.install
multilib/nspluginwrapper/PKGBUILD
testing/libgweather/libgweather.install
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/htop')
| -rw-r--r-- | extra/htop/ChangeLog | 3 | ||||
| -rw-r--r-- | extra/htop/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/htop/htop.c.patch | 15 |
3 files changed, 28 insertions, 5 deletions
diff --git a/extra/htop/ChangeLog b/extra/htop/ChangeLog index 686b0e181..ea5776244 100644 --- a/extra/htop/ChangeLog +++ b/extra/htop/ChangeLog @@ -1,3 +1,6 @@ +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Added patch to fix --sort-key (closes FS#23224) + 2009-09-21 Eric Belanger <eric@archlinux.org> * htop 0.8.3-1 diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD index 75cb3940d..447b035a7 100644 --- a/extra/htop/PKGBUILD +++ b/extra/htop/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 105144 2011-01-06 20:57:13Z angvp $ +# $Id: PKGBUILD 124246 2011-05-18 04:38:36Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=htop pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Interactive process viewer" arch=('i686' 'x86_64' 'mips64el') url="http://htop.sourceforge.net/" @@ -12,13 +13,17 @@ license=('GPL') 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 diff --git a/extra/htop/htop.c.patch b/extra/htop/htop.c.patch new file mode 100644 index 000000000..41a2dd377 --- /dev/null +++ b/extra/htop/htop.c.patch @@ -0,0 +1,15 @@ +From: Roman Kosenko <madkite@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); |