diff -rupN rosegarden-10.02.old/data/data.qrc rosegarden-10.02/data/data.qrc --- rosegarden-10.02.old/data/data.qrc 2010-02-13 20:53:39.000000000 -0500 +++ rosegarden-10.02/data/data.qrc 2010-02-17 22:43:22.000000000 -0500 @@ -10,9 +10,6 @@ running: DO NOT EDIT THIS FILE BY HAND! All changes will be LOST! --> -./fonts/LilyPond-feta-design20.pfa -./fonts/LilyPond-feta-nummer-design10.pfa -./fonts/LilyPond-parmesan-design20.pfa ./pixmaps/icons/audio-nok.png ./pixmaps/icons/audio-ok.png ./pixmaps/icons/midi-nok.png diff -rupN rosegarden-10.02.old/scripts/rebuild-qrc rosegarden-10.02/scripts/rebuild-qrc --- rosegarden-10.02.old/scripts/rebuild-qrc 2010-02-13 20:52:50.000000000 -0500 +++ rosegarden-10.02/scripts/rebuild-qrc 2010-02-17 22:09:46.000000000 -0500 @@ -60,7 +60,7 @@ DO NOT EDIT THIS FILE BY HAND! All chan EOF -for ext in pfa png ts qss rc rg rgd rgp rgt xml xpm; do +for ext in png ts qss rc rg rgd rgp rgt xml xpm; do writeEntries $ext done diff -rupN rosegarden-10.02.old/src/gui/editors/notation/SystemFont.cpp rosegarden-10.02/src/gui/editors/notation/SystemFont.cpp --- rosegarden-10.02.old/src/gui/editors/notation/SystemFont.cpp 2010-02-13 20:52:47.000000000 -0500 +++ rosegarden-10.02/src/gui/editors/notation/SystemFont.cpp 2010-02-17 23:38:26.000000000 -0500 @@ -166,24 +166,15 @@ void SystemFont::unbundleFonts() { QStringList fontFiles; - fontFiles << ResourceFinder().getResourceFiles("fonts", "pfa"); - fontFiles << ResourceFinder().getResourceFiles("fonts", "pfb"); - fontFiles << ResourceFinder().getResourceFiles("fonts", "ttf"); - fontFiles << ResourceFinder().getResourceFiles("fonts", "otf"); + fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-feta-design20.pfa"); + fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-feta-nummer-design10.pfa"); + fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-parmesan-design20.pfa"); NOTATION_DEBUG << "Found font files: " << fontFiles << endl; for (QStringList::const_iterator i = fontFiles.begin(); i != fontFiles.end(); ++i) { QString fontFile(*i); - QString name = QFileInfo(fontFile).fileName(); - if (fontFile.startsWith(":")) { - ResourceFinder().unbundleResource("fonts", name); - fontFile = ResourceFinder().getResourcePath("fonts", name); - if (fontFile.startsWith(":")) { // unbundling failed - continue; - } - } addFont(fontFile); } }