update to 1.10.6

2017-02-20 15:45:02 +01:00 · 2017-02-20 15:45:02 +01:00 · 024be56bf7
parent a963631221
commit 024be56bf7
4 changed files with 9 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/conky-1.10.4.tar.gz
+/conky-1.10.6.tar.gz
--- a/conky-gcc7.patch
+++ b/conky-gcc7.patch
@ -1,11 +1,11 @@
-diff -up conky-1.10.4/src/luamm.hh.gcc7 conky-1.10.4/src/luamm.hh
--- conky-1.10.4/src/luamm.hh.gcc7	2017-02-20 15:21:51.061823560 +0100
-+++ conky-1.10.4/src/luamm.hh	2017-02-20 15:21:59.622742073 +0100
+diff -up conky-1.10.6/src/luamm.hh.gcc7 conky-1.10.6/src/luamm.hh
+--- conky-1.10.6/src/luamm.hh.gcc7	2017-02-20 15:31:45.145623438 +0100
+++ conky-1.10.6/src/luamm.hh	2017-02-20 15:42:02.467168585 +0100
@@ -26,6 +26,7 @@
 #include <memory>
 #include <mutex>
- #include <stdexcept>
+ #include <exception>
 +#include <functional>
- 
- #include <lua.hpp>
+ #include <stdexcept>
+ #include <string>
 
--- a/conky.spec
+++ b/conky.spec
@ -17,7 +17,7 @@
 %bcond_without xinerama

 Name:           conky 
-Version:        1.10.4
+Version:        1.10.6
 Release:        2%{?dist}
 Summary:        A system monitor for X 

--- a/2
+++ b/2
@ -1 +1 @@
-28259c21f50279472fd9a9a8299b70cb  conky-1.10.4.tar.gz
+SHA512 (conky-1.10.6.tar.gz) = ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9