From a96363122142c5bb7056c926797d830e041a5bd6 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 20 Feb 2017 15:30:57 +0100 Subject: [PATCH] fix building with new gcc (#1423306) --- conky-gcc7.patch | 11 +++++++++++ conky.spec | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 conky-gcc7.patch diff --git a/conky-gcc7.patch b/conky-gcc7.patch new file mode 100644 index 0000000..9b57ad2 --- /dev/null +++ b/conky-gcc7.patch @@ -0,0 +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 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include + diff --git a/conky.spec b/conky.spec index d64a7bb..c8001b1 100644 --- a/conky.spec +++ b/conky.spec @@ -25,6 +25,7 @@ Group: User Interface/X License: GPLv3+ URL: https://github.com/brndnmtthws/conky Source0: https://github.com/brndnmtthws/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch1: conky-gcc7.patch BuildRequires: libXft-devel BuildRequires: libXt-devel @@ -53,6 +54,7 @@ It just keeps on given'er. Yeah. %prep %setup -q +%patch1 -p1 -b .gcc7 # remove -Werror from CFLAGS sed -i 's|-Werror||' cmake/ConkyBuildOptions.cmake