Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
Date: Sun, 28 Feb 2021 11:47:18
Message-Id: 1614512828.21c0d85046b22c455258b27c65c2d34537a13d87.fordfrog@gentoo
1 commit: 21c0d85046b22c455258b27c65c2d34537a13d87
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 28 11:46:45 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 28 11:47:08 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c0d850
7
8 media-sound/musescore: fixed compilation with -mp3
9
10 thanks to Ionen Wolkens <sudinave <AT> gmail.com> for the patch
11
12 Closes: https://bugs.gentoo.org/767760
13 Package-Manager: Portage-3.0.16, Repoman-3.0.2
14 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
15
16 .../musescore/files/musescore-3.6.1-rename-audioitem.patch | 12 ++++++++++++
17 media-sound/musescore/musescore-3.6.1.ebuild | 1 +
18 media-sound/musescore/musescore-3.6.2.ebuild | 1 +
19 3 files changed, 14 insertions(+)
20
21 diff --git a/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
22 new file mode 100644
23 index 00000000000..caf9ae67ec7
24 --- /dev/null
25 +++ b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
26 @@ -0,0 +1,12 @@
27 +Fix misnamed variable causing build failure with USE=-mp3
28 +https://bugs.gentoo.org/767760
29 +Signed-off-by: Ionen Wolkens <sudinave@×××××.com>
30 +--- a/mscore/exportdialog.cpp
31 ++++ b/mscore/exportdialog.cpp
32 +@@ -77,5 +77,5 @@
33 + // Disable .mp3 option if unavailable
34 + QStandardItem* mp3Item = fileTypeComboBoxModel->item(3);
35 +- mp3Item->setFlags(audioItem->flags() & ~Qt::ItemIsEnabled);
36 ++ mp3Item->setFlags(mp3Item->flags() & ~Qt::ItemIsEnabled);
37 + # endif
38 + # ifndef HAS_AUDIOFILE
39
40 diff --git a/media-sound/musescore/musescore-3.6.1.ebuild b/media-sound/musescore/musescore-3.6.1.ebuild
41 index bb23b9e040e..9ef3d3c075b 100644
42 --- a/media-sound/musescore/musescore-3.6.1.ebuild
43 +++ b/media-sound/musescore/musescore-3.6.1.ebuild
44 @@ -63,6 +63,7 @@ RDEPEND="${DEPEND}"
45
46 PATCHES=(
47 "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
48 + "${FILESDIR}/${P}-rename-audioitem.patch"
49 )
50
51 src_unpack() {
52
53 diff --git a/media-sound/musescore/musescore-3.6.2.ebuild b/media-sound/musescore/musescore-3.6.2.ebuild
54 index bb23b9e040e..d5a19eb9bdc 100644
55 --- a/media-sound/musescore/musescore-3.6.2.ebuild
56 +++ b/media-sound/musescore/musescore-3.6.2.ebuild
57 @@ -63,6 +63,7 @@ RDEPEND="${DEPEND}"
58
59 PATCHES=(
60 "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
61 + "${FILESDIR}/${PN}-3.6.1-rename-audioitem.patch"
62 )
63
64 src_unpack() {