Merge branch 'rochade'
[alioth/musescore.git] / debian / patches / debian-specific / debundle-fonts.diff
index 09f9163..5eb4e19 100644 (file)
@@ -5,6 +5,9 @@ Description: Don’t bundle fonts-freefont-ttf in the executable,
  .
  This was discussed around the Campania debate; basically, both
  embedding and depending have upsides and downsides… ☹
+ .
+ Considering MuseScore is GPLv2 and the font is GPLv3+FE though
+ it’s safer to not embed it into the binary at all.
 Author: mirabilos <tg@debian.org>
 Forwarded: not-needed
 Justification: distribution-specific packaging
@@ -36,3 +39,14 @@ Justification: distribution-specific packaging
              shortcut.qrc)
  endif (APPLE)
  
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -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
+-            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Free.qrc
+-            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-FreeSerif.qrc
+       )
+ add_library (testResources STATIC