wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-29 08:52:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

conky/conky-cli: fix build with gcc7

Browse source
This commit is contained in:
Enno Boland 2018-01-11 09:38:10 +01:00
parent 5d923ec84d
commit 4bbd1af074
No known key found for this signature in database
GPG key ID: D09964719BDE9971
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/conky-cli/template
View file

@ -1,7 +1,7 @@
# Template file for 'conky-cli' # Template file for 'conky-cli'
pkgname=conky-cli pkgname=conky-cli
version=1.10.6 version=1.10.6
revision=1 revision=2
wrksrc="${pkgname/-cli/}-${version}" wrksrc="${pkgname/-cli/}-${version}"
build_style=cmake build_style=cmake
configure_args=" configure_args="

12
srcpkgs/conky/patches/gcc7.patch Normal file
View file

@ -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>

2
srcpkgs/conky/template
View file

@ -1,7 +1,7 @@
# Template file for 'conky' # Template file for 'conky'
pkgname=conky pkgname=conky
version=1.10.6 version=1.10.6
revision=1 revision=2
build_style=cmake build_style=cmake
configure_args=" configure_args="
-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname} -DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname}