From 6ed2fab9569c9e738476558054ec91f122f6f6c9 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Fri, 20 Nov 2015 17:45:54 +0100
Subject: [PATCH] conky: update to 1.10.1.

---
 .../conky/patches/ipv6_fatal_to_warning.patch | 11 ---
 srcpkgs/conky/patches/musl-fixes.patch        | 69 -------------------
 srcpkgs/conky/template                        | 14 ++--
 3 files changed, 9 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/conky/patches/ipv6_fatal_to_warning.patch
 delete mode 100644 srcpkgs/conky/patches/musl-fixes.patch

diff --git a/srcpkgs/conky/patches/ipv6_fatal_to_warning.patch b/srcpkgs/conky/patches/ipv6_fatal_to_warning.patch
deleted file mode 100644
index 2d921aea01e..00000000000
--- a/srcpkgs/conky/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/patches/musl-fixes.patch b/srcpkgs/conky/patches/musl-fixes.patch
deleted file mode 100644
index 5e425b54be3..00000000000
--- a/srcpkgs/conky/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
-
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 5fe433961b2..bc8ec119c17 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,14 +1,14 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.10.0
-revision=3
+version=1.10.1
+revision=1
 build_style=cmake
 configure_args="
  -DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname}
  -DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON
  -DBUILD_WEATHER_XOAP=ON -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON"
-hostmakedepends="cmake libtool pkg-config docbook2x man-db"
-makedepends="lua52-devel alsa-lib-devel libglib-devel libxml2-devel libXft-devel
+hostmakedepends="cmake libtool pkg-config docbook2x man-db git"
+makedepends="lua-devel alsa-lib-devel libglib-devel libxml2-devel libXft-devel
  libXdamage-devel imlib2-devel wireless_tools-devel libcurl-devel ncurses-devel"
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
 short_desc="Lightweight system monitor for X"
@@ -16,7 +16,11 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="BSD, GPL-3"
 homepage="http://conky.sourceforge.net/"
 distfiles="https://github.com/brndnmtthws/${pkgname}/archive/v${version}.tar.gz"
-checksum=f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb
+checksum=b4e66a71e8211d02b8dbe8cd4873af209af25326e63afd90c90ba9416c79cf21
+
+post_extract() {
+	sed -i '1iinclude(CheckIncludeFile)' cmake/ConkyPlatformChecks.cmake
+}
 
 do_install() {
 	make -C build DESTDIR=${DESTDIR} install