- Update to 1.10.5

- Remove patches which have been accepted upstream

1 files changed, 1 insertions, 35 deletions

diff --git a/sysutils/conky/files/patch-src_conky.cc b/sysutils/conky/files/patch-src_conky.cc
index 4a30994d0f22..5f4c27a9eab2 100644
--- a/sysutils/conky/files/patch-src_conky.cc
+++ b/sysutils/conky/files/patch-src_conky.cc
@@ -1,4 +1,4 @@
---- src/conky.cc.orig	2016-07-20 16:53:48 UTC
+--- src/conky.cc.orig	2016-10-04 07:49:19 UTC
 +++ src/conky.cc
 @@ -129,7 +129,7 @@
  #include <microhttpd.h>
@@ -9,37 +9,3 @@
  #include <bsd/bsd.h>
  #endif
  
-@@ -728,13 +728,6 @@ int percent_print(char *buf, int size, u
- 	return spaced_print(buf, size, "%u", pad_percents.get(*state), value);
- }
- 
--#if defined(__FreeBSD__)
--unsigned long long llabs(long long num) {
--       if(num < 0) return -num;
--       else return num;
--}
--#endif
--
- /* converts from bytes to human readable format (K, M, G, T)
-  *
-  * The algorithm always divides by 1024, as unit-conversion of byte
-@@ -1811,8 +1804,8 @@ int draw_each_line_inner(char *s, int sp
- #endif /* BUILD_X11 */
- 				case GOTO:
- 					if (current->arg >= 0) {
--						cur_x = (int) current->arg;
- #ifdef BUILD_X11
-+						cur_x = (int) current->arg;
- 						//make sure shades are 1 pixel to the right of the text
- 						if(draw_mode == BG) cur_x++;
- #endif /* BUILD_X11 */
-@@ -1934,7 +1927,9 @@ static void draw_text(void)
- 
- static void draw_stuff(void)
- {
-+#ifdef BUILD_X11
- 	text_offset_x = text_offset_y = 0;
-+#endif
- #ifdef BUILD_IMLIB2
- 	cimlib_render(text_start_x, text_start_y, window.width, window.height);
- #endif /* BUILD_IMLIB2 */