From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
Date: Tue, 16 May 2017 19:53:02 +0000 (UTC) [thread overview]
Message-ID: <1494964377.520806d82fc698f86da9f1d35761327e9a3c5dbd.polynomial-c@gentoo> (raw)
commit: 520806d82fc698f86da9f1d35761327e9a3c5dbd
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Tue May 16 03:30:31 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 16 19:52:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520806d8
media-sound/clementine: fix compilation with gcc-7.1
Gentoo-Bug: 618214
Closes: https://github.com/gentoo/gentoo/pull/4640
media-sound/clementine/clementine-1.3.1-r6.ebuild | 3 +-
...ine-1.3.1-add-missing-functional-includes.patch | 51 ++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild b/media-sound/clementine/clementine-1.3.1-r6.ebuild
index 6dfba6c726c..6d4916f0f57 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 00000000000..e480212b883
--- /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
+
next reply other threads:[~2017-05-16 19:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-16 19:53 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-13 21:54 [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/ Andreas Sturmlechner
2023-01-02 12:32 Viorel Munteanu
2020-05-28 8:56 Lars Wendler
2018-12-02 18:43 Andreas Sturmlechner
2018-12-02 18:43 Andreas Sturmlechner
2018-04-26 3:32 Andreas Sturmlechner
2018-03-22 18:02 Andreas Sturmlechner
2017-12-08 18:32 Andreas Sturmlechner
2017-11-21 10:19 Andreas Sturmlechner
2017-01-04 15:07 Lars Wendler
2016-12-26 16:14 Lars Wendler
2016-09-13 8:04 David Seifert
2016-05-03 14:59 Lars Wendler
2016-04-27 12:22 Lars Wendler
2016-04-17 4:33 Jason Donenfeld
2016-03-16 0:48 Jason Donenfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1494964377.520806d82fc698f86da9f1d35761327e9a3c5dbd.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox