From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 14 Jul 2018 21:03:06 +0100
Subject: gentoo resync : 14.07.2018

---
 app-admin/conky/files/conky-1.10.4-x11-build.patch | 31 ++++++++++++++++++++
 .../conky/files/conky-1.10.8-use-pkgconfig.patch   | 34 ++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 app-admin/conky/files/conky-1.10.4-x11-build.patch
 create mode 100644 app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch

(limited to 'app-admin/conky/files')

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
new file mode 100644
index 000000000000..eb113a47fd57
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.4-x11-build.patch
@@ -0,0 +1,31 @@
+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);
diff --git a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
new file mode 100644
index 000000000000..97e6bd02323f
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
@@ -0,0 +1,34 @@
+Reversed patch
+
+From abd0be51a00444d3be6b213e0926675e5a4e5ed3 Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@diddyinc.com>
+Date: Tue, 23 Jan 2018 12:56:06 -0500
+Subject: [PATCH] Use FindCurses instead of pkg_check_modules.
+
+This should resolve #217.
+---
+ cmake/ConkyPlatformChecks.cmake | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
+index c5b39b2f..19ec7b9b 100644
+--- a/cmake/ConkyPlatformChecks.cmake
++++ b/cmake/ConkyPlatformChecks.cmake
+@@ -129,12 +129,12 @@ if(BUILD_HTTP)
+ endif(BUILD_HTTP)
+ 
+ if(BUILD_NCURSES)
++	pkg_check_modules(NCURSES ncurses)
++	if(NOT NCURSES_FOUND)
+-	include(FindCurses)
+-	if(NOT CURSES_FOUND)
+ 		message(FATAL_ERROR "Unable to find ncurses library")
++	endif(NOT NCURSES_FOUND)
++	set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
++	set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
+-	endif(NOT CURSES_FOUND)
+-	set(conky_libs ${conky_libs} ${CURSES_LIBRARIES})
+-	set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR})
+ endif(BUILD_NCURSES)
+ 
+ if(BUILD_MYSQL)
-- 
cgit v1.2.3