[arch-commits] Commit in clementine/trunk (2 files)

[Evangelos Foutras]

    Date: Thursday, August 3, 2017 @ 21:00:17
  Author: foutrelis
Revision: 247955

Fix build with GCC 7

Added:
  clementine/trunk/add-missing-functional-includes-5630.patch
Modified:
  clementine/trunk/PKGBUILD

--------------------------------------------+
 PKGBUILD                                   |    4 ++
 add-missing-functional-includes-5630.patch |   51 +++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-03 20:59:40 UTC (rev 247954)
+++ PKGBUILD	2017-08-03 21:00:17 UTC (rev 247955)
@@ -24,9 +24,11 @@
             'gvfs: Various devices support')
 source=("clementine-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"
         clementine-gcc6.patch
+        add-missing-functional-includes-5630.patch
         clementine-1.3.1-chromaprint-1.4.0.patch)
 sha256sums=('f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c'
             '05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee'
+            '213a1c2eb3f3c1d2904ed855ad851c10705d04cfa20b36b843b60003469fdc1a'
             '4cc9c9df599df4a595c6acf4e129a54296c0a8e537627435e3df14e1e95447b0')
 
 prepare() {
@@ -34,6 +36,8 @@
 
   # Fix build with GCC 6
   patch -p1 -i ../clementine-gcc6.patch
+  # https://github.com/clementine-player/Clementine/pull/5630
+  patch -p1 -i ../add-missing-functional-includes-5630.patch
   # Fix build with chromaprint 1.4.0
   patch -p1 -i ../clementine-1.3.1-chromaprint-1.4.0.patch
 

Added: add-missing-functional-includes-5630.patch
===================================================================
--- add-missing-functional-includes-5630.patch	                        (rev 0)
+++ add-missing-functional-includes-5630.patch	2017-08-03 21:00:17 UTC (rev 247955)
@@ -0,0 +1,51 @@
+From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001
+From: Morris Hafner <mmha at users.noreply.github.com>
+Date: Mon, 13 Feb 2017 17:46:46 +0100
+Subject: [PATCH] Add missing <functional> includes (#5630)
+
+---
+ 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 56217f6fd..8c210d391 100644
+--- a/src/core/mergedproxymodel.cpp
++++ b/src/core/mergedproxymodel.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <QStringList>
+ 
++#include <functional>
+ #include <limits>
+ 
+ // 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 aa3bddb34..5f63ef248 100644
+--- a/src/devices/giolister.cpp
++++ b/src/devices/giolister.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include "config.h"
+ 
++#include <functional>
+ #include <memory>
+ 
+ #include <QFile>
+diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp
+index 5efdc9f36..e5f711b34 100644
+--- a/src/library/groupbydialog.cpp
++++ b/src/library/groupbydialog.cpp
+@@ -20,6 +20,8 @@
+ 
+ #include <QPushButton>
+ 
++#include <functional>
++
+ // boost::multi_index still relies on these being in the global namespace.
+ using std::placeholders::_1;
+ using std::placeholders::_2;
+-- 
+2.13.4
+