From 1568f70b51fd30ade5ad466fd7924424cc7949ea Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Feb 17 2017 12:19:15 +0000 Subject: Add patch to fix build with GCC 7 --- diff --git a/clementine-functional-header.patch b/clementine-functional-header.patch new file mode 100644 index 0000000..f41147d --- /dev/null +++ b/clementine-functional-header.patch @@ -0,0 +1,48 @@ +From a2f7d018c7bdee96d4cefd5a1ec0c4f710fea226 Mon Sep 17 00:00:00 2001 +From: Morris +Date: Sun, 12 Feb 2017 23:41:43 +0100 +Subject: [PATCH] Add missing includes + +--- + src/core/mergedproxymodel.cpp | 1 + + src/devices/giolister.cpp | 1 + + src/library/groupbydialog.cpp | 2 ++ + 3 files changed, 4 insertions(+) + +diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp +index 56217f6..8c210d3 100644 +--- a/src/core/mergedproxymodel.cpp ++++ b/src/core/mergedproxymodel.cpp +@@ -23,6 +23,7 @@ + + #include + ++#include + #include + + // boost::multi_index still relies on these being in the global namespace. +diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp +index aa3bddb..5f63ef2 100644 +--- a/src/devices/giolister.cpp ++++ b/src/devices/giolister.cpp +@@ -17,6 +17,7 @@ + + #include "config.h" + ++#include + #include + + #include +diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp +index 5efdc9f..e5f711b 100644 +--- a/src/library/groupbydialog.cpp ++++ b/src/library/groupbydialog.cpp +@@ -20,6 +20,8 @@ + + #include + ++#include ++ + // boost::multi_index still relies on these being in the global namespace. + using std::placeholders::_1; + using std::placeholders::_2; diff --git a/clementine.spec b/clementine.spec index 2eb2fb5..cb76c02 100644 --- a/clementine.spec +++ b/clementine.spec @@ -16,6 +16,8 @@ Patch4: clementine-udisks-headers.patch # fix compiler flag handling in gst/moodbar, upstreamable --rex Patch6: clementine-moodbar_flags.patch +# https://github.com/clementine-player/Clementine/pull/5630 +Patch7: clementine-functional-header.patch BuildRequires: boost-devel BuildRequires: cmake @@ -77,6 +79,7 @@ music. %patch1 -p1 -b .sqlite-fts3-tokinizers-support %patch4 -p1 -b .udisks-headers %patch6 -p1 -b .moodbar_flags +%patch7 -p1 -b .functional-header # Remove most 3rdparty libraries mv 3rdparty/{gmock,qocoa,qsqlite,sha2,libmygpo-qt,vreen}/ . @@ -145,6 +148,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/kde4/services/clementine-zune.protocol %changelog +* Fri Feb 17 2017 Jonathan Wakely - 1.3.1-8 +- Add patch to fix build with GCC 7 + * Fri Feb 10 2017 Fedora Release Engineering - 1.3.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild