add several more (minor) upstream patches from m.com backend branch
authormirabilos <tg@debian.org>
Thu, 7 Nov 2019 17:03:47 +0000 (18:03 +0100)
committermirabilos <mirabilos@evolvis.org>
Thu, 7 Nov 2019 17:03:47 +0000 (18:03 +0100)
debian/changelog
debian/patches/experiments/upstream-backend-fixes.diff [new file with mode: 0644]
debian/patches/series

index f179830..bd8261d 100644 (file)
@@ -1,3 +1,9 @@
+musescore2 (2.3.2+dfsg3-7) wtf; urgency=low
+
+  * Add several more (minor) upstream patches
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Thu, 07 Nov 2019 18:03:21 +0100
+
 musescore2 (2.3.2+dfsg3-6) wtf; urgency=low
 
   * d/copyright: Update MuseJazz information from historic records
diff --git a/debian/patches/experiments/upstream-backend-fixes.diff b/debian/patches/experiments/upstream-backend-fixes.diff
new file mode 100644 (file)
index 0000000..7a82dcf
--- /dev/null
@@ -0,0 +1,37 @@
+# DP: some changes from the branch upstream/musescore_232_go_backend
+# DP: up to commit 24f97154cc114599a61a1307b8848bb9d336c0d0
+# DP: but without the experimental exports for musescore.com
+
+--- a/libmscore/score.cpp
++++ b/libmscore/score.cpp
+@@ -4051,6 +4051,8 @@ int Score::keysig()
+ int Score::duration()
+       {
+       updateRepeatList(true);
++      if (repeatList()->isEmpty())
++            return 0;
+       RepeatSegment* rs = repeatList()->last();
+       return lrint(utick2utime(rs->utick + rs->len()));
+       }
+--- a/libmscore/sym.cpp
++++ b/libmscore/sym.cpp
+@@ -5452,7 +5452,7 @@ void initScoreFonts()
+       int error = FT_Init_FreeType(&ftlib);
+       if (!ftlib || error)
+             qFatal("init freetype library failed");
+-      qDebug("initScoreFonts %p", ftlib);
++      //qDebug("initScoreFonts %p", ftlib);
+       int index = 0;
+       for (auto i : Sym::symNames)
+             Sym::lnhash.insert(i, SymId(index++));
+--- a/libmscore/undo.cpp
++++ b/libmscore/undo.cpp
+@@ -1685,7 +1685,7 @@ RemoveElement::RemoveElement(Element* e)
+ void RemoveElement::cleanup(bool undo)
+       {
+       if (undo) {
+-            qDebug("RemoveElement::cleanup: delete %d %s", undo, element->name());
++            //qDebug("RemoveElement::cleanup: delete %d %s", undo, element->name());
+             delete element;
+             element = 0;
+             }
index 1c0bca8..7857edd 100644 (file)
@@ -18,3 +18,4 @@ experiments/statusline-concert-transposing-pitch.diff
 experiments/element-barbeat.diff
 experiments/revert-restriking-patch.diff
 experiments/log-collisions.diff
+experiments/upstream-backend-fixes.diff