summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-01-09 17:42:13 +0000
committerJeroen Roovers <jer@gentoo.org>2010-01-09 17:42:13 +0000
commit8f9d7553e7c78ea18769bd70021ce1f4dbaa0284 (patch)
tree78197a721d91bf4146dd11951e14c2c6a5a5d166 /app-admin/whowatch
parentVersion bump to 0.9.8083 Bug #300053 (diff)
downloadgentoo-2-8f9d7553e7c78ea18769bd70021ce1f4dbaa0284.tar.gz
gentoo-2-8f9d7553e7c78ea18769bd70021ce1f4dbaa0284.tar.bz2
gentoo-2-8f9d7553e7c78ea18769bd70021ce1f4dbaa0284.zip
Bump to stable to fix segfault on amd64 (bug #291638).
(Portage version: 2.2_rc61/cvs/Linux i686, RepoMan options: --force)
Diffstat (limited to 'app-admin/whowatch')
-rw-r--r--app-admin/whowatch/ChangeLog10
-rw-r--r--app-admin/whowatch/files/whowatch-1.6.0-submenus.patch12
-rw-r--r--app-admin/whowatch/whowatch-1.6.0-r1.ebuild (renamed from app-admin/whowatch/whowatch-1.6.0.ebuild)5
3 files changed, 23 insertions, 4 deletions
diff --git a/app-admin/whowatch/ChangeLog b/app-admin/whowatch/ChangeLog
index f02c0849cb37..e5368d751c20 100644
--- a/app-admin/whowatch/ChangeLog
+++ b/app-admin/whowatch/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-admin/whowatch
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/ChangeLog,v 1.33 2009/04/14 14:59:05 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/ChangeLog,v 1.34 2010/01/09 17:42:12 jer Exp $
+
+*whowatch-1.6.0-r1 (09 Jan 2010)
+
+ 09 Jan 2010; Jeroen Roovers <jer@gentoo.org> -whowatch-1.6.0.ebuild,
+ +whowatch-1.6.0-r1.ebuild, +files/whowatch-1.6.0-submenus.patch:
+ Bump to stable to fix segfault on amd64 (bug #291638).
14 Apr 2009; Jeroen Roovers <jer@gentoo.org> -whowatch-1.5.2-r1.ebuild:
Remove old.
diff --git a/app-admin/whowatch/files/whowatch-1.6.0-submenus.patch b/app-admin/whowatch/files/whowatch-1.6.0-submenus.patch
new file mode 100644
index 000000000000..d9fef88ee1d2
--- /dev/null
+++ b/app-admin/whowatch/files/whowatch-1.6.0-submenus.patch
@@ -0,0 +1,12 @@
+diff -ur whowatch-1.6.0.org/src/menu.c whowatch-1.6.0/src/menu.c
+--- whowatch-1.6.0.org/src/menu.c 2010-01-09 18:19:35.000000000 +0100
++++ whowatch-1.6.0/src/menu.c 2010-01-09 18:23:47.000000000 +0100
+@@ -37,7 +37,7 @@
+ static unsigned short item_cursor;
+
+ #define DUMMY_HEAD {0, 0}
+-static char *submenus[] = { "File", "View", "Process", "Users", "Help" };
++static char *submenus[] = { "File", "View", "Process", "Users", "Help", NULL };
+ struct item_bind_t {
+ unsigned short submenu; /* index in the submenus table */
+ struct item_t item;
diff --git a/app-admin/whowatch/whowatch-1.6.0.ebuild b/app-admin/whowatch/whowatch-1.6.0-r1.ebuild
index a87288677190..45f5ac222976 100644
--- a/app-admin/whowatch/whowatch-1.6.0.ebuild
+++ b/app-admin/whowatch/whowatch-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.6.0.ebuild,v 1.11 2009/04/14 09:56:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.6.0-r1.ebuild,v 1.1 2010/01/09 17:42:12 jer Exp $
inherit eutils toolchain-funcs
@@ -25,6 +25,7 @@ src_unpack() {
epatch "${WORKDIR}"/${P/-/_}a-2.diff
epatch "${WORKDIR}"/${P}/${P}a/debian/whowatch-1.6.0.patch
epatch "${FILESDIR}"/${P}-cflags.patch
+ epatch "${FILESDIR}"/${P}-submenus.patch
}
src_compile() {