[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/

[Daniel Pielmeier]

commit:     556e6f84b755f0ef2481d4f51f910ba3d81177b5
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 11:31:16 2017 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 11:31:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=556e6f84

app-admin/conky: Fix bug 610444:

Thanks to Daniel Campbell for the report and patch.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-admin/conky/conky-1.10.6-r2.ebuild                   |  1 +
 app-admin/conky/files/conky-1.10.6-fix-text-shades.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/app-admin/conky/conky-1.10.6-r2.ebuild 
b/app-admin/conky/conky-1.10.6-r2.ebuild
index 266ec099c3d..2f866b42728 100644
--- a/app-admin/conky/conky-1.10.6-r2.ebuild
+++ b/app-admin/conky/conky-1.10.6-r2.ebuild
@@ -76,6 +76,7 @@ DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
 PATCHES=(
        "${FILESDIR}"/${P}-new_graph-oor.patch
        "${FILESDIR}"/${P}-gcc-7.patch
+       "${FILESDIR}"/${P}-fix-text-shades.patch
 )
 
 DISABLE_AUTOFORMATTING="yes"

diff --git a/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch 
b/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch
new file mode 100644
index 00000000000..70b0c52d2a1
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch
@@ -0,0 +1,12 @@
+--- a/src/conky.cc     2017-02-21 18:00:40.157275779 -0800
++++ b/src/conky.cc     2017-02-21 18:05:16.137077877 -0800
+@@ -1930,7 +1930,9 @@
+ 
+ static void draw_stuff(void)
+ {
++#ifndef BUILD_X11
+       static int text_offset_x, text_offset_y; /* offset for start position */
++#endif
+       text_offset_x = text_offset_y = 0;
+ #ifdef BUILD_IMLIB2
+       cimlib_render(text_start_x, text_start_y, window.width, window.height);