clean up after cherry-picking
authormirabilos <tg@debian.org>
Thu, 7 Nov 2019 17:18:53 +0000 (18:18 +0100)
committermirabilos <mirabilos@evolvis.org>
Thu, 7 Nov 2019 17:18:53 +0000 (18:18 +0100)
debian/changelog
debian/patches/debian-specific/debundle-fonts.diff
debian/patches/experiments/file-dialogues.diff

index fbf346b..baa56a0 100644 (file)
@@ -1,10 +1,10 @@
 musescore2 (2.3.2+dfsg3-7) wtf; urgency=low
 
-  * Add several more (minor) upstream patches
+  * Add some more (minor) upstream patches
   * Apply workaround for broken directory bookmarks in file dialogue
-  * Use the Debian packaging of freefont, do not bundle it
+  * Use the Debian freefont packaging instead of bundling it
 
- -- Thorsten Glaser <tg@mirbsd.de>  Thu, 07 Nov 2019 18:09:15 +0100
+ -- Thorsten Glaser <tg@mirbsd.de>  Thu, 07 Nov 2019 18:18:07 +0100
 
 musescore2 (2.3.2+dfsg3-6) wtf; urgency=low
 
index 09f9163..b2881cc 100644 (file)
@@ -11,10 +11,10 @@ Justification: distribution-specific packaging
 
 --- a/libmscore/mscore.cpp
 +++ b/libmscore/mscore.cpp
-@@ -347,11 +347,13 @@ void MScore::init()
+@@ -204,11 +204,13 @@ void MScore::init()
  #if !defined(Q_OS_MAC) && !defined(Q_OS_IOS)
        static const char* fonts[] = {
-             ":/fonts/musejazz/MuseJazzText.otf",
+             ":/fonts/MuseJazz.ttf",
 +#if 0
              ":/fonts/FreeSans.ttf",
              ":/fonts/FreeSerif.ttf",
@@ -27,12 +27,14 @@ Justification: distribution-specific packaging
              ":/fonts/bravura/BravuraText.otf",
 --- a/mscore/CMakeLists.txt
 +++ b/mscore/CMakeLists.txt
-@@ -207,8 +207,6 @@ else (APPLE)
+@@ -136,9 +136,7 @@ else (APPLE)
+             musescorefonts-MScore.qrc
              musescorefonts-Gootville.qrc
              musescorefonts-Bravura.qrc
-             musescorefonts-MuseJazz.qrc
+-            musescorefonts-MuseJazz.qrc
 -            musescorefonts-FreeSerif.qrc
--            musescorefonts-Free.qrc
-             shortcut.qrc)
+-            musescorefonts-Free.qrc)
++            musescorefonts-MuseJazz.qrc)
  endif (APPLE)
  
index cdd215d..6514cbe 100644 (file)
@@ -4,26 +4,18 @@ Forwarded: https://github.com/musescore/MuseScore/pull/5461
 
 --- a/mscore/preferences.cpp
 +++ b/mscore/preferences.cpp
-@@ -48,13 +48,6 @@ void Preferences::init(bool storeInMemor
-       bool checkExtensionsUpdateStartup = false;
- #endif
+@@ -200,13 +200,8 @@ void Preferences::init()
  
+       MScore::setHRaster(2);        // _spatium / value
+       MScore::setVRaster(2);
 -#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
 -      // use system native file dialogs
 -      // Qt file dialog is very slow on Windows and Mac
--      bool nativeDialogs           = true;
++
+       nativeDialogs           = true;
 -#else
--      bool nativeDialogs           = false;    // don't use system native file dialogs
+-      nativeDialogs           = false;    // don't use system native file dialogs
 -#endif
-       bool defaultUsePortAudio = false;
-       bool defaultUsePulseAudio = false;
-       bool defaultUseJackAudio = false;
-@@ -173,7 +166,7 @@ void Preferences::init(bool storeInMemor
-             {PREF_UI_APP_RASTER_HORIZONTAL,                        new IntPreference(2)},
-             {PREF_UI_APP_RASTER_VERTICAL,                          new IntPreference(2)},
-             {PREF_UI_APP_SHOWSTATUSBAR,                            new BoolPreference(true)},
--            {PREF_UI_APP_USENATIVEDIALOGS,                         new BoolPreference(nativeDialogs)},
-+            {PREF_UI_APP_USENATIVEDIALOGS,                         new BoolPreference(true)},
-             {PREF_UI_PIANO_HIGHLIGHTCOLOR,                         new ColorPreference(QColor("#1259d0"))},
-             {PREF_UI_SCORE_NOTE_DROPCOLOR,                         new ColorPreference(QColor("#1778db"))},
-             {PREF_UI_SCORE_DEFAULTCOLOR,                           new ColorPreference(QColor("#000000"))},
+       exportAudioSampleRate   = 44100;
+       exportMp3BitRate        = 128;