diff options
| -rw-r--r-- | app-admin/conky/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.9.0.ebuild | 5 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.9.0-ncurses.patch | 31 |
3 files changed, 40 insertions, 3 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 8f2d2dacb470..47d3f84abe55 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/conky # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.179 2012/05/05 15:20:09 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.180 2012/07/13 16:54:53 billie Exp $ + + 13 Jul 2012; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0.ebuild, + +files/conky-1.9.0-ncurses.patch: + Build fix for bug #415215. Thanks to Amadeusz Żołnowski for the report and + upstream developer Pavel Labath for the patch. *conky-1.9.0 (05 May 2012) diff --git a/app-admin/conky/conky-1.9.0.ebuild b/app-admin/conky/conky-1.9.0.ebuild index d57046c2900c..a00d22bacd0f 100644 --- a/app-admin/conky/conky-1.9.0.ebuild +++ b/app-admin/conky/conky-1.9.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.1 2012/05/05 15:20:09 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.2 2012/07/13 16:54:53 billie Exp $ EAPI=4 @@ -59,7 +59,8 @@ DEPEND=" " src_prepare() { - epatch "${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" + epatch "${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" \ + "${FILESDIR}/${P}-ncurses.patch" } src_configure() { diff --git a/app-admin/conky/files/conky-1.9.0-ncurses.patch b/app-admin/conky/files/conky-1.9.0-ncurses.patch new file mode 100644 index 000000000000..91043ed42050 --- /dev/null +++ b/app-admin/conky/files/conky-1.9.0-ncurses.patch @@ -0,0 +1,31 @@ +From fd9462da5ed12369fc6a72e42ebc45c6707403fb Mon Sep 17 00:00:00 2001 +From: Pavel Labath <pavelo@centrum.sk> +Date: Fri, 13 Jul 2012 13:41:09 +0200 +Subject: [PATCH] Fix "conky failes to build with --disable-ncurses" (sf.net #3541329) + +--- + src/conky.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/conky.c b/src/conky.c +index c5b4bed..17fe1a7 100644 +--- a/src/conky.c ++++ b/src/conky.c +@@ -885,12 +885,12 @@ void generate_text_internal(char *p, int p_max_size, + OBJ(cpu) { + if (cur->cpu_usage) { + if (obj->data.i > info.cpu_count) { +- static bool warned = false; ++ static int warned = 0; + if(!warned) { + NORM_ERR("obj->data.i %i info.cpu_count %i", + obj->data.i, info.cpu_count); + NORM_ERR("attempting to use more CPUs than you have!"); +- warned = true; ++ warned = 1; + } + } else { + percent_print(p, p_max_size, +-- +1.7.0.4 + |