Blob Blame History Raw
--- MuseScore-3.5.2/mscore/musescorefonts-Bravura.qrc.orig	2020-10-16 15:14:42.000000000 -0600
+++ MuseScore-3.5.2/mscore/musescorefonts-Bravura.qrc	2020-10-23 10:31:48.583156882 -0600
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="fonts/bravura/Bravura.otf">../fonts/bravura/Bravura.otf</file>
-        <file alias="fonts/bravura/BravuraText.otf">../fonts/bravura/BravuraText.otf</file>
+        <file alias="fonts/bravura/Bravura.otf">/usr/share/fonts/steinberg-bravura-fonts/Bravura.otf</file>
+        <file alias="fonts/bravura/BravuraText.otf">/usr/share/fonts/steinberg-bravuratext-fonts/BravuraText.otf</file>
 	    </qresource>
 </RCC>
--- MuseScore-3.5.2/mscore/musescorefonts-Campania.qrc.orig	2020-10-16 15:14:42.000000000 -0600
+++ MuseScore-3.5.2/mscore/musescorefonts-Campania.qrc	2020-10-23 10:31:48.584156880 -0600
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="fonts/campania/Campania.otf">../fonts/campania/Campania.otf</file>
+        <file alias="fonts/campania/Campania.otf">/usr/share/fonts/marcsabatella-campania-fonts/Campania.otf</file>
 	    </qresource>
 </RCC>
--- MuseScore-3.5.2/mscore/musescorefonts-Free.qrc.orig	2020-10-16 15:14:42.000000000 -0600
+++ MuseScore-3.5.2/mscore/musescorefonts-Free.qrc	2020-10-23 10:31:48.585156878 -0600
@@ -1,8 +1,8 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="fonts/FreeSerifBold.ttf">../fonts/FreeSerifBold.ttf</file>
-        <file alias="fonts/FreeSerifItalic.ttf">../fonts/FreeSerifItalic.ttf</file>
-        <file alias="fonts/FreeSerifBoldItalic.ttf">../fonts/FreeSerifBoldItalic.ttf</file>
-        <file alias="fonts/FreeSans.ttf">../fonts/FreeSans.ttf</file>
+        <file alias="fonts/FreeSerifBold.ttf">/usr/share/fonts/gnu-free/FreeSerifBold.ttf</file>
+        <file alias="fonts/FreeSerifItalic.ttf">/usr/share/fonts/gnu-free/FreeSerifItalic.ttf</file>
+        <file alias="fonts/FreeSerifBoldItalic.ttf">/usr/share/fonts/gnu-free/FreeSerifBoldItalic.ttf</file>
+        <file alias="fonts/FreeSans.ttf">/usr/share/fonts/gnu-free/FreeSans.ttf</file>
 	    </qresource>
 </RCC>
--- MuseScore-3.5.2/mscore/musescorefonts-FreeSerif.qrc.orig	2020-10-16 15:14:42.000000000 -0600
+++ MuseScore-3.5.2/mscore/musescorefonts-FreeSerif.qrc	2020-10-23 10:31:48.585156878 -0600
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="fonts/FreeSerif.ttf">../fonts/FreeSerif.ttf</file>
+        <file alias="fonts/FreeSerif.ttf">/usr/share/fonts/gnu-free/FreeSerif.ttf</file>
 	    </qresource>
 </RCC>
--- MuseScore-3.5.2/mscore/musescorefonts-Gootville.qrc.orig	2020-10-16 15:14:42.000000000 -0600
+++ MuseScore-3.5.2/mscore/musescorefonts-Gootville.qrc	2020-10-23 11:28:32.546568047 -0600
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="fonts/gootville/Gootville.otf">../fonts/gootville/Gootville.otf</file>
-        <file alias="fonts/gootville/GootvilleText.otf">../fonts/gootville/GootvilleText.otf</file>
+        <file alias="fonts/gootville/Gootville.otf">../fonts/mscore-gootville-fonts/Gootville.otf</file>
+        <file alias="fonts/gootville/GootvilleText.otf">../fonts/mscore-gootville-fonts/GootvilleText.otf</file>
 	    </qresource>
 </RCC>
--- MuseScore-3.5.2/mscore/musescorefonts-MScore.qrc.orig	2020-10-16 15:14:42.000000000 -0600
+++ MuseScore-3.5.2/mscore/musescorefonts-MScore.qrc	2020-10-23 11:30:55.289332582 -0600
@@ -1,8 +1,8 @@
 <RCC>
     <qresource prefix="/">
-	    <file alias="fonts/mscore/mscore.ttf">../fonts/mscore/mscore.ttf</file>
-        <file alias="fonts/mscore/MScoreText.ttf">../fonts/mscore/MScoreText.ttf</file>
-        <file alias="fonts/mscoreTab.ttf">../fonts/mscoreTab.ttf</file>
-        <file alias="fonts/mscore-BC.ttf">../fonts/mscore-BC.ttf</file>
+        <file alias="fonts/mscore/mscore.ttf">../fonts/mscore-fonts/mscore.ttf</file>
+        <file alias="fonts/mscore/MScoreText.ttf">../fonts/mscore-mscoretext-fonts/MScoreText.ttf</file>
+        <file alias="fonts/mscoreTab.ttf">../fonts/mscore-mscoretab-fonts/mscoreTab.ttf</file>
+        <file alias="fonts/mscore-BC.ttf">../fonts/mscore-bc-fonts/mscore-BC.ttf</file>
 	    </qresource>
 </RCC>
--- MuseScore-3.5.2/mscore/musescorefonts-MuseJazz.qrc.orig	2020-10-16 15:14:42.000000000 -0600
+++ MuseScore-3.5.2/mscore/musescorefonts-MuseJazz.qrc	2020-10-23 11:31:49.480243166 -0600
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="fonts/musejazz/MuseJazz.otf">../fonts/musejazz/MuseJazz.otf</file>
-        <file alias="fonts/musejazz/MuseJazzText.otf">../fonts/musejazz/MuseJazzText.otf</file>
+        <file alias="fonts/musejazz/MuseJazz.otf">../fonts/mscore-musejazz-fonts/MuseJazz.otf</file>
+        <file alias="fonts/musejazz/MuseJazzText.otf">../fonts/mscore-musejazz-fonts/MuseJazzText.otf</file>
 	    </qresource>
 </RCC>
--- MuseScore-3.5.2/mscore/musescore.h.orig	2020-10-16 15:14:42.000000000 -0600
+++ MuseScore-3.5.2/mscore/musescore.h	2020-10-23 10:31:48.586156877 -0600
@@ -22,7 +22,7 @@
 
 #include "config.h"
 #include "globals.h"
-#include "singleapp/src/QtSingleApplication"
+#include <QtSolutions/QtSingleApplication>
 #include "updatechecker.h"
 #include "libmscore/musescoreCore.h"
 #include "libmscore/score.h"
--- MuseScore-3.5.2/mscore/musescore.qrc.orig	2020-10-16 15:14:42.000000000 -0600
+++ MuseScore-3.5.2/mscore/musescore.qrc	2020-11-10 16:27:13.375946461 -0700
@@ -1,15 +1,15 @@
 <RCC>
     <qresource prefix="/">
         <file>data/icons/edit.svg</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/bravura/metadata.json">../fonts/bravura/metadata.json</file>
-        <file alias="fonts/musejazz/metadata.json">../fonts/musejazz/metadata.json</file>
+        <file alias="fonts/mscore/metadata.json">../fonts/mscore-fonts/metadata.json</file>
+        <file alias="fonts/gootville/metadata.json">../fonts/mscore-gootville-fonts/metadata.json</file>
+        <file alias="fonts/bravura/metadata.json">/usr/share/fonts/steinberg-bravura-fonts/metadata.json</file>
+        <file alias="fonts/musejazz/metadata.json">../fonts/mscore-musejazz-fonts/metadata.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>
-        <file alias="fonts/fonts_tablature.xml">../fonts/fonts_tablature.xml</file>
-        <file alias="fonts/fonts_figuredbass.xml">../fonts/fonts_figuredbass.xml</file>
+        <file alias="fonts/fonts_tablature.xml">../fonts/mscore-mscoretab-fonts/fonts_tablature.xml</file>
+        <file alias="fonts/fonts_figuredbass.xml">../fonts/mscore-bc-fonts/fonts_figuredbass.xml</file>
         <file alias="data/instruments.xml">../share/instruments/instruments.xml</file>
         <file alias="themes/style_light_fusion.css">../share/themes/style_light_fusion.css</file>
         <file alias="themes/style_dark_fusion.css">../share/themes/style_dark_fusion.css</file>
--- MuseScore-3.5.2/mtest/mtest.qrc.orig	2020-10-16 15:14:42.000000000 -0600
+++ MuseScore-3.5.2/mtest/mtest.qrc	2020-11-10 16:28:30.431106473 -0700
@@ -1,13 +1,13 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
    <qresource prefix="/">
-      <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/bravura/metadata.json">../fonts/bravura/metadata.json</file>
-      <file alias="fonts/musejazz/metadata.json">../fonts/musejazz/metadata.json</file>
+      <file alias="fonts/mscore/metadata.json">../fonts/mscore-fonts/metadata.json</file>
+      <file alias="fonts/gootville/metadata.json">../fonts/mscore-gootville-fonts/metadata.json</file>
+      <file alias="fonts/bravura/metadata.json">/usr/share/fonts/steinberg-bravura-fonts/metadata.json</file>
+      <file alias="fonts/musejazz/metadata.json">../fonts/mscore-musejazz-fonts/metadata.json</file>
       <file alias="fonts/smufl/glyphnames.json">../fonts/smufl/glyphnames.json</file>
-      <file alias="fonts/fonts_tablature.xml">../fonts/fonts_tablature.xml</file>
-      <file alias="fonts/fonts_figuredbass.xml">../fonts/fonts_figuredbass.xml</file>
+      <file alias="fonts/fonts_tablature.xml">../fonts/mscore-mscoretab-fonts/fonts_tablature.xml</file>
+      <file alias="fonts/fonts_figuredbass.xml">../fonts/mscore-bc-fonts/fonts_figuredbass.xml</file>
 
       <file alias="instruments.xml">../share/instruments/instruments.xml</file>