diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2010-08-15 20:04:40 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2010-08-15 20:04:40 +0000 |
| commit | 28740ef665648b672e7b158cea05a2c08aeebae2 (patch) | |
| tree | 5364fbe69b61a8334e48ca3439e138e8ccff923e /app-admin/conky | |
| parent | Stable on amd64 wrt bug #332045 (diff) | |
| download | gentoo-2-28740ef665648b672e7b158cea05a2c08aeebae2.tar.gz gentoo-2-28740ef665648b672e7b158cea05a2c08aeebae2.tar.bz2 gentoo-2-28740ef665648b672e7b158cea05a2c08aeebae2.zip | |
Add missing patch. Fixes bug #332885, thanks to Neeraj Bhunwal for reporting.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'app-admin/conky')
| -rw-r--r-- | app-admin/conky/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.8.0-ibm-x.patch | 27 |
2 files changed, 33 insertions, 1 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 4d037e6cd802..155e3ba6752f 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/conky # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.139 2010/08/13 19:30:33 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.140 2010/08/15 20:04:39 billie Exp $ + + 15 Aug 2010; Daniel Pielmeier <billie@gentoo.org> + +files/conky-1.8.0-ibm-x.patch: + Add missing patch. Fixes bug #332885, thanks to Neeraj Bhunwal for + reporting. 13 Aug 2010; Daniel Pielmeier <billie@gentoo.org> conky-1.8.0-r2.ebuild: Add patch to fix bug #331171. Thanks to Marián Čavojský for the report diff --git a/app-admin/conky/files/conky-1.8.0-ibm-x.patch b/app-admin/conky/files/conky-1.8.0-ibm-x.patch new file mode 100644 index 000000000000..efb8b1166d40 --- /dev/null +++ b/app-admin/conky/files/conky-1.8.0-ibm-x.patch @@ -0,0 +1,27 @@ +From a25985f00b5956e1100900a50986fd89ff560812 Mon Sep 17 00:00:00 2001 +From: Brenden Matthews <brenden@diddyinc.com> +Date: Fri, 13 Aug 2010 10:58:35 -0700 +Subject: [PATCH] Build fix for IBM support when X is disabled. + +See http://bugs.gentoo.org/show_bug.cgi?id=331171 for details. +--- + src/text_object.h | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/src/text_object.h b/src/text_object.h +index 471f842..52d19e7 100644 +--- a/src/text_object.h ++++ b/src/text_object.h +@@ -140,9 +140,7 @@ enum text_object_type { + OBJ_ibm_volume, + OBJ_ibm_brightness, + OBJ_smapi, +-#ifdef X11 + OBJ_smapi_bat_bar, +-#endif /* X11 */ + OBJ_smapi_bat_perc, + OBJ_smapi_bat_temp, + OBJ_smapi_bat_power, +-- +1.7.0.4 + |