Control: tags 853353 + pending
Dear maintainer,
I've prepared an NMU for conky (versioned as 1.10.6-1.1) and uploaded it
to DELAYED/10. Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru conky-1.10.6/debian/changelog conky-1.10.6/debian/changelog
--- conky-1.10.6/debian/changelog 2016-12-09 09:46:09.000000000 +0200
+++ conky-1.10.6/debian/changelog 2017-09-03 18:12:29.000000000 +0300
@@ -1,3 +1,10 @@
+conky (1.10.6-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc 7. (Closes: #853353)
+
+ -- Adrian Bunk <b...@debian.org> Sun, 03 Sep 2017 18:12:29 +0300
+
conky (1.10.6-1) unstable; urgency=medium
* New upstream release.
diff -Nru conky-1.10.6/debian/patches/gcc-7.patch conky-1.10.6/debian/patches/gcc-7.patch
--- conky-1.10.6/debian/patches/gcc-7.patch 1970-01-01 02:00:00.000000000 +0200
+++ conky-1.10.6/debian/patches/gcc-7.patch 2017-08-19 20:59:53.000000000 +0300
@@ -0,0 +1,15 @@
+Description: src/luamm.hh: #include <functional>
+ Required for building with gcc 7.
+Author: Adrian Bunk <b...@debian.org>
+Bug-Debian: https://bugs.debian.org/853353
+
+--- conky-1.10.6.orig/src/luamm.hh
++++ conky-1.10.6/src/luamm.hh
+@@ -26,6 +26,7 @@
+ #include <memory>
+ #include <mutex>
+ #include <exception>
++#include <functional>
+ #include <stdexcept>
+ #include <string>
+
diff -Nru conky-1.10.6/debian/patches/series conky-1.10.6/debian/patches/series
--- conky-1.10.6/debian/patches/series 1970-01-01 02:00:00.000000000 +0200
+++ conky-1.10.6/debian/patches/series 2017-08-19 20:01:25.000000000 +0300
@@ -0,0 +1 @@
+gcc-7.patch
