diff -rupN mscore-1.2.old/mscore/mscore/mscore.cpp mscore-1.2/mscore/mscore/mscore.cpp --- mscore-1.2.old/mscore/mscore/mscore.cpp 2012-03-13 09:32:27.000000000 -0400 +++ mscore-1.2/mscore/mscore/mscore.cpp 2012-03-13 20:02:36.567600415 -0400 @@ -1890,7 +1890,7 @@ int main(int argc, char* av[]) if (!useFactorySettings) preferences.read(); else { - preferences.soundFont = mscoreGlobalShare+"sound/TimGM6mb.sf2"; + preferences.soundFont = QString(INSTPREFIX "/share/soundfonts/default.sf2"); } preferences.useOsc = useOsc; @@ -3302,4 +3302,4 @@ void MuseScore::closeScore(Score* score) removeTab(scoreList.indexOf(score)); } - \ No newline at end of file + diff -rupN mscore-1.2.old/mscore/mscore/preferences.cpp mscore-1.2/mscore/mscore/preferences.cpp --- mscore-1.2.old/mscore/mscore/preferences.cpp 2012-03-13 09:32:27.000000000 -0400 +++ mscore-1.2/mscore/mscore/preferences.cpp 2012-03-13 20:03:29.356330044 -0400 @@ -366,12 +366,8 @@ void Preferences::read() playNotes = s.value("playNotes", true).toBool(); lPort = s.value("lPort").toString(); rPort = s.value("rPort").toString(); - defaultSoundfont = mscoreGlobalShare+"sound/TimGM6mb.sf2"; + defaultSoundfont = QString(INSTPREFIX "/share/soundfonts/default.sf2"); soundFont = s.value("soundFont", defaultSoundfont).toString(); - if (soundFont == ":/data/piano1.sf2") { - // silently change to new default sound font - soundFont = defaultSoundfont; - } showNavigator = s.value("showNavigator", true).toBool(); showStatusBar = s.value("showStatusBar", true).toBool(); showPlayPanel = s.value("showPlayPanel", false).toBool(); diff -rupN mscore-1.2.old/mscore/share/sound/CMakeLists.txt mscore-1.2/mscore/share/sound/CMakeLists.txt --- mscore-1.2.old/mscore/share/sound/CMakeLists.txt 2012-03-13 09:33:02.000000000 -0400 +++ mscore-1.2/mscore/share/sound/CMakeLists.txt 2012-03-13 20:04:10.708118240 -0400 @@ -20,6 +20,6 @@ install(FILES TimGM6mb.sf2 - DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}sound + DESTINATION ${Mscore_SHARE_NAME}/soundfonts )