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/musescore/files/, media-sound/musescore/
Date: Fri, 17 Aug 2018 22:04:22
Message-Id: 1534543322.e6afd0247a9d58619db12cc83225c6c58337ead9.asturm@gentoo
1 commit: e6afd0247a9d58619db12cc83225c6c58337ead9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 17 21:24:14 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 17 22:02:02 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6afd024
7
8 media-sound/musescore: Fix build with Qt 5.11
9
10 Closes: https://bugs.gentoo.org/661784
11 Package-Manager: Portage-2.3.46, Repoman-2.3.10
12
13 .../musescore/files/musescore-2.1.0-qt-5.11.patch | 21 +++++++++++++++++++++
14 media-sound/musescore/musescore-2.1.0.ebuild | 5 ++++-
15 2 files changed, 25 insertions(+), 1 deletion(-)
16
17 diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
18 new file mode 100644
19 index 00000000000..09932062de5
20 --- /dev/null
21 +++ b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
22 @@ -0,0 +1,21 @@
23 +From 9c8a8ffe0cbb00ee93a10fe245da01a4d32ca086 Mon Sep 17 00:00:00 2001
24 +From: Orcan Ogetbil <orcan@×××××××××.localdomain>
25 +Date: Thu, 31 May 2018 21:04:51 -0400
26 +Subject: [PATCH] added missing #include <QButtonGroup> required by qt >= 5.11
27 +
28 +---
29 + all.h | 1 +
30 + 1 file changed, 1 insertion(+)
31 +
32 +diff --git a/all.h b/all.h
33 +index 72db72b0ec..2ee0e8e807 100644
34 +--- a/all.h
35 ++++ b/all.h
36 +@@ -131,6 +131,7 @@
37 + #include <QProgressBar>
38 + #include <QProgressDialog>
39 + #include <QRadioButton>
40 ++#include <QButtonGroup>
41 + #include <QSplashScreen>
42 + #include <QFontComboBox>
43 + #include <QApplication>
44 \ No newline at end of file
45
46 diff --git a/media-sound/musescore/musescore-2.1.0.ebuild b/media-sound/musescore/musescore-2.1.0.ebuild
47 index c5eb58ccd82..71798fdc8e9 100644
48 --- a/media-sound/musescore/musescore-2.1.0.ebuild
49 +++ b/media-sound/musescore/musescore-2.1.0.ebuild
50 @@ -1,4 +1,4 @@
51 -# Copyright 1999-2017 Gentoo Foundation
52 +# Copyright 1999-2018 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54
55 EAPI=6
56 @@ -41,9 +41,12 @@ DEPEND="${RDEPEND}
57 dev-qt/linguist-tools:5
58 virtual/pkgconfig
59 "
60 +
61 PATCHES=(
62 "${WORKDIR}/${PN}-2.1.0-fix-buildsystem.patch"
63 + "${FILESDIR}/${PN}-2.1.0-qt-5.11.patch"
64 )
65 +
66 S="${WORKDIR}/MuseScore-${PV}"
67
68 src_configure() {