/[packages]/backports/7/mscore/current/SOURCES/mscore-3.3.0-separate-commonfiles.patch
ViewVC logotype

Contents of /backports/7/mscore/current/SOURCES/mscore-3.3.0-separate-commonfiles.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1458677 - (show annotations) (download)
Thu Nov 7 15:00:24 2019 UTC (4 years, 5 months ago) by daviddavid
File size: 10470 byte(s)
- fix mscore data dir for "/usr/share/mscore-3.3/"

1 diff -Nrup a/libmscore/figuredbass.cpp b/libmscore/figuredbass.cpp
2 --- a/libmscore/figuredbass.cpp 2019-10-31 11:27:44.000000000 +0100
3 +++ b/libmscore/figuredbass.cpp 2019-11-02 19:09:31.271074672 +0100
4 @@ -1626,7 +1626,7 @@ bool FiguredBass::readConfigFile(const Q
5 path = rpath + QString("/fonts_figuredbass.xml");
6 }
7 #else
8 - path = ":/fonts/fonts_figuredbass.xml";
9 + path = "/usr/share/fonts/mscore/fonts_figuredbass.xml";
10 #endif
11 g_FBFonts.clear();
12 }
13 diff -Nrup a/libmscore/mscore.cpp b/libmscore/mscore.cpp
14 --- a/libmscore/mscore.cpp 2019-10-31 11:27:44.000000000 +0100
15 +++ b/libmscore/mscore.cpp 2019-11-02 19:11:43.534196815 +0100
16 @@ -346,18 +346,18 @@ void MScore::init()
17 //
18 #if !defined(Q_OS_MAC) && !defined(Q_OS_IOS)
19 static const char* fonts[] = {
20 - ":/fonts/musejazz/MuseJazzText.otf",
21 - ":/fonts/campania/Campania.otf",
22 - ":/fonts/FreeSans.ttf",
23 - ":/fonts/FreeSerif.ttf",
24 - ":/fonts/FreeSerifBold.ttf",
25 - ":/fonts/FreeSerifItalic.ttf",
26 - ":/fonts/FreeSerifBoldItalic.ttf",
27 - ":/fonts/mscoreTab.ttf",
28 - ":/fonts/mscore-BC.ttf",
29 - ":/fonts/bravura/BravuraText.otf",
30 - ":/fonts/gootville/GootvilleText.otf",
31 - ":/fonts/mscore/MScoreText.ttf",
32 + "/usr/share/fonts/mscore/musejazz/MuseJazzText.otf",
33 + "/usr/share/fonts/mscore/campania/Campania.otf",
34 + "/usr/share/fonts/mscore/FreeSans.ttf",
35 + "/usr/share/fonts/mscore/FreeSerif.ttf",
36 + "/usr/share/fonts/mscore/FreeSerifBold.ttf",
37 + "/usr/share/fonts/mscore/FreeSerifItalic.ttf",
38 + "/usr/share/fonts/mscore/FreeSerifBoldItalic.ttf",
39 + "/usr/share/fonts/mscore/mscoreTab.ttf",
40 + "/usr/share/fonts/mscore/mscore-BC.ttf",
41 + "/usr/share/fonts/mscore/bravura/BravuraText.otf",
42 + "/usr/share/fonts/mscore/gootville/GootvilleText.otf",
43 + "/usr/share/fonts/mscore/MScoreText.ttf",
44 };
45
46 for (unsigned i = 0; i < sizeof(fonts)/sizeof(*fonts); ++i) {
47 diff -Nrup a/libmscore/stafftype.cpp b/libmscore/stafftype.cpp
48 --- a/libmscore/stafftype.cpp 2019-10-31 11:27:44.000000000 +0100
49 +++ b/libmscore/stafftype.cpp 2019-11-02 19:12:22.944528072 +0100
50 @@ -1199,7 +1199,7 @@ bool StaffType::readConfigFile(const QSt
51 path = rpath + QString("/fonts_tablature.xml");
52 }
53 #else
54 - path = ":/fonts/fonts_tablature.xml";
55 + path = "/usr/share/fonts/mscore/fonts_tablature.xml";
56 #endif
57 _durationFonts.clear();
58 _fretFonts.clear();
59 diff -Nrup a/libmscore/sym.cpp b/libmscore/sym.cpp
60 --- a/libmscore/sym.cpp 2019-10-31 11:27:44.000000000 +0100
61 +++ b/libmscore/sym.cpp 2019-11-02 19:36:58.965516472 +0100
62 @@ -34,10 +34,10 @@ namespace Ms {
63 static const int FALLBACK_FONT = 0; // Bravura
64
65 QVector<ScoreFont> ScoreFont::_scoreFonts {
66 - ScoreFont("Bravura", "Bravura", ":/fonts/bravura/", "Bravura.otf" ),
67 - ScoreFont("Emmentaler", "MScore", ":/fonts/mscore/", "mscore.ttf" ),
68 - ScoreFont("Gonville", "Gootville", ":/fonts/gootville/", "Gootville.otf" ),
69 - ScoreFont("MuseJazz", "MuseJazz", ":/fonts/musejazz/", "MuseJazz.otf" ),
70 + ScoreFont("Bravura", "Bravura", INSTPREFIX "/share/fonts/mscore/bravura/", "Bravura.otf" ),
71 + ScoreFont("Emmentaler", "MScore", INSTPREFIX "/share/fonts/mscore/", "mscore.ttf" ),
72 + ScoreFont("Gonville", "Gootville", INSTPREFIX "/share/fonts/mscore/gootville/", "Gootville.otf" ),
73 + ScoreFont("MuseJazz", "MuseJazz", INSTPREFIX "/share/fonts/mscore/musejazz/", "MuseJazz.otf" ),
74 };
75
76 std::array<uint, size_t(SymId::lastSym)+1> ScoreFont::_mainSymCodeTable { {0} };
77 diff -Nrup a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
78 --- a/mscore/CMakeLists.txt 2019-10-31 11:27:44.000000000 +0100
79 +++ b/mscore/CMakeLists.txt 2019-11-02 19:37:47.232904145 +0100
80 @@ -738,21 +738,6 @@ if (MINGW)
81 else (MINGW)
82
83 if ( NOT MSVC )
84 -## install qwebengine core
85 - if (NOT APPLE AND USE_WEBENGINE)
86 - install(FILES
87 - ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
88 - DESTINATION bin
89 - )
90 - install(DIRECTORY
91 - ${QT_INSTALL_DATA}/resources
92 - DESTINATION lib/qt5
93 - )
94 - install(DIRECTORY
95 - ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
96 - DESTINATION lib/qt5/translations
97 - )
98 - endif(NOT APPLE AND USE_WEBENGINE)
99
100 target_link_libraries(mscore
101 ${ALSA_LIB}
102 diff -Nrup a/mscore/musescore.cpp b/mscore/musescore.cpp
103 --- a/mscore/musescore.cpp 2019-10-31 11:27:44.000000000 +0100
104 +++ b/mscore/musescore.cpp 2019-11-02 19:38:23.256193367 +0100
105 @@ -3455,7 +3455,7 @@ static void loadScores(const QStringList
106 score->setCreated(true);
107 }
108 if (score == 0) {
109 - score = mscore->readScore(":/data/My_First_Score.mscx");
110 + score = mscore->readScore("/usr/share/mscore-3.3/demos/My_First_Score.mscx");
111 if (score) {
112 score->setStyle(MScore::defaultStyle());
113 score->style().checkChordList();
114 diff -Nrup a/mscore/musescore.qrc b/mscore/musescore.qrc
115 --- a/mscore/musescore.qrc 2019-10-31 11:27:44.000000000 +0100
116 +++ b/mscore/musescore.qrc 2019-11-02 19:39:34.830767780 +0100
117 @@ -1,24 +1,15 @@
118 <RCC>
119 <qresource prefix="/">
120 <file>data/icons/edit.svg</file>
121 - <file alias="fonts/mscore/metadata.json">../fonts/mscore/metadata.json</file>
122 - <file alias="fonts/gootville/metadata.json">../fonts/gootville/metadata.json</file>
123 - <file alias="fonts/bravura/metadata.json">../fonts/bravura/metadata.json</file>
124 - <file alias="fonts/musejazz/metadata.json">../fonts/musejazz/metadata.json</file>
125 <file alias="fonts/smufl/classes.json">../fonts/smufl/classes.json</file>
126 <file alias="fonts/smufl/ranges.json">../fonts/smufl/ranges.json</file>
127 <file alias="fonts/smufl/glyphnames.json">../fonts/smufl/glyphnames.json</file>
128 - <file alias="fonts/fonts_tablature.xml">../fonts/fonts_tablature.xml</file>
129 - <file alias="fonts/fonts_figuredbass.xml">../fonts/fonts_figuredbass.xml</file>
130 - <file alias="data/instruments.xml">../share/instruments/instruments.xml</file>
131 <file alias="themes/style_light_fusion.css">../share/themes/style_light_fusion.css</file>
132 <file alias="themes/style_dark_fusion.css">../share/themes/style_dark_fusion.css</file>
133 <file alias="themes/palette_light_fusion.json">../share/themes/palette_light_fusion.json</file>
134 <file alias="themes/palette_dark_fusion.json">../share/themes/palette_dark_fusion.json</file>
135 <file>data/splash.png</file>
136 <file>data/splash@2x.png</file>
137 - <file alias="data/My_First_Score.mscx">../share/templates/My_First_Score.mscx</file>
138 - <file alias="data/Create_New_Score.mscz">../share/templates/Create_New_Score.mscz</file>
139 <file alias="data/Empty_Score.mscx">../share/templates/01-General/00-Blank.mscx</file>
140 <file>data/tab_sample.mscx</file>
141 <file>data/std_sample.mscx</file>
142 diff -Nrup a/mscore/preferences.cpp b/mscore/preferences.cpp
143 --- a/mscore/preferences.cpp 2019-10-31 11:27:44.000000000 +0100
144 +++ b/mscore/preferences.cpp 2019-11-02 19:40:29.786208622 +0100
145 @@ -84,7 +84,7 @@ void Preferences::init(bool storeInMemor
146 {PREF_APP_AUTOSAVE_AUTOSAVETIME, new IntPreference(2 /* minutes */, false)},
147 {PREF_APP_AUTOSAVE_USEAUTOSAVE, new BoolPreference(true, false)},
148 {PREF_APP_KEYBOARDLAYOUT, new StringPreference("US - International")},
149 - {PREF_APP_PATHS_INSTRUMENTLIST1, new StringPreference(":/data/instruments.xml", false)},
150 + {PREF_APP_PATHS_INSTRUMENTLIST1, new StringPreference("/usr/share/mscore-3.3/instruments/instruments.xml", false)},
151 {PREF_APP_PATHS_INSTRUMENTLIST2, new StringPreference("", false)},
152 {PREF_APP_PATHS_MYIMAGES, new StringPreference(QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("images_directory", "Images"))).absoluteFilePath(), false)},
153 {PREF_APP_PATHS_MYPLUGINS, new StringPreference(QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("plugins_directory", "Plugins"))).absoluteFilePath(), false)},
154 @@ -101,7 +101,7 @@ void Preferences::init(bool storeInMemor
155 {PREF_APP_USESINGLEPALETTE, new BoolPreference(false)},
156 {PREF_APP_STARTUP_FIRSTSTART, new BoolPreference(true)},
157 {PREF_APP_STARTUP_SESSIONSTART, new EnumPreference(QVariant::fromValue(SessionStart::SCORE), false)},
158 - {PREF_APP_STARTUP_STARTSCORE, new StringPreference(":/data/My_First_Score.mscx", false)},
159 + {PREF_APP_STARTUP_STARTSCORE, new StringPreference("/usr/share/mscore-3.3/demos/My_First_Score.mscx", false)},
160 {PREF_UI_APP_STARTUP_SHOWTOURS, new BoolPreference(true)},
161 {PREF_APP_WORKSPACE, new StringPreference("Basic", false)},
162 {PREF_EXPORT_AUDIO_NORMALIZE, new BoolPreference(true)},
163 diff -Nrup a/mscore/startcenter.cpp b/mscore/startcenter.cpp
164 --- a/mscore/startcenter.cpp 2019-10-31 11:27:44.000000000 +0100
165 +++ b/mscore/startcenter.cpp 2019-11-02 19:40:53.208396464 +0100
166 @@ -148,7 +148,7 @@ void Startcenter::closeEvent(QCloseEvent
167 void Startcenter::updateRecentScores()
168 {
169 QFileInfoList fil = mscore->recentScores();
170 - QFileInfo newScore(":/data/Create_New_Score.mscz");
171 + QFileInfo newScore("/usr/share/mscore-3.3/demos/Create_New_Score.mscz");
172 fil.prepend(newScore);
173 recentPage->setScores(fil);
174 recentPage->selectFirst();

  ViewVC Help
Powered by ViewVC 1.1.30