Fix GH#698: Mac build doesn't start due to missing fonts

Jojo-Schmitz · Dec 26, 2024 · 6657168 · 6657168
1 parent 31dbf79
commit 6657168
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/libmscore/sym.cpp b/libmscore/sym.cpp
@@ -6676,7 +6676,7 @@ void ScoreFont::scanUserFonts(const QString& path, bool system)
             QString s(f._fontPath + f._filename);
             if (-1 == QFontDatabase::addApplicationFont(s)) {
                   if (!MScore::testMode)
-                        qDebug("Mscore: fatal error: cannot load external font <%s>", qPrintable(s));
+                        qDebug("Mscore: fatal error: cannot load font <%s>", qPrintable(s));
                   if (!MScore::debugMode && !MScore::testMode)
                         exit(-1);
                   }

diff --git a/mscore/musescore.qrc b/mscore/musescore.qrc
@@ -7,12 +7,14 @@
         <file alias="styles/legacy-style-defaults-v3.mss">../share/styles/legacy-style-defaults-v3.mss</file>
         <file alias="styles/legacy-style-defaults-v2.mss">../share/styles/legacy-style-defaults-v2.mss</file>
         <file alias="styles/legacy-style-defaults-v1.mss">../share/styles/legacy-style-defaults-v1.mss</file>
-        <file alias="fonts/mscore/metadata.json">../fonts/mscore/metadata.json</file>
-        <file alias="fonts/gootville/metadata.json">../fonts/gootville/metadata.json</file>
         <file alias="fonts/leland/metadata.json">../fonts/leland/leland_metadata.json</file>
         <file alias="fonts/bravura/metadata.json">../fonts/bravura/bravura_metadata.json</file>
+        <file alias="fonts/mscore/metadata.json">../fonts/mscore/metadata.json</file>
+        <file alias="fonts/gootville/metadata.json">../fonts/gootville/metadata.json</file>
         <file alias="fonts/musejazz/metadata.json">../fonts/musejazz/metadata.json</file>
         <file alias="fonts/petaluma/metadata.json">../fonts/petaluma/petaluma_metadata.json</file>
+        <file alias="fonts/finalemaestro/metadata.json">../fonts/finalemaestro/FinaleMaestro.json</file>
+        <file alias="fonts/finalebroadway/metedata.json">../fonts/finalebroadway/FinaleBroadway.json</file>
         <file alias="fonts/smufl/classes.json">../fonts/smufl/classes.json</file>
         <file alias="fonts/smufl/ranges.json">../fonts/smufl/ranges.json</file>
         <file alias="fonts/smufl/glyphnames.json">../fonts/smufl/glyphnames.json</file>

diff --git a/mscore/musescorefonts-Mac.qrc b/mscore/musescorefonts-Mac.qrc
@@ -1,10 +1,12 @@
 <RCC>
     <qresource prefix="/">
         <file alias="fonts/leland/Leland.otf">../fonts/leland/Leland.otf</file>
+        <file alias="fonts/bravura/Bravura.otf">../fonts/bravura/Bravura.otf</file>
         <file alias="fonts/mscore/mscore.ttf">../fonts/mscore/mscore.ttf</file>
         <file alias="fonts/gootville/Gootville.otf">../fonts/gootville/Gootville.otf</file>
-        <file alias="fonts/bravura/Bravura.otf">../fonts/bravura/Bravura.otf</file>
         <file alias="fonts/musejazz/MuseJazz.otf">../fonts/musejazz/MuseJazz.otf</file>
         <file alias="fonts/petaluma/Petaluma.otf">../fonts/petaluma/Petaluma.otf</file>
+        <file alias="fonts/finalemaestro/FinaleMaestro.otf">../fonts/finalemaestro/FinaleMaestro.otf</file>
+        <file alias="fonts/finalebroadway/FinaleBroadway.otf">../fonts/finalebroadway/FinaleBroadway.otf</file>
         </qresource>
 </RCC>