summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2017-05-16 06:30:31 +0300
committerLars Wendler <polynomial-c@gentoo.org>2017-05-16 21:52:57 +0200
commit520806d82fc698f86da9f1d35761327e9a3c5dbd (patch)
treee40e0489aca18ccc166acf3c7ef422624331808d /media-sound/clementine
parentmultilib.eclass: fix cross-compiling multilib ebuilds (diff)
downloadgentoo-520806d82fc698f86da9f1d35761327e9a3c5dbd.tar.gz
gentoo-520806d82fc698f86da9f1d35761327e9a3c5dbd.tar.bz2
gentoo-520806d82fc698f86da9f1d35761327e9a3c5dbd.zip
media-sound/clementine: fix compilation with gcc-7.1
Gentoo-Bug: 618214 Closes: https://github.com/gentoo/gentoo/pull/4640
Diffstat (limited to 'media-sound/clementine')
-rw-r--r--media-sound/clementine/clementine-1.3.1-r6.ebuild3
-rw-r--r--media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch51
2 files changed, 53 insertions, 1 deletions
diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild b/media-sound/clementine/clementine-1.3.1-r6.ebuild
index 6dfba6c726c4..6d4916f0f570 100644
--- a/media-sound/clementine/clementine-1.3.1-r6.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -95,6 +95,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fix-desktop-file.patch
"${FILESDIR}"/${P}-chromaprint14.patch #603662
"${FILESDIR}"/${P}-libechonest_removal.patch
+ "${FILESDIR}"/${P}-add-missing-functional-includes.patch #618214
)
src_prepare() {
diff --git a/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch b/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
new file mode 100644
index 000000000000..e480212b883b
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
@@ -0,0 +1,51 @@
+From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001
+From: Morris Hafner <mmha@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 56217f6..8c210d3 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 aa3bddb..5f63ef2 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 5efdc9f..e5f711b 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.10.2
+