diff options
author | 2008-11-29 18:31:55 +0000 | |
---|---|---|
committer | 2008-11-29 18:31:55 +0000 | |
commit | 4347b2999c4cd88cb131a795cb3393350778dc6e (patch) | |
tree | 13d81f2d27d3485e04eef96bf89e80f2563e7f1c /sys-process/htop | |
parent | ppc stable, bug #248760 (diff) | |
download | gentoo-2-4347b2999c4cd88cb131a795cb3393350778dc6e.tar.gz gentoo-2-4347b2999c4cd88cb131a795cb3393350778dc6e.tar.bz2 gentoo-2-4347b2999c4cd88cb131a795cb3393350778dc6e.zip |
fix bug #245966
(Portage version: 2.2_rc13/cvs/Linux 2.6.24-gentoo-r5-1 i686)
Diffstat (limited to 'sys-process/htop')
-rw-r--r-- | sys-process/htop/ChangeLog | 9 | ||||
-rw-r--r-- | sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch | 12 | ||||
-rw-r--r-- | sys-process/htop/htop-0.8.1-r1.ebuild | 48 | ||||
-rw-r--r-- | sys-process/htop/metadata.xml | 4 |
4 files changed, 69 insertions, 4 deletions
diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog index fa7715c6ad8c..59adc8307b8a 100644 --- a/sys-process/htop/ChangeLog +++ b/sys-process/htop/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-process/htop # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.63 2008/11/24 10:20:23 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.64 2008/11/29 18:31:55 wschlich Exp $ + +*htop-0.8.1-r1 (29 Nov 2008) + + 29 Nov 2008; Wolfram Schlich <wschlich@gentoo.org> + +files/htop-0.8.1-non-printable-char-filter.patch, metadata.xml, + +htop-0.8.1-r1.ebuild: + fix bug #245966 24 Nov 2008; Raúl Porcel <armin76@gentoo.org> htop-0.8.1.ebuild: ia64/sparc/x86 stable diff --git a/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch b/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch new file mode 100644 index 000000000000..cfbafe84fca5 --- /dev/null +++ b/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch @@ -0,0 +1,12 @@ +diff -u htop-0.8.1.orig/RichString.c htop-0.8.1/RichString.c +--- htop-0.8.1.orig/RichString.c 2008-03-09 03:23:49.000000000 +0100 ++++ htop-0.8.1/RichString.c 2008-11-29 19:07:29.284860473 +0100 +@@ -58,7 +58,7 @@ + int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len); + for (int i = this->len, j = 0; i < last; i++, j++) { + memset(&this->chstr[i], 0, sizeof(this->chstr[i])); +- this->chstr[i].chars[0] = data[j]; ++ this->chstr[i].chars[0] = ((data[j] > 31) ? data[j] : '?' ); + this->chstr[i].attr = attrs; + } + this->chstr[last].chars[0] = 0; diff --git a/sys-process/htop/htop-0.8.1-r1.ebuild b/sys-process/htop/htop-0.8.1-r1.ebuild new file mode 100644 index 000000000000..df7591d02ed9 --- /dev/null +++ b/sys-process/htop/htop-0.8.1-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.8.1-r1.ebuild,v 1.1 2008/11/29 18:31:55 wschlich Exp $ + +inherit eutils flag-o-matic + +IUSE="debug unicode" +DESCRIPTION="interactive process viewer" +HOMEPAGE="http://htop.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +DEPEND="sys-libs/ncurses" + +pkg_setup() { + if use elibc_FreeBSD ; then + elog + elog "htop needs /proc mounted to work, to mount it type" + elog "mount -t linprocfs none /proc" + elog "or uncomment the example in /etc/fstab" + elog + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-desktop-entry.patch + epatch "${FILESDIR}"/${P}-non-printable-char-filter.patch +} + +src_compile() { + if use unicode && ! built_with_use sys-libs/ncurses unicode; then + die "for unicode support of htop, sys-libs/ncurses must be emerged with USE=unicode" + fi + useq debug && append-flags -O -ggdb -DDEBUG + econf \ + --enable-taskstats \ + $(use_enable unicode) \ + || die "configure failed" + emake || die "make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc README ChangeLog TODO +} diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml index 5e500212fe0e..3e8697042d49 100644 --- a/sys-process/htop/metadata.xml +++ b/sys-process/htop/metadata.xml @@ -3,9 +3,7 @@ <pkgmetadata> <herd>no-herd</herd> <maintainer> - <email>wschlich@gentoo.org</email> - <name>Wolfram Schlich</name> - <description>Primary maintainer</description> + <email>maintainer-needed@gentoo.org</email> </maintainer> <longdescription> htop is an interactive process viewer for Linux. It aims to be a 'better top': |