From 4bbd1af074fe8ac981c612906efa83ab0dd0aaca Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Thu, 11 Jan 2018 09:38:10 +0100
Subject: [PATCH] conky/conky-cli: fix build with gcc7

---
 srcpkgs/conky-cli/template       |  2 +-
 srcpkgs/conky/patches/gcc7.patch | 12 ++++++++++++
 srcpkgs/conky/template           |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/conky/patches/gcc7.patch

diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index d89f6ecce95..25b651a044a 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'conky-cli'
 pkgname=conky-cli
 version=1.10.6
-revision=1
+revision=2
 wrksrc="${pkgname/-cli/}-${version}"
 build_style=cmake
 configure_args="
diff --git a/srcpkgs/conky/patches/gcc7.patch b/srcpkgs/conky/patches/gcc7.patch
new file mode 100644
index 00000000000..cf4ee8d6927
--- /dev/null
+++ b/srcpkgs/conky/patches/gcc7.patch
@@ -0,0 +1,12 @@
+See https://git.archlinux.org/svntogit/packages.git/tree/trunk/gcc7.patch?h=packages/conky
+diff -Naur old/src/luamm.hh new/src/luamm.hh
+--- src/luamm.hh	2016-12-04 05:13:57.000000000 -1000
++++ src/luamm.hh	2017-11-21 09:11:20.993164069 -1000
+@@ -28,6 +28,7 @@
+ #include <exception>
+ #include <stdexcept>
+ #include <string>
++#include <functional>
+ 
+ #include <lua.hpp>
+ 
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 3f380727a83..adb7e8f7763 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,7 +1,7 @@
 # Template file for 'conky'
 pkgname=conky
 version=1.10.6
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname}