X-Git-Url: https://git.sthu.org/?p=shuber-gentoo-overlay.git;a=blobdiff_plain;f=app-admin%2Fconky%2Ffiles%2Fconky-1.10.4-x11-build.patch;fp=app-admin%2Fconky%2Ffiles%2Fconky-1.10.4-x11-build.patch;h=0000000000000000000000000000000000000000;hp=eb113a47fd57e88390ac6abd4f02e5371f9821ec;hb=896f3cd58c5111a6aa7865ef9605c640e8e6b257;hpb=f8ff384dd21f0849753e4fb3e65e45d32f8e95f1

diff --git a/app-admin/conky/files/conky-1.10.4-x11-build.patch b/app-admin/conky/files/conky-1.10.4-x11-build.patch
deleted file mode 100644
index eb113a4..0000000
--- a/app-admin/conky/files/conky-1.10.4-x11-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 178015a9495b7d40031ed7459e4f6b6731633a7c Mon Sep 17 00:00:00 2001
-From: shizeeg <shizeeque@gmail.com>
-Date: Thu, 8 Sep 2016 18:24:29 +0300
-Subject: [PATCH] Fix build without X11 (#317)
-
----
- src/conky.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index 0a812fc..4c5da94 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -1404,6 +1404,9 @@ static void draw_string(const char *s)
- 
- int draw_each_line_inner(char *s, int special_index, int last_special_applied)
- {
-+#ifndef BUILD_X11
-+	static int cur_x, cur_y;	/* current x and y for drawing */
-+#endif
- #ifdef BUILD_X11
- 	int font_h = 0;
- 	int cur_y_add = 0;
-@@ -1934,6 +1937,7 @@ static void draw_text(void)
- 
- static void draw_stuff(void)
- {
-+	static int text_offset_x, text_offset_y; /* offset for start position */
- 	text_offset_x = text_offset_y = 0;
- #ifdef BUILD_IMLIB2
- 	cimlib_render(text_start_x, text_start_y, window.width, window.height);