commit:     21c0d85046b22c455258b27c65c2d34537a13d87
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 11:46:45 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 11:47:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c0d850

media-sound/musescore: fixed compilation with -mp3

thanks to Ionen Wolkens <sudinave <AT> gmail.com> for the patch

Closes: https://bugs.gentoo.org/767760
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../musescore/files/musescore-3.6.1-rename-audioitem.patch   | 12 ++++++++++++
 media-sound/musescore/musescore-3.6.1.ebuild                 |  1 +
 media-sound/musescore/musescore-3.6.2.ebuild                 |  1 +
 3 files changed, 14 insertions(+)

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
new file mode 100644
index 00000000000..caf9ae67ec7
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
@@ -0,0 +1,12 @@
+Fix misnamed variable causing build failure with USE=-mp3
+https://bugs.gentoo.org/767760
+Signed-off-by: Ionen Wolkens <[email protected]>
+--- a/mscore/exportdialog.cpp
++++ b/mscore/exportdialog.cpp
+@@ -77,5 +77,5 @@
+       // Disable .mp3 option if unavailable
+       QStandardItem* mp3Item = fileTypeComboBoxModel->item(3);
+-      mp3Item->setFlags(audioItem->flags() & ~Qt::ItemIsEnabled);
++      mp3Item->setFlags(mp3Item->flags() & ~Qt::ItemIsEnabled);
+ # endif
+ # ifndef HAS_AUDIOFILE

diff --git a/media-sound/musescore/musescore-3.6.1.ebuild 
b/media-sound/musescore/musescore-3.6.1.ebuild
index bb23b9e040e..9ef3d3c075b 100644
--- a/media-sound/musescore/musescore-3.6.1.ebuild
+++ b/media-sound/musescore/musescore-3.6.1.ebuild
@@ -63,6 +63,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
        "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+       "${FILESDIR}/${P}-rename-audioitem.patch"
 )
 
 src_unpack() {

diff --git a/media-sound/musescore/musescore-3.6.2.ebuild 
b/media-sound/musescore/musescore-3.6.2.ebuild
index bb23b9e040e..d5a19eb9bdc 100644
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -63,6 +63,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
        "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+       "${FILESDIR}/${PN}-3.6.1-rename-audioitem.patch"
 )
 
 src_unpack() {

Reply via email to