Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qtscrobbler/, media-sound/qtscrobbler/files/
Date: Sat, 14 Jul 2018 13:42:30
Message-Id: 1531575730.dcfdb3ab782b65aa5ccbaa1d2211efca7f056d00.asturm@gentoo
1 commit: dcfdb3ab782b65aa5ccbaa1d2211efca7f056d00
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 14 13:42:10 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 14 13:42:10 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcfdb3ab
7
8 media-sound/qtscrobbler: Fix build with Qt 5.11
9
10 Closes: https://bugs.gentoo.org/661078
11 Package-Manager: Portage-2.3.41, Repoman-2.3.9
12
13 .../qtscrobbler-0.11_pre20130123-qt5.11.patch | 24 ++++++++++++++++++++++
14 .../qtscrobbler-0.11_pre20130123.ebuild | 5 ++++-
15 2 files changed, 28 insertions(+), 1 deletion(-)
16
17 diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch
18 new file mode 100644
19 index 00000000000..33781a4ee82
20 --- /dev/null
21 +++ b/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch
22 @@ -0,0 +1,24 @@
23 +From 11d70c80a634aaf1606a435688dddbc3db36b7ff Mon Sep 17 00:00:00 2001
24 +From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
25 +Date: Sat, 14 Jul 2018 15:35:25 +0200
26 +Subject: [PATCH] Fix build with Qt 5.11
27 +
28 +---
29 + src/qt/src/qtscrob.cpp | 1 +
30 + 1 file changed, 1 insertion(+)
31 +
32 +diff --git a/src/qt/src/qtscrob.cpp b/src/qt/src/qtscrob.cpp
33 +index 5b7a561..c6084e3 100644
34 +--- a/src/qt/src/qtscrob.cpp
35 ++++ b/src/qt/src/qtscrob.cpp
36 +@@ -17,6 +17,7 @@
37 + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
38 + ***************************************************************************/
39 +
40 ++#include <QHeaderView>
41 + #include <QtGui>
42 + #include <QTime>
43 + #include "qtscrob.h"
44 +--
45 +2.18.0
46 +
47
48 diff --git a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
49 index dc4f5ac6824..3dc54d6064d 100644
50 --- a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
51 +++ b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
52 @@ -30,7 +30,10 @@ DEPEND="${RDEPEND}
53
54 S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
55
56 -PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
57 +PATCHES=(
58 + "${FILESDIR}"/${P}-qt5.patch
59 + "${FILESDIR}"/${P}-qt5.11.patch
60 +)
61
62 src_configure() {
63 pushd src >/dev/null