Merge branch 'rochade'
[alioth/musescore.git] / debian / patches / debian-specific / debundle-fonts.diff
index 1538f41..9617528 100644 (file)
@@ -14,10 +14,10 @@ Justification: distribution-specific packaging
 
 --- a/libmscore/mscore.cpp
 +++ b/libmscore/mscore.cpp
-@@ -204,11 +204,13 @@ void MScore::init()
+@@ -347,11 +347,13 @@ void MScore::init()
  #if !defined(Q_OS_MAC) && !defined(Q_OS_IOS)
        static const char* fonts[] = {
-             ":/fonts/MuseJazz.ttf",
+             ":/fonts/musejazz/MuseJazzText.otf",
 +#if 0
              ":/fonts/FreeSans.ttf",
              ":/fonts/FreeSerif.ttf",
@@ -30,19 +30,18 @@ Justification: distribution-specific packaging
              ":/fonts/bravura/BravuraText.otf",
 --- a/mscore/CMakeLists.txt
 +++ b/mscore/CMakeLists.txt
-@@ -137,8 +137,7 @@ else (APPLE)
+@@ -207,8 +207,6 @@ else (APPLE)
              musescorefonts-Gootville.qrc
              musescorefonts-Bravura.qrc
              musescorefonts-MuseJazz.qrc
 -            musescorefonts-FreeSerif.qrc
--            musescorefonts-Free.qrc)
-+            )
+-            musescorefonts-Free.qrc
+             shortcut.qrc)
  endif (APPLE)
  
 --- a/mtest/CMakeLists.txt
 +++ b/mtest/CMakeLists.txt
-@@ -29,8 +29,6 @@ QT5_ADD_RESOURCES(qrc_files ${PROJECT_SO
+@@ -37,8 +37,6 @@ QT5_ADD_RESOURCES(qrc_files ${PROJECT_SO
              ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Gootville.qrc
              ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Bravura.qrc
              ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-MuseJazz.qrc