From b44bdb533903e96b155b6d14e718dabf9dde4548 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Fri, 2 Oct 2015 12:44:53 +0200
Subject: [PATCH] conky-cli: remove dup patches; use conky patches via symlink.

---
 srcpkgs/conky-cli/patches                     |  1 +
 srcpkgs/conky-cli/patches/ascii.patch         | 11 ---
 .../patches/ipv6_fatal_to_warning.patch       | 11 ---
 srcpkgs/conky-cli/patches/musl-fixes.patch    | 69 -------------------
 4 files changed, 1 insertion(+), 91 deletions(-)
 create mode 120000 srcpkgs/conky-cli/patches
 delete mode 100644 srcpkgs/conky-cli/patches/ascii.patch
 delete mode 100644 srcpkgs/conky-cli/patches/ipv6_fatal_to_warning.patch
 delete mode 100644 srcpkgs/conky-cli/patches/musl-fixes.patch

diff --git a/srcpkgs/conky-cli/patches b/srcpkgs/conky-cli/patches
new file mode 120000
index 00000000000..eb854d1cae4
--- /dev/null
+++ b/srcpkgs/conky-cli/patches
@@ -0,0 +1 @@
+../conky/patches
\ No newline at end of file
diff --git a/srcpkgs/conky-cli/patches/ascii.patch b/srcpkgs/conky-cli/patches/ascii.patch
deleted file mode 100644
index 25461d26fa4..00000000000
--- a/srcpkgs/conky-cli/patches/ascii.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/config_settings.xml.orig	2015-09-09 22:46:13.283151562 -0400
-+++ doc/config_settings.xml	2015-09-09 22:46:25.629151185 -0400
-@@ -80,7 +80,7 @@
-         </term>
-         <listitem>A comma-separated list of strings to use as the bars of a graph output
-         to console/shell. The first list item is used for the minimum bar height and the
--        last item is used for the maximum. Example: " ,_,▁,▂,▃,▄,▅,▆,▇,█".
-+        last item is used for the maximum.
-         <para /></listitem>
-     </varlistentry>
-     <varlistentry>
diff --git a/srcpkgs/conky-cli/patches/ipv6_fatal_to_warning.patch b/srcpkgs/conky-cli/patches/ipv6_fatal_to_warning.patch
deleted file mode 100644
index 2d921aea01e..00000000000
--- a/srcpkgs/conky-cli/patches/ipv6_fatal_to_warning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/ConkyPlatformChecks.cmake.orig	2015-09-09 16:43:45.145815169 -0400
-+++ cmake/ConkyPlatformChecks.cmake	2015-09-09 16:44:03.281814616 -0400
-@@ -105,7 +105,7 @@
- if(BUILD_IPV6)
- 	find_file(IF_INET6 if_inet6 PATHS /proc/net)
- 	if(NOT IF_INET6)
--		message(FATAL_ERROR "/proc/net/if_inet6 unavailable")
-+		message(WARNING "/proc/net/if_inet6 unavailable")
- 	endif(NOT IF_INET6)
- endif(BUILD_IPV6)
- 
diff --git a/srcpkgs/conky-cli/patches/musl-fixes.patch b/srcpkgs/conky-cli/patches/musl-fixes.patch
deleted file mode 100644
index 5e425b54be3..00000000000
--- a/srcpkgs/conky-cli/patches/musl-fixes.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 21b0a052af22a355321cce13abd573dbcf90dd4a Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 23 Jul 2015 13:57:18 +0200
-Subject: [PATCH 2/3] Remove use of sysctl.h
-
----
- src/common.cc | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/common.cc b/src/common.cc
-index 126f30a..116cd06 100644
---- src/common.cc
-+++ src/common.cc
-@@ -42,7 +42,6 @@
- #include <errno.h>
- #include <time.h>
- #include <sys/ioctl.h>
--#include <sys/sysctl.h>
- #include <net/if.h>
- #include <netinet/in.h>
- #include <pthread.h>
--- 
-2.4.6
-
-
-From 3d67ed4920d31e5b17dd61684713d061d4fd7598 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 23 Jul 2015 13:58:02 +0200
-Subject: [PATCH 3/3] Use portable version of strerror_r
-
----
- src/c++wrap.cc | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/c++wrap.cc b/src/c++wrap.cc
-index c21b473..213f9c4 100644
---- src/c++wrap.cc
-+++ src/c++wrap.cc
-@@ -26,8 +26,14 @@
- #include "c++wrap.hh"
- 
- #include <unistd.h>
-+
-+/* force use of  POSIX strerror_r instead of non-portable GNU specific */
-+#ifdef _GNU_SOURCE
-+#undef _GNU_SOURCE
-+#endif
- #include <string.h>
- 
-+
- #if !defined(HAVE_PIPE2) || !defined(HAVE_O_CLOEXEC)
- #include <fcntl.h>
- 
-@@ -62,8 +68,10 @@ namespace {
- 
- std::string strerror_r(int errnum)
- {
--	char buf[100];
--	return strerror_r(errnum, buf, sizeof buf);
-+	static thread_local char buf[100];
-+	if (strerror_r(errnum, buf, sizeof buf) != 0)
-+		snprintf(buf, sizeof buf, "Unknown error %i", errnum);
-+	return buf;
- }
- 
- std::pair<int, int> pipe2(int flags)
--- 
-2.4.6
-