pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/musescore
Module Name: pkgsrc
Committed By: gutteridge
Date: Mon Jan 25 02:42:44 UTC 2021
Modified Files:
pkgsrc/audio/musescore: Makefile PLIST distinfo
pkgsrc/audio/musescore/patches:
patch-build_Linux+BSD_portable_portable-utils.in
Added Files:
pkgsrc/audio/musescore/patches: patch-build_FindQt5.cmake
patch-libmscore_measure.cpp
Log Message:
musescore: update to 3.6
pkgsrc-specific note: fixes from the 3.6 branch have been applied so
this builds with Qt 5.15 and doesn't crash when importing older scores
in certain contexts.
Release notes:
New
Added the new default notation fonts "Leland"
Added the new default text font "Edwin"
Added a new dialog that suggests trying out the new engraving defaults
Added automatic score ordering and bracketing
Added automatic vertical justification of staves
Added Mountain Dulcimer instrument and 3-string tab presets
Added portamento for FLUID synthesiser
Added Petaluma notation font
Added mnemonics for "Save", "Save As" and "Resource Manager"
Improvements
Redesigned the score migration dialog and the algorithm for applying new styles
Improved the vertical staff justification algorithm
First system indentation now takes the maximum of the length of the instruments labels and the style parameter
Added a support of measure number interval at multi-measure rests
Improved the recognition of instruments when loading a pre-3.6 score
Altered default canvas background colour
Improved functionality and appearance of 'Add Palettes' button
Implemented a new "Export" dialog
Improved the score symbols appearance
Updated Bravura notation font to version 1.39
Extended the set of accidentals
Implemented a third stroke style for minim-based two-note tremolos
Added extended fermata symbols to MusicXML I/O
Updated SMuFL to the latest version 1.3
Added support for triple sharp and triple flat
Replaced the accidentals from Emmentaler with improved ones from Parnassus
Added an indication of sounding pitch if the global concert pitch toggle is off and the current instrument has an actual pitch
Added heavy, reverse end and heavy double barlines
Added Sicilian translation
The Edit Style dialog is no longer modal: the score can now be traversed while the dialog is open
Added an alternative choice of “To Coda”
Added a harmony duration interpretation
MacOS window title bars now update according to the selected theme in MuseScore
Added an automatic change of theme in MuseScore according to the MacOS dark/light mode setting
The width of accidental symbols in the font is now honoured during drawing
Solo instrument names now end in "solo"
Improved collision avoidance between accidentals and ledger lines
Improved the appearance of shadow notes
Improved layout of the "Edit Style" dialog
Cleaned up all unnecessary spaces and words used in file export
Order of buttons in "Score migration" dialog is now platform-specific
Improved search behavior in "Palettes"
Added an option for applying new text font (Edwin) to imported MusicXML scores
Replenished collection of demo scores
Fixes
Fixed a bug preventing generation of square braces for an instrument with multiple staves
Fixed an issue where style dialog loses setting of chord symbol radio buttons
Fixed an issue with measure numbers not showing when first staff is cut away
Fixed an issue where ledger lines only showed correctly when staff line spacing set to 0.5 increments (i.e 1.5, 2.0, etc.)
Fixed an issue with image resize not correctly honouring aspect ratio
Fixed an issue with "Select Similar Beat" command not working with shortened measures
Fixed an issue where glissandos collide with double-digit start fretmarks
Fixed glissando and portamento playback
Enabled selection of text using the mouse in Palettes search field
Adjusted the "Range-transpose" shortcuts
Adjusted the appearance of dotted lines
Staff visibility changes are now allowed mid-score
Fixed an issue with the appearance of additive time signatures
Fixed an issue where Mandolin unintentionally has a Grand Piano sound
Expanded the list of special characters in "Special characters -> Common Symbols"
Jump at Volta End no longer skips last measure
Fixed a crash when switching instruments from an instrument with tabulature
Fixed an issue when toggling between clefs of unpitched and pitched instruments, which led to a crash
Fixed an issue where pressing Enter in the Score Properties dialog applies to the "New…" button rather than the "OK" button
Fixed a crash when deleting header/footer text after hiding
Fixed an issue where removing tuplets after inserting measures caused corruption/crash
Reduced useless whitespace in JSON files
Disabled auto collision avoidance for rests which do not have auto-placement enabled
Fixed an issue where rests cannot be merged together when the measure has 3 or 4 voices
Fixed an issue with the "Flatten all Beams" setting being ignored on score reload
Fixed an issue where voice-1 rests collide with voice-3 rhythm slashes
Fixed an issue where C time signature does not update
Fixed an issue with readability of the tempo field by screen readers
Fixed a palette search shortcut functionality issue
Fixed an issue with missing space between the key signature and the first note when the time signature is hidden
Fixed a freeze when a tie has the same start and end note
Fixed a crash when deleting or changing a time signature in a multi-measure rest
Fixed an issue with import of MusicXML files from the new version of Finale
Fixed an incorrect tuplet calculation on a two-note tremolo
Removed support for the "place at middle of stem" option for single-note tremolos
Fixed an issue where duplication of voltas leads to following voltas being ignored
Fixed an issue with MusicXML import of changed transpositions
Fixed an issue where hairpin export stops halfway
Fixed an issue with FirstSystemIndentation style setting not taking account of instrument label length
Fixed an issue where MusicXML import did not honour "measure-style/slash"
Fix missing kerning in MuseJazz Text
Fixed an issue with application of new styles to 'recent' scores
Fixed an issue with application of new styles to pre-3.6 scores
Fixed an issue with incorrect brace scaling
Fixed an issue with import of MusicXML tempo changes
Fixed an issue where aligned pedal lines jump wildly while being dragged
Fixed an issue with updating of translations
Fixed an issue with export of fretboard diagrams to MusicXML
Fixed an issue where atonal key signatures caused spacing issues
Fixed an issue with the "Show MIDI controls in mixer" checkbox in "Preferences" dialog
Fixed an issue with inconsistent stem directions on middle-line beamed notes
Fixed an issue with application of new styles to 'recent' scores
Fixed an issue with measure numbers colliding with brackets
Fixed an issue with triggering of translation process after a language switch
Fixed an issue where fingering was wrongly scaled with note size
Fixed an issue with cutaway courtesy clefs not showing
Fixed an issue with export of 32nd-note tuplets into MusicXML format
Removed unnecessary rounding of BPM value in "Play panel"
Fixed an issue with unexpected behavior of "Esc" key in "Edit Style" dialog
Fixed a crash when importing a file with an incomplete tuplet
Fixed an issue where adding instruments on top of others whose parts have been created leads to score corruption
Fixed an issue with styles in the "converter" mode
Fixed an issue where changing any property on a text line resets all styled properties to default
Fixed an issue where the "Custom" string in "Instrument > Order" shows untranslated
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/audio/musescore/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/musescore/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/musescore/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/audio/musescore/patches/patch-build_FindQt5.cmake \
pkgsrc/audio/musescore/patches/patch-libmscore_measure.cpp
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/audio/musescore/patches/patch-build_Linux+BSD_portable_portable-utils.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/musescore/Makefile
diff -u pkgsrc/audio/musescore/Makefile:1.17 pkgsrc/audio/musescore/Makefile:1.18
--- pkgsrc/audio/musescore/Makefile:1.17 Fri Jan 1 09:52:17 2021
+++ pkgsrc/audio/musescore/Makefile Mon Jan 25 02:42:44 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2021/01/01 09:52:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.18 2021/01/25 02:42:44 gutteridge Exp $
-DISTNAME= musescore-3.5.2
-PKGREVISION= 4
+DISTNAME= musescore-3.6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=musescore/}
GITHUB_PROJECT= MuseScore
@@ -35,7 +34,8 @@ CMAKE_ARGS+= -DBUILD_WEBENGINE=OFF
pre-configure:
${MKDIR} ${WRKSRC}/bindir
-DEPENDS+= qt5-qttranslations>=5.15.1:../../x11/qt5-qttranslations
+DEPENDS+= qt5-qtgraphicaleffects>=5.15.2:../../x11/qt5-qtgraphicaleffects
+DEPENDS+= qt5-qttranslations>=5.15.2:../../x11/qt5-qttranslations
.include "options.mk"
.include "../../audio/lame/buildlink3.mk"
@@ -43,7 +43,7 @@ DEPENDS+= qt5-qttranslations>=5.15.1:../
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.15.1
+BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.15.2
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
.include "../../x11/qt5-qtquickcontrols2/buildlink3.mk"
Index: pkgsrc/audio/musescore/PLIST
diff -u pkgsrc/audio/musescore/PLIST:1.5 pkgsrc/audio/musescore/PLIST:1.6
--- pkgsrc/audio/musescore/PLIST:1.5 Sun Oct 18 03:33:13 2020
+++ pkgsrc/audio/musescore/PLIST Mon Jan 25 02:42:44 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2020/10/18 03:33:13 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/01/25 02:42:44 gutteridge Exp $
bin/mscore
bin/musescore
man/man1/mscore.1
@@ -23,211 +23,217 @@ share/icons/hicolor/scalable/mimetypes/a
share/icons/hicolor/scalable/mimetypes/application-x-musescore.svg
share/metainfo/org.musescore.MuseScore.appdata.xml
share/mime/packages/musescore.xml
-share/mscore-3.5/demos/Brassed_Up.mscx
-share/mscore-3.5/demos/Dynamic_Strings.mscx
-share/mscore-3.5/demos/Fugue_1.mscx
-share/mscore-3.5/demos/Reunion.mscz
-share/mscore-3.5/demos/Unclaimed_Gift.mscx
-share/mscore-3.5/instruments/instruments.xml
-share/mscore-3.5/locale/languages.xml
-share/mscore-3.5/locale/qt_ar.qm
-share/mscore-3.5/locale/qt_bg.qm
-share/mscore-3.5/locale/qt_ca.qm
-share/mscore-3.5/locale/qt_cs.qm
-share/mscore-3.5/locale/qt_da.qm
-share/mscore-3.5/locale/qt_de.qm
-share/mscore-3.5/locale/qt_es.qm
-share/mscore-3.5/locale/qt_fa.qm
-share/mscore-3.5/locale/qt_fi.qm
-share/mscore-3.5/locale/qt_fr.qm
-share/mscore-3.5/locale/qt_gd.qm
-share/mscore-3.5/locale/qt_gl.qm
-share/mscore-3.5/locale/qt_he.qm
-share/mscore-3.5/locale/qt_hu.qm
-share/mscore-3.5/locale/qt_it.qm
-share/mscore-3.5/locale/qt_ja.qm
-share/mscore-3.5/locale/qt_ko.qm
-share/mscore-3.5/locale/qt_lt.qm
-share/mscore-3.5/locale/qt_lv.qm
-share/mscore-3.5/locale/qt_pl.qm
-share/mscore-3.5/locale/qt_pt.qm
-share/mscore-3.5/locale/qt_ru.qm
-share/mscore-3.5/locale/qt_sk.qm
-share/mscore-3.5/locale/qt_sl.qm
-share/mscore-3.5/locale/qt_sv.qm
-share/mscore-3.5/locale/qt_tr.qm
-share/mscore-3.5/locale/qt_uk.qm
-share/mscore-3.5/locale/qt_zh_CN.qm
-share/mscore-3.5/locale/qt_zh_TW.qm
-share/mscore-3.5/locale/qtbase_ar.qm
-share/mscore-3.5/locale/qtbase_bg.qm
-share/mscore-3.5/locale/qtbase_ca.qm
-share/mscore-3.5/locale/qtbase_cs.qm
-share/mscore-3.5/locale/qtbase_da.qm
-share/mscore-3.5/locale/qtbase_de.qm
-share/mscore-3.5/locale/qtbase_en.qm
-share/mscore-3.5/locale/qtbase_es.qm
-share/mscore-3.5/locale/qtbase_fi.qm
-share/mscore-3.5/locale/qtbase_fr.qm
-share/mscore-3.5/locale/qtbase_gd.qm
-share/mscore-3.5/locale/qtbase_he.qm
-share/mscore-3.5/locale/qtbase_hu.qm
-share/mscore-3.5/locale/qtbase_it.qm
-share/mscore-3.5/locale/qtbase_ja.qm
-share/mscore-3.5/locale/qtbase_ko.qm
-share/mscore-3.5/locale/qtbase_lv.qm
-share/mscore-3.5/locale/qtbase_pl.qm
-share/mscore-3.5/locale/qtbase_ru.qm
-share/mscore-3.5/locale/qtbase_sk.qm
-share/mscore-3.5/locale/qtbase_tr.qm
-share/mscore-3.5/locale/qtbase_uk.qm
-share/mscore-3.5/locale/qtbase_zh_TW.qm
-share/mscore-3.5/locale/qtmultimedia_ar.qm
-share/mscore-3.5/locale/qtmultimedia_bg.qm
-share/mscore-3.5/locale/qtmultimedia_ca.qm
-share/mscore-3.5/locale/qtmultimedia_cs.qm
-share/mscore-3.5/locale/qtmultimedia_da.qm
-share/mscore-3.5/locale/qtmultimedia_de.qm
-share/mscore-3.5/locale/qtmultimedia_en.qm
-share/mscore-3.5/locale/qtmultimedia_es.qm
-share/mscore-3.5/locale/qtmultimedia_fi.qm
-share/mscore-3.5/locale/qtmultimedia_fr.qm
-share/mscore-3.5/locale/qtmultimedia_hu.qm
-share/mscore-3.5/locale/qtmultimedia_it.qm
-share/mscore-3.5/locale/qtmultimedia_ja.qm
-share/mscore-3.5/locale/qtmultimedia_ko.qm
-share/mscore-3.5/locale/qtmultimedia_pl.qm
-share/mscore-3.5/locale/qtmultimedia_ru.qm
-share/mscore-3.5/locale/qtmultimedia_sk.qm
-share/mscore-3.5/locale/qtmultimedia_tr.qm
-share/mscore-3.5/locale/qtmultimedia_uk.qm
-share/mscore-3.5/locale/qtmultimedia_zh_TW.qm
-share/mscore-3.5/locale/qtscript_ar.qm
-share/mscore-3.5/locale/qtscript_bg.qm
-share/mscore-3.5/locale/qtscript_ca.qm
-share/mscore-3.5/locale/qtscript_cs.qm
-share/mscore-3.5/locale/qtscript_da.qm
-share/mscore-3.5/locale/qtscript_de.qm
-share/mscore-3.5/locale/qtscript_en.qm
-share/mscore-3.5/locale/qtscript_es.qm
-share/mscore-3.5/locale/qtscript_fi.qm
-share/mscore-3.5/locale/qtscript_fr.qm
-share/mscore-3.5/locale/qtscript_he.qm
-share/mscore-3.5/locale/qtscript_hu.qm
-share/mscore-3.5/locale/qtscript_it.qm
-share/mscore-3.5/locale/qtscript_ja.qm
-share/mscore-3.5/locale/qtscript_ko.qm
-share/mscore-3.5/locale/qtscript_lv.qm
-share/mscore-3.5/locale/qtscript_pl.qm
-share/mscore-3.5/locale/qtscript_ru.qm
-share/mscore-3.5/locale/qtscript_sk.qm
-share/mscore-3.5/locale/qtscript_tr.qm
-share/mscore-3.5/locale/qtscript_uk.qm
-share/mscore-3.5/locale/qtxmlpatterns_bg.qm
-share/mscore-3.5/locale/qtxmlpatterns_ca.qm
-share/mscore-3.5/locale/qtxmlpatterns_cs.qm
-share/mscore-3.5/locale/qtxmlpatterns_da.qm
-share/mscore-3.5/locale/qtxmlpatterns_de.qm
-share/mscore-3.5/locale/qtxmlpatterns_en.qm
-share/mscore-3.5/locale/qtxmlpatterns_es.qm
-share/mscore-3.5/locale/qtxmlpatterns_fr.qm
-share/mscore-3.5/locale/qtxmlpatterns_hu.qm
-share/mscore-3.5/locale/qtxmlpatterns_it.qm
-share/mscore-3.5/locale/qtxmlpatterns_ja.qm
-share/mscore-3.5/locale/qtxmlpatterns_ko.qm
-share/mscore-3.5/locale/qtxmlpatterns_pl.qm
-share/mscore-3.5/locale/qtxmlpatterns_ru.qm
-share/mscore-3.5/locale/qtxmlpatterns_sk.qm
-share/mscore-3.5/locale/qtxmlpatterns_uk.qm
-share/mscore-3.5/locale/qtxmlpatterns_zh_TW.qm
-share/mscore-3.5/plugins/abc_import.qml
-share/mscore-3.5/plugins/colornotes.qml
-share/mscore-3.5/plugins/createscore.qml
-share/mscore-3.5/plugins/helloqml/helloqml.qml
-share/mscore-3.5/plugins/helloqml/translations/locale_de.qm
-share/mscore-3.5/plugins/helloqml/translations/locale_de.ts
-share/mscore-3.5/plugins/notenames-interactive.qml
-share/mscore-3.5/plugins/notenames.qml
-share/mscore-3.5/plugins/panel.qml
-share/mscore-3.5/plugins/random.qml
-share/mscore-3.5/plugins/random2.qml
-share/mscore-3.5/plugins/run.qml
-share/mscore-3.5/plugins/scorelist.qml
-share/mscore-3.5/plugins/view.qml
-share/mscore-3.5/plugins/walk.qml
-share/mscore-3.5/sound/MuseScore_General.sf3
-share/mscore-3.5/sound/MuseScore_General_License.md
-share/mscore-3.5/styles/MuseJazz.mss
-share/mscore-3.5/styles/cchords_muse.xml
-share/mscore-3.5/styles/cchords_nrb.xml
-share/mscore-3.5/styles/cchords_rb.xml
-share/mscore-3.5/styles/cchords_sym.xml
-share/mscore-3.5/styles/chords.xml
-share/mscore-3.5/styles/chords_jazz.xml
-share/mscore-3.5/styles/chords_std.xml
-share/mscore-3.5/styles/jazzchords.xml
-share/mscore-3.5/styles/stdchords.xml
-share/mscore-3.5/templates/01-General/00-Blank.mscx
-share/mscore-3.5/templates/01-General/01-Treble_Clef.mscx
-share/mscore-3.5/templates/01-General/02-Bass_Clef.mscx
-share/mscore-3.5/templates/01-General/03-Grand_Staff.mscx
-share/mscore-3.5/templates/02-Choral/01-SATB.mscx
-share/mscore-3.5/templates/02-Choral/02-SATB_+_Organ.mscx
-share/mscore-3.5/templates/02-Choral/03-SATB_+_Piano.mscx
-share/mscore-3.5/templates/02-Choral/04-SATB_Closed_Score.mscx
-share/mscore-3.5/templates/02-Choral/05-SATB_Closed_Score_+_Organ.mscx
-share/mscore-3.5/templates/02-Choral/06-SATB_Closed_Score_+_Piano.mscx
-share/mscore-3.5/templates/02-Choral/07-Voice_+_Piano.mscx
-share/mscore-3.5/templates/02-Choral/08-Barbershop_Quartet_(Men).mscx
-share/mscore-3.5/templates/02-Choral/09-Barbershop_Quartet_(Women).mscx
-share/mscore-3.5/templates/02-Choral/10-Liturgical_Unmetrical.mscx
-share/mscore-3.5/templates/02-Choral/11-Liturgical_Unmetrical_+_Organ.mscx
-share/mscore-3.5/templates/03-Chamber_Music/01-String_Quartet.mscx
-share/mscore-3.5/templates/03-Chamber_Music/02-Wind_Quartet.mscx
-share/mscore-3.5/templates/03-Chamber_Music/03-Wind_Quintet.mscx
-share/mscore-3.5/templates/03-Chamber_Music/04-Saxophone_Quartet.mscx
-share/mscore-3.5/templates/03-Chamber_Music/05-Brass_Quartet.mscx
-share/mscore-3.5/templates/03-Chamber_Music/06-Brass_Quintet.mscx
-share/mscore-3.5/templates/04-Solo/01-Guitar.mscx
-share/mscore-3.5/templates/04-Solo/02-Guitar_+_Tablature.mscx
-share/mscore-3.5/templates/04-Solo/03-Guitar_Tablature.mscx
-share/mscore-3.5/templates/04-Solo/04-Piano.mscx
-share/mscore-3.5/templates/05-Jazz/01-Jazz_Lead_Sheet.mscx
-share/mscore-3.5/templates/05-Jazz/02-Big_Band.mscx
-share/mscore-3.5/templates/05-Jazz/03-Jazz_Combo.mscx
-share/mscore-3.5/templates/06-Popular/01-Rock_Band.mscx
-share/mscore-3.5/templates/06-Popular/02-Bluegrass_Band.mscx
-share/mscore-3.5/templates/07-Band_and_Percussion/01-Concert_Band.mscx
-share/mscore-3.5/templates/07-Band_and_Percussion/02-Small_Concert_Band.mscx
-share/mscore-3.5/templates/07-Band_and_Percussion/03-Brass_Band.mscx
-share/mscore-3.5/templates/07-Band_and_Percussion/04-Marching_Band.mscx
-share/mscore-3.5/templates/07-Band_and_Percussion/05-Small_Marching_Band.mscx
-share/mscore-3.5/templates/07-Band_and_Percussion/06-Battery_Percussion.mscx
-share/mscore-3.5/templates/07-Band_and_Percussion/07-Large_Pit_Percussion.mscx
-share/mscore-3.5/templates/07-Band_and_Percussion/08-Small_Pit_Percussion.mscx
-share/mscore-3.5/templates/07-Band_and_Percussion/09-European_Concert_Band.mscx
-share/mscore-3.5/templates/08-Orchestral/01-Classical_Orchestra.mscx
-share/mscore-3.5/templates/08-Orchestral/02-Symphony_Orchestra.mscx
-share/mscore-3.5/templates/08-Orchestral/03-String_Orchestra.mscx
-share/mscore-3.5/templates/drumset_fr.drm
-share/mscore-3.5/templates/orchestral.drm
-share/mscore-3.5/tours/autoplace.tour
-share/mscore-3.5/tours/inspector.tour
-share/mscore-3.5/tours/mmrest.tour
-share/mscore-3.5/tours/navigate.tour
-share/mscore-3.5/tours/noteinput.tour
-share/mscore-3.5/tours/palette.tour
-share/mscore-3.5/tours/select.tour
-share/mscore-3.5/tours/spanner-drop-apply.tour
-share/mscore-3.5/tours/timeline.tour
-share/mscore-3.5/tours/welcome.tour
-share/mscore-3.5/wallpaper/background1.png
-share/mscore-3.5/wallpaper/paper1.png
-share/mscore-3.5/wallpaper/paper2.png
-share/mscore-3.5/wallpaper/paper3.png
-share/mscore-3.5/wallpaper/paper4.png
-share/mscore-3.5/wallpaper/paper5.png
-share/mscore-3.5/wallpaper/paper6.png
-share/mscore-3.5/wallpaper/paper7.png
-share/mscore-3.5/workspaces/Advanced.workspace
-share/mscore-3.5/workspaces/Basic.workspace
+share/mscore-${PKGVERSION}/demos/Brassed_Up.mscx
+share/mscore-${PKGVERSION}/demos/Dawn.mscx
+share/mscore-${PKGVERSION}/demos/Dynamic_Strings.mscx
+share/mscore-${PKGVERSION}/demos/Fugue_1.mscx
+share/mscore-${PKGVERSION}/demos/Reunion.mscz
+share/mscore-${PKGVERSION}/demos/Unclaimed_Gift.mscx
+share/mscore-${PKGVERSION}/instruments/instruments.xml
+share/mscore-${PKGVERSION}/instruments/orders.xml
+share/mscore-${PKGVERSION}/locale/languages.xml
+share/mscore-${PKGVERSION}/locale/qt_ar.qm
+share/mscore-${PKGVERSION}/locale/qt_bg.qm
+share/mscore-${PKGVERSION}/locale/qt_ca.qm
+share/mscore-${PKGVERSION}/locale/qt_cs.qm
+share/mscore-${PKGVERSION}/locale/qt_da.qm
+share/mscore-${PKGVERSION}/locale/qt_de.qm
+share/mscore-${PKGVERSION}/locale/qt_es.qm
+share/mscore-${PKGVERSION}/locale/qt_fa.qm
+share/mscore-${PKGVERSION}/locale/qt_fi.qm
+share/mscore-${PKGVERSION}/locale/qt_fr.qm
+share/mscore-${PKGVERSION}/locale/qt_gd.qm
+share/mscore-${PKGVERSION}/locale/qt_gl.qm
+share/mscore-${PKGVERSION}/locale/qt_he.qm
+share/mscore-${PKGVERSION}/locale/qt_hu.qm
+share/mscore-${PKGVERSION}/locale/qt_it.qm
+share/mscore-${PKGVERSION}/locale/qt_ja.qm
+share/mscore-${PKGVERSION}/locale/qt_ko.qm
+share/mscore-${PKGVERSION}/locale/qt_lt.qm
+share/mscore-${PKGVERSION}/locale/qt_lv.qm
+share/mscore-${PKGVERSION}/locale/qt_pl.qm
+share/mscore-${PKGVERSION}/locale/qt_pt.qm
+share/mscore-${PKGVERSION}/locale/qt_ru.qm
+share/mscore-${PKGVERSION}/locale/qt_sk.qm
+share/mscore-${PKGVERSION}/locale/qt_sl.qm
+share/mscore-${PKGVERSION}/locale/qt_sv.qm
+share/mscore-${PKGVERSION}/locale/qt_tr.qm
+share/mscore-${PKGVERSION}/locale/qt_uk.qm
+share/mscore-${PKGVERSION}/locale/qt_zh_CN.qm
+share/mscore-${PKGVERSION}/locale/qt_zh_TW.qm
+share/mscore-${PKGVERSION}/locale/qtbase_ar.qm
+share/mscore-${PKGVERSION}/locale/qtbase_bg.qm
+share/mscore-${PKGVERSION}/locale/qtbase_ca.qm
+share/mscore-${PKGVERSION}/locale/qtbase_cs.qm
+share/mscore-${PKGVERSION}/locale/qtbase_da.qm
+share/mscore-${PKGVERSION}/locale/qtbase_de.qm
+share/mscore-${PKGVERSION}/locale/qtbase_en.qm
+share/mscore-${PKGVERSION}/locale/qtbase_es.qm
+share/mscore-${PKGVERSION}/locale/qtbase_fi.qm
+share/mscore-${PKGVERSION}/locale/qtbase_fr.qm
+share/mscore-${PKGVERSION}/locale/qtbase_gd.qm
+share/mscore-${PKGVERSION}/locale/qtbase_he.qm
+share/mscore-${PKGVERSION}/locale/qtbase_hu.qm
+share/mscore-${PKGVERSION}/locale/qtbase_it.qm
+share/mscore-${PKGVERSION}/locale/qtbase_ja.qm
+share/mscore-${PKGVERSION}/locale/qtbase_ko.qm
+share/mscore-${PKGVERSION}/locale/qtbase_lv.qm
+share/mscore-${PKGVERSION}/locale/qtbase_pl.qm
+share/mscore-${PKGVERSION}/locale/qtbase_ru.qm
+share/mscore-${PKGVERSION}/locale/qtbase_sk.qm
+share/mscore-${PKGVERSION}/locale/qtbase_tr.qm
+share/mscore-${PKGVERSION}/locale/qtbase_uk.qm
+share/mscore-${PKGVERSION}/locale/qtbase_zh_TW.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_ar.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_bg.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_ca.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_cs.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_da.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_de.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_en.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_es.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_fi.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_fr.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_hu.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_it.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_ja.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_ko.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_pl.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_ru.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_sk.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_tr.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_uk.qm
+share/mscore-${PKGVERSION}/locale/qtmultimedia_zh_TW.qm
+share/mscore-${PKGVERSION}/locale/qtscript_ar.qm
+share/mscore-${PKGVERSION}/locale/qtscript_bg.qm
+share/mscore-${PKGVERSION}/locale/qtscript_ca.qm
+share/mscore-${PKGVERSION}/locale/qtscript_cs.qm
+share/mscore-${PKGVERSION}/locale/qtscript_da.qm
+share/mscore-${PKGVERSION}/locale/qtscript_de.qm
+share/mscore-${PKGVERSION}/locale/qtscript_en.qm
+share/mscore-${PKGVERSION}/locale/qtscript_es.qm
+share/mscore-${PKGVERSION}/locale/qtscript_fi.qm
+share/mscore-${PKGVERSION}/locale/qtscript_fr.qm
+share/mscore-${PKGVERSION}/locale/qtscript_he.qm
+share/mscore-${PKGVERSION}/locale/qtscript_hu.qm
+share/mscore-${PKGVERSION}/locale/qtscript_it.qm
+share/mscore-${PKGVERSION}/locale/qtscript_ja.qm
+share/mscore-${PKGVERSION}/locale/qtscript_ko.qm
+share/mscore-${PKGVERSION}/locale/qtscript_lv.qm
+share/mscore-${PKGVERSION}/locale/qtscript_pl.qm
+share/mscore-${PKGVERSION}/locale/qtscript_ru.qm
+share/mscore-${PKGVERSION}/locale/qtscript_sk.qm
+share/mscore-${PKGVERSION}/locale/qtscript_tr.qm
+share/mscore-${PKGVERSION}/locale/qtscript_uk.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_bg.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_ca.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_cs.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_da.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_de.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_en.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_es.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_fr.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_hu.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_it.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_ja.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_ko.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_pl.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_ru.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_sk.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_uk.qm
+share/mscore-${PKGVERSION}/locale/qtxmlpatterns_zh_TW.qm
+share/mscore-${PKGVERSION}/plugins/abc_import.qml
+share/mscore-${PKGVERSION}/plugins/colornotes.qml
+share/mscore-${PKGVERSION}/plugins/createscore.qml
+share/mscore-${PKGVERSION}/plugins/helloqml/helloqml.qml
+share/mscore-${PKGVERSION}/plugins/helloqml/translations/locale_de.qm
+share/mscore-${PKGVERSION}/plugins/helloqml/translations/locale_de.ts
+share/mscore-${PKGVERSION}/plugins/notenames-interactive.qml
+share/mscore-${PKGVERSION}/plugins/notenames.qml
+share/mscore-${PKGVERSION}/plugins/panel.qml
+share/mscore-${PKGVERSION}/plugins/random.qml
+share/mscore-${PKGVERSION}/plugins/random2.qml
+share/mscore-${PKGVERSION}/plugins/run.qml
+share/mscore-${PKGVERSION}/plugins/scorelist.qml
+share/mscore-${PKGVERSION}/plugins/view.qml
+share/mscore-${PKGVERSION}/plugins/walk.qml
+share/mscore-${PKGVERSION}/sound/MuseScore_General.sf3
+share/mscore-${PKGVERSION}/sound/MuseScore_General_License.md
+share/mscore-${PKGVERSION}/styles/Leland.mss
+share/mscore-${PKGVERSION}/styles/MuseJazz.mss
+share/mscore-${PKGVERSION}/styles/cchords_muse.xml
+share/mscore-${PKGVERSION}/styles/cchords_nrb.xml
+share/mscore-${PKGVERSION}/styles/cchords_rb.xml
+share/mscore-${PKGVERSION}/styles/cchords_sym.xml
+share/mscore-${PKGVERSION}/styles/chords.xml
+share/mscore-${PKGVERSION}/styles/chords_jazz.xml
+share/mscore-${PKGVERSION}/styles/chords_std.xml
+share/mscore-${PKGVERSION}/styles/jazzchords.xml
+share/mscore-${PKGVERSION}/styles/legacy-style-defaults-v1.mss
+share/mscore-${PKGVERSION}/styles/legacy-style-defaults-v2.mss
+share/mscore-${PKGVERSION}/styles/legacy-style-defaults-v3.mss
+share/mscore-${PKGVERSION}/styles/stdchords.xml
+share/mscore-${PKGVERSION}/templates/01-General/00-Blank.mscx
+share/mscore-${PKGVERSION}/templates/01-General/01-Treble_Clef.mscx
+share/mscore-${PKGVERSION}/templates/01-General/02-Bass_Clef.mscx
+share/mscore-${PKGVERSION}/templates/01-General/03-Grand_Staff.mscx
+share/mscore-${PKGVERSION}/templates/02-Choral/01-SATB.mscx
+share/mscore-${PKGVERSION}/templates/02-Choral/02-SATB_+_Organ.mscx
+share/mscore-${PKGVERSION}/templates/02-Choral/03-SATB_+_Piano.mscx
+share/mscore-${PKGVERSION}/templates/02-Choral/04-SATB_Closed_Score.mscx
+share/mscore-${PKGVERSION}/templates/02-Choral/05-SATB_Closed_Score_+_Organ.mscx
+share/mscore-${PKGVERSION}/templates/02-Choral/06-SATB_Closed_Score_+_Piano.mscx
+share/mscore-${PKGVERSION}/templates/02-Choral/07-Voice_+_Piano.mscx
+share/mscore-${PKGVERSION}/templates/02-Choral/08-Barbershop_Quartet_(Men).mscx
+share/mscore-${PKGVERSION}/templates/02-Choral/09-Barbershop_Quartet_(Women).mscx
+share/mscore-${PKGVERSION}/templates/02-Choral/10-Liturgical_Unmetrical.mscx
+share/mscore-${PKGVERSION}/templates/02-Choral/11-Liturgical_Unmetrical_+_Organ.mscx
+share/mscore-${PKGVERSION}/templates/03-Chamber_Music/01-String_Quartet.mscx
+share/mscore-${PKGVERSION}/templates/03-Chamber_Music/02-Wind_Quartet.mscx
+share/mscore-${PKGVERSION}/templates/03-Chamber_Music/03-Wind_Quintet.mscx
+share/mscore-${PKGVERSION}/templates/03-Chamber_Music/04-Saxophone_Quartet.mscx
+share/mscore-${PKGVERSION}/templates/03-Chamber_Music/05-Brass_Quartet.mscx
+share/mscore-${PKGVERSION}/templates/03-Chamber_Music/06-Brass_Quintet.mscx
+share/mscore-${PKGVERSION}/templates/04-Solo/01-Guitar.mscx
+share/mscore-${PKGVERSION}/templates/04-Solo/02-Guitar_+_Tablature.mscx
+share/mscore-${PKGVERSION}/templates/04-Solo/03-Guitar_Tablature.mscx
+share/mscore-${PKGVERSION}/templates/04-Solo/04-Piano.mscx
+share/mscore-${PKGVERSION}/templates/05-Jazz/01-Jazz_Lead_Sheet.mscx
+share/mscore-${PKGVERSION}/templates/05-Jazz/02-Big_Band.mscx
+share/mscore-${PKGVERSION}/templates/05-Jazz/03-Jazz_Combo.mscx
+share/mscore-${PKGVERSION}/templates/06-Popular/01-Rock_Band.mscx
+share/mscore-${PKGVERSION}/templates/06-Popular/02-Bluegrass_Band.mscx
+share/mscore-${PKGVERSION}/templates/07-Band_and_Percussion/01-Concert_Band.mscx
+share/mscore-${PKGVERSION}/templates/07-Band_and_Percussion/02-Small_Concert_Band.mscx
+share/mscore-${PKGVERSION}/templates/07-Band_and_Percussion/03-Brass_Band.mscx
+share/mscore-${PKGVERSION}/templates/07-Band_and_Percussion/04-Marching_Band.mscx
+share/mscore-${PKGVERSION}/templates/07-Band_and_Percussion/05-Small_Marching_Band.mscx
+share/mscore-${PKGVERSION}/templates/07-Band_and_Percussion/06-Battery_Percussion.mscx
+share/mscore-${PKGVERSION}/templates/07-Band_and_Percussion/07-Large_Pit_Percussion.mscx
+share/mscore-${PKGVERSION}/templates/07-Band_and_Percussion/08-Small_Pit_Percussion.mscx
+share/mscore-${PKGVERSION}/templates/07-Band_and_Percussion/09-European_Concert_Band.mscx
+share/mscore-${PKGVERSION}/templates/08-Orchestral/01-Classical_Orchestra.mscx
+share/mscore-${PKGVERSION}/templates/08-Orchestral/02-Symphony_Orchestra.mscx
+share/mscore-${PKGVERSION}/templates/08-Orchestral/03-String_Orchestra.mscx
+share/mscore-${PKGVERSION}/templates/drumset_fr.drm
+share/mscore-${PKGVERSION}/templates/orchestral.drm
+share/mscore-${PKGVERSION}/tours/autoplace.tour
+share/mscore-${PKGVERSION}/tours/inspector.tour
+share/mscore-${PKGVERSION}/tours/mmrest.tour
+share/mscore-${PKGVERSION}/tours/navigate.tour
+share/mscore-${PKGVERSION}/tours/noteinput.tour
+share/mscore-${PKGVERSION}/tours/palette.tour
+share/mscore-${PKGVERSION}/tours/select.tour
+share/mscore-${PKGVERSION}/tours/spanner-drop-apply.tour
+share/mscore-${PKGVERSION}/tours/timeline.tour
+share/mscore-${PKGVERSION}/tours/welcome.tour
+share/mscore-${PKGVERSION}/wallpaper/background1.png
+share/mscore-${PKGVERSION}/wallpaper/paper1.png
+share/mscore-${PKGVERSION}/wallpaper/paper2.png
+share/mscore-${PKGVERSION}/wallpaper/paper3.png
+share/mscore-${PKGVERSION}/wallpaper/paper4.png
+share/mscore-${PKGVERSION}/wallpaper/paper5.png
+share/mscore-${PKGVERSION}/wallpaper/paper6.png
+share/mscore-${PKGVERSION}/wallpaper/paper7.png
+share/mscore-${PKGVERSION}/workspaces/Advanced.workspace
+share/mscore-${PKGVERSION}/workspaces/Basic.workspace
Index: pkgsrc/audio/musescore/distinfo
diff -u pkgsrc/audio/musescore/distinfo:1.7 pkgsrc/audio/musescore/distinfo:1.8
--- pkgsrc/audio/musescore/distinfo:1.7 Sun Oct 18 03:33:13 2020
+++ pkgsrc/audio/musescore/distinfo Mon Jan 25 02:42:44 2021
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.7 2020/10/18 03:33:13 gutteridge Exp $
+$NetBSD: distinfo,v 1.8 2021/01/25 02:42:44 gutteridge Exp $
-SHA1 (musescore-3.5.2.tar.gz) = 3ecd3da7a09911de675c084b85c4d7985ccabb1f
-RMD160 (musescore-3.5.2.tar.gz) = f429f54822d6b1828d1b6f496d677255b0cdf5d1
-SHA512 (musescore-3.5.2.tar.gz) = 4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
-Size (musescore-3.5.2.tar.gz) = 66326638 bytes
+SHA1 (musescore-3.6.tar.gz) = 51889db0ca0418362490be1982d880384207e991
+RMD160 (musescore-3.6.tar.gz) = 14a7740804f72a955f590ffad6ad282946f0129f
+SHA512 (musescore-3.6.tar.gz) = 7c2ee80239bb42581cabd92e47ac8654c65542297a58659a65543350784aed22ee90231ebd0f9c43140f67427690ade2e71fa4b6391d5fc9bb1fb14ba8790d19
+Size (musescore-3.6.tar.gz) = 67835667 bytes
SHA1 (patch-CMakeLists.txt) = 6685df7bb24d994ddc41c677b981f6abc44c8db1
-SHA1 (patch-build_Linux+BSD_portable_portable-utils.in) = a2af39d397a0be4ceb8f97fa7742a67d35d43f4c
+SHA1 (patch-build_FindQt5.cmake) = f764df0ce15eb0772ff671b2bef49fabee309be6
+SHA1 (patch-build_Linux+BSD_portable_portable-utils.in) = e608e0fb055671f863e24906ffffbe75a29948c4
+SHA1 (patch-libmscore_measure.cpp) = 86d3316ebd2a2c1001ed820a96ae8fcf2a306cab
Index: pkgsrc/audio/musescore/patches/patch-build_Linux+BSD_portable_portable-utils.in
diff -u pkgsrc/audio/musescore/patches/patch-build_Linux+BSD_portable_portable-utils.in:1.1 pkgsrc/audio/musescore/patches/patch-build_Linux+BSD_portable_portable-utils.in:1.2
--- pkgsrc/audio/musescore/patches/patch-build_Linux+BSD_portable_portable-utils.in:1.1 Fri Mar 13 07:46:11 2020
+++ pkgsrc/audio/musescore/patches/patch-build_Linux+BSD_portable_portable-utils.in Mon Jan 25 02:42:44 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_Linux+BSD_portable_portable-utils.in,v 1.1 2020/03/13 07:46:11 wiz Exp $
+$NetBSD: patch-build_Linux+BSD_portable_portable-utils.in,v 1.2 2021/01/25 02:42:44 gutteridge Exp $
Fix unportable test(1) operator.
---- build/Linux+BSD/portable/portable-utils.in.orig 2020-02-06 21:10:58.000000000 +0000
+--- build/Linux+BSD/portable/portable-utils.in.orig 2021-01-15 12:36:02.000000000 +0000
+++ build/Linux+BSD/portable/portable-utils.in
-@@ -51,7 +51,7 @@ EOF
+@@ -55,7 +55,7 @@ EOF
function printVersion() {
local pretty=$(sed -rn "s|^Name=([^#]*)|\1|p" "${APPDIR}/mscore@MSCORE_INSTALL_SUFFIX@.desktop")
local long=$("${APPDIR}/bin/mscore@MSCORE_INSTALL_SUFFIX@" --long-version 2>&1 | tail -n 1)
@@ -13,7 +13,7 @@ Fix unportable test(1) operator.
printf "%*s\n" "$(((${#pretty}+80)/2))" "$pretty"
printf "%*s\n" "$(((${#long}+80)/2))" "$long"
return
-@@ -62,7 +62,7 @@ function printVersion() {
+@@ -66,7 +66,7 @@ function printVersion() {
function readYes() {
read -s -n 1 answer
@@ -22,7 +22,7 @@ Fix unportable test(1) operator.
echo " N"
return 1
fi
-@@ -72,9 +72,9 @@ function readYes() {
+@@ -76,9 +76,9 @@ function readYes() {
function installResources() {
local interactive=""
@@ -34,7 +34,7 @@ Fix unportable test(1) operator.
interactive=true
shift
fi
-@@ -85,7 +85,7 @@ function installResources() {
+@@ -89,7 +89,7 @@ function installResources() {
local bin_str="PREFIX/bin"
local question="The default location might be better. Proceed anyway [Y/n]?"
local cancelled="Cancelled: rerun without a PREFIX to use the default."
@@ -43,7 +43,20 @@ Fix unportable test(1) operator.
# Running as root (sudo)
local prefix="/usr/local"
local bin="$prefix/bin"
-@@ -198,12 +198,12 @@ EOF
+@@ -210,10 +210,10 @@ EOF
+
+ function update() {
+ local interactive="" install=true
+- if [ "$1" == "-i" ]; then
++ if [ "$1" = "-i" ]; then
+ interactive="$1"
+ prefix="$2"
+- elif [ "$2" == "-i" ]; then
++ elif [ "$2" = "-i" ]; then
+ interactive="$2"
+ prefix="$1"
+ fi
+@@ -265,12 +265,12 @@ function doUpdate() {
}
function removeResources() {
@@ -52,13 +65,13 @@ Fix unportable test(1) operator.
if [ "$1" != "" ]; then
# User specified a directory
prefix="$1"
- echo -n "Remove resources from ${prefix} [Y/n]?"
+ echo -n "Remove MuseScore resources from ${prefix} [Y/n]?"
- elif [ "${EUID}" == "0" ]; then
+ elif [ "${EUID}" = "0" ]; then
prefix=/usr/local
echo -n "Running as root. Remove MuseScore resources from '$prefix' for all users [Y/n]?"
else
-@@ -235,7 +235,7 @@ function checkDependencies() {
+@@ -303,7 +303,7 @@ function checkDependencies() {
echo "AppImage contains ${num_exes} executables and ${num_libs} libraries." >&2
@@ -67,7 +80,7 @@ Fix unportable test(1) operator.
echo "Checking dependencies for executables..." >&2
include_libs=""
num_includes="${num_exes}"
-@@ -317,7 +317,7 @@ $1. Things to check:
+@@ -392,7 +392,7 @@ $1. Things to check:
- do the files and/or directories exist?
- do you have the right privileges?
EOF
Added files:
Index: pkgsrc/audio/musescore/patches/patch-build_FindQt5.cmake
diff -u /dev/null pkgsrc/audio/musescore/patches/patch-build_FindQt5.cmake:1.1
--- /dev/null Mon Jan 25 02:42:44 2021
+++ pkgsrc/audio/musescore/patches/patch-build_FindQt5.cmake Mon Jan 25 02:42:44 2021
@@ -0,0 +1,22 @@
+$NetBSD: patch-build_FindQt5.cmake,v 1.1 2021/01/25 02:42:44 gutteridge Exp $
+
+Upstream fix: don't disable Qt 5.15 for 3.x
+https://github.com/musescore/MuseScore/commit/28aa7ba50a7d26b7c55728a86e5a6ccff7bf9fbb
+
+--- build/FindQt5.cmake.orig 2021-01-15 12:36:02.000000000 +0000
++++ build/FindQt5.cmake
+@@ -36,14 +36,6 @@ if (WIN32)
+ )
+ endif(WIN32)
+
+-# For Windows, because of these lines, for some unknown reason, the build of the .msi package fails.
+-if(NOT ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
+- find_package(Qt5Core 5.15.0 QUIET)
+- if (Qt5Core_FOUND)
+- message(FATAL_ERROR "MuseScore 3 does not support Qt 5.15: 5.15.0 shows empty palettes panel, 5.15.1 and later crash when opening pre-3.6 scores due to QTBUG-77337")
+- endif()
+-endif()
+-
+ find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED)
+
+ foreach(_component ${_components})
Index: pkgsrc/audio/musescore/patches/patch-libmscore_measure.cpp
diff -u /dev/null pkgsrc/audio/musescore/patches/patch-libmscore_measure.cpp:1.1
--- /dev/null Mon Jan 25 02:42:44 2021
+++ pkgsrc/audio/musescore/patches/patch-libmscore_measure.cpp Mon Jan 25 02:42:44 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-libmscore_measure.cpp,v 1.1 2021/01/25 02:42:44 gutteridge Exp $
+
+Upstream fix for bug #315529: crash on load of score with repeat
+https://github.com/musescore/MuseScore/commit/39b6a58b0c028e16d5a4e69d8d99aa9f069bfe11
+
+--- libmscore/measure.cpp.orig 2021-01-15 12:36:02.000000000 +0000
++++ libmscore/measure.cpp
+@@ -2897,7 +2897,7 @@ bool Measure::isCutawayClef(int staffIdx
+ etrack = strack + VOICES;
+ }
+ // find segment before EndBarLine
+- Segment* s;
++ Segment* s = nullptr;
+ for (Segment* ls = last(); ls; ls = ls->prev()) {
+ if (ls->segmentType() == SegmentType::EndBarLine) {
+ s = ls->prev();
Home |
Main Index |
Thread Index |
Old Index