summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2020-08-06 15:24:38 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2020-08-06 15:28:35 +0200
commitfee3a7887e5b7abbb31782464d8793e2594573b8 (patch)
treec2d2453c5c2a0caa5f4f362bc15a80d3c39c8854 /media-sound/musescore/files
parentapp-office/scribus: taking the package (diff)
downloadgentoo-fee3a7887e5b7abbb31782464d8793e2594573b8.tar.gz
gentoo-fee3a7887e5b7abbb31782464d8793e2594573b8.tar.bz2
gentoo-fee3a7887e5b7abbb31782464d8793e2594573b8.zip
media-sound/musescore: bump to 3.5 + updated 9999
Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
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
2 files changed, 25 insertions, 0 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
new file mode 100644
index 000000000000..283ffdc92e21
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000000..b4e1ad0baf54
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
@@ -0,0 +1,12 @@
+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;
+
+ //---------------------------------------------------------