diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2010-07-24 21:44:53 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2010-07-24 21:44:53 +0000 |
| commit | 01e1d8a071f882112f93213807f89f91ffaa27c8 (patch) | |
| tree | 0116bd724ba7bdb8ad0c864a5cbb44da9664f7d5 /app-admin | |
| parent | fix udev rules (diff) | |
| download | gentoo-2-01e1d8a071f882112f93213807f89f91ffaa27c8.tar.gz gentoo-2-01e1d8a071f882112f93213807f89f91ffaa27c8.tar.bz2 gentoo-2-01e1d8a071f882112f93213807f89f91ffaa27c8.zip | |
Add patch from upstream to fix if_existing. See bug #328891.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/conky/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.8.0-r2.ebuild | 5 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.8.0-if-existing.patch | 24 |
3 files changed, 32 insertions, 3 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 5de0a648a0a3..1b31ff644175 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,10 @@ # 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.137 2010/07/14 14:06:42 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.138 2010/07/24 21:44:53 billie Exp $ + + 24 Jul 2010; Daniel Pielmeier <billie@gentoo.org> conky-1.8.0-r2.ebuild, + +files/conky-1.8.0-if-existing.patch: + Add patch from upstream to fix if_existing. See bug #328891. 14 Jul 2010; Christian Faulhammer <fauli@gentoo.org> conky-1.8.0-r1.ebuild: diff --git a/app-admin/conky/conky-1.8.0-r2.ebuild b/app-admin/conky/conky-1.8.0-r2.ebuild index cf1eb8d8a894..9cbaaf26851a 100644 --- a/app-admin/conky/conky-1.8.0-r2.ebuild +++ b/app-admin/conky/conky-1.8.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild,v 1.1 2010/07/03 20:07:57 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild,v 1.2 2010/07/24 21:44:53 billie Exp $ EAPI="2" @@ -54,7 +54,8 @@ DEPEND=" src_prepare() { epatch "${FILESDIR}/conky-1.8.0-ncurses.patch" \ - "${FILESDIR}/conky-1.8.0-audacious-2.3.patch" + "${FILESDIR}/conky-1.8.0-audacious-2.3.patch" \ + "${FILESDIR}/conky-1.8.0-if-existing.patch" eautoreconf } diff --git a/app-admin/conky/files/conky-1.8.0-if-existing.patch b/app-admin/conky/files/conky-1.8.0-if-existing.patch new file mode 100644 index 000000000000..d7a8df95f9a5 --- /dev/null +++ b/app-admin/conky/files/conky-1.8.0-if-existing.patch @@ -0,0 +1,24 @@ +X-Git-Url: http://git.omp.am/?p=conky.git;a=blobdiff_plain;f=src%2Fconky.c;h=790e93c599414099ebca1f1ac6dafc1d54a8a2cb;hp=7e61f51d0197a1f700a0e0a77bf89575685cf22b;hb=9c5e5d86bd74465ca1b6f037b084bdb0eda453f7;hpb=c8e687406502be8c6f4e75b077113591823405f0 + +diff --git a/src/conky.c b/src/conky.c +index 7e61f51..790e93c 100644 +--- a/src/conky.c ++++ b/src/conky.c +@@ -463,7 +463,7 @@ int check_contains(char *f, char *s) + } + fclose(where); + } else { +- NORM_ERR("Could not open the file"); ++ NORM_ERR("Could not open the file '%s'", f); + } + return ret; + } +@@ -1330,7 +1330,7 @@ void generate_text_internal(char *p, int p_max_size, + DO_JUMP; + } else if (spc) { + *spc = '\0'; +- if (check_contains(obj->data.s, spc + 1)) ++ if (!check_contains(obj->data.s, spc + 1)) + DO_JUMP; + *spc = ' '; + } |