summaryrefslogtreecommitdiff
path: root/media-sound/musescore/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-03 10:28:17 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-03 10:28:17 +0000
commitd99093fb4bb5652015c06274d64083daa2439e4f (patch)
treecf61513204d97974179580065e85df5c8009087c /media-sound/musescore/files
parent463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
gentoo resync : 03.03.2021
Diffstat (limited to 'media-sound/musescore/files')
-rw-r--r--media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch13
-rw-r--r--media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch12
-rw-r--r--media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch12
3 files changed, 12 insertions, 25 deletions
diff --git a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
deleted file mode 100644
index 283ffdc92e21..000000000000
--- a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
-index 94b1aef..6a7b4e8 100644
---- a/mscore/scoreview.cpp
-+++ b/mscore/scoreview.cpp
-@@ -2661,7 +2661,7 @@ void ScoreView::cmd(const char* s)
- cv->updateGrips();
- }},
- #ifdef OMR
-- {{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
-+ {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
- if (cv->score()->masterScore()->omr())
- showOmr(!_score->masterScore()->showOmr());
- }},
diff --git a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
deleted file mode 100644
index b4e1ad0baf54..000000000000
--- a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/omr/pattern.h b/omr/pattern.h
-index b040497..1b8e0c4 100644
---- a/omr/pattern.h
-+++ b/omr/pattern.h
-@@ -24,7 +24,6 @@
-
- namespace Ms {
-
--enum class SymId;
- class Sym;
-
- //---------------------------------------------------------
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 000000000000..caf9ae67ec70
--- /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 <sudinave@gmail.com>
+--- 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