debundle freefont (as discussed with Campania) experimentally
authormirabilos <tg@debian.org>
Thu, 7 Nov 2019 17:09:39 +0000 (18:09 +0100)
committermirabilos <mirabilos@evolvis.org>
Thu, 7 Nov 2019 17:09:39 +0000 (18:09 +0100)
this must be 'fonts-freefont-ttf | ttf-freefont' for 2.x though
(precise lacks the renamed package)

(cherry picked from commit b13c37798eb779bff3f33ce9545677990a3c69ed)

debian/changelog
debian/control
debian/patches/debian-specific/debundle-fonts.diff [new file with mode: 0644]
debian/patches/series

index bd8261d..b7b1efa 100644 (file)
@@ -1,8 +1,9 @@
 musescore2 (2.3.2+dfsg3-7) wtf; urgency=low
 
   * Add several more (minor) upstream patches
+  * Use the Debian packaging of freefont, do not bundle it
 
- -- Thorsten Glaser <tg@mirbsd.de>  Thu, 07 Nov 2019 18:03:21 +0100
+ -- Thorsten Glaser <tg@mirbsd.de>  Thu, 07 Nov 2019 18:09:15 +0100
 
 musescore2 (2.3.2+dfsg3-6) wtf; urgency=low
 
index 74f7c7b..a338ddd 100644 (file)
@@ -68,6 +68,7 @@ Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
   desktop-file-utils,
+  fonts-freefont-ttf | ttf-freefont,
   libqt5sql5-sqlite,
   qml-module-qtquick-controls,
   qml-module-qtquick-dialogs,
diff --git a/debian/patches/debian-specific/debundle-fonts.diff b/debian/patches/debian-specific/debundle-fonts.diff
new file mode 100644 (file)
index 0000000..09f9163
--- /dev/null
@@ -0,0 +1,38 @@
+Description: Don’t bundle fonts-freefont-ttf in the executable,
+ use the system copy (even if this means rendering will differ
+ from other places and musescore.com, the local user will get
+ the bugfixes applied to the Debian packaging of said fonts)
+ .
+ This was discussed around the Campania debate; basically, both
+ embedding and depending have upsides and downsides… ☹
+Author: mirabilos <tg@debian.org>
+Forwarded: not-needed
+Justification: distribution-specific packaging
+
+--- a/libmscore/mscore.cpp
++++ b/libmscore/mscore.cpp
+@@ -347,11 +347,13 @@ void MScore::init()
+ #if !defined(Q_OS_MAC) && !defined(Q_OS_IOS)
+       static const char* fonts[] = {
+             ":/fonts/musejazz/MuseJazzText.otf",
++#if 0
+             ":/fonts/FreeSans.ttf",
+             ":/fonts/FreeSerif.ttf",
+             ":/fonts/FreeSerifBold.ttf",
+             ":/fonts/FreeSerifItalic.ttf",
+             ":/fonts/FreeSerifBoldItalic.ttf",
++#endif
+             ":/fonts/mscoreTab.ttf",
+             ":/fonts/mscore-BC.ttf",
+             ":/fonts/bravura/BravuraText.otf",
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -207,8 +207,6 @@ else (APPLE)
+             musescorefonts-Gootville.qrc
+             musescorefonts-Bravura.qrc
+             musescorefonts-MuseJazz.qrc
+-            musescorefonts-FreeSerif.qrc
+-            musescorefonts-Free.qrc
+             shortcut.qrc)
+ endif (APPLE)
index 7857edd..3cd2ed6 100644 (file)
@@ -1,5 +1,6 @@
 debian-specific/dfsg-exclusions.diff
 debian-specific/debundle-openssl.diff
+debian-specific/debundle-fonts.diff
 debian-specific/kfreebsd-oss-salsa.diff
 debian-specific/version-dialogue.diff
 upstream/lyrics-hyphen-syllable-closer.diff