Accepting request 768090 from home:cgiboudeaux:branches:multimedia:apps

Update to 3.4.1

OBS-URL: https://build.opensuse.org/request/show/768090
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=70

0001-fix-299654-Crash-on-startup-with-Qt-5.14.patch

@@ -0,0 +1,45 @@
+From a56c93dbd5e16f7775c0982b38f3f1387921f20e Mon Sep 17 00:00:00 2001
+From: Joachim Schmitz <jojo@schmitz-digital.de>
+Date: Tue, 21 Jan 2020 10:09:02 +0100
+Subject: [PATCH] fix #299654: Crash on startup with Qt 5.14
+
+due to a failed assertion deep in Qt code
+---
+ mscore/workspace.cpp | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/mscore/workspace.cpp b/mscore/workspace.cpp
+index 055c74c..de4ad21 100644
+--- a/mscore/workspace.cpp
++++ b/mscore/workspace.cpp
+@@ -823,9 +823,10 @@ void Workspace::read(XmlReader& e)
+                   QMenuBar* mb = mscore->menuBar();
+                   const QObjectList menus(mb->children()); // need a copy
+                   for (QObject* m : menus) {
+-                        if (qobject_cast<QMenu*>(m)) {
+-                              m->setParent(nullptr);
+-                              m->deleteLater();
++                        QMenu* menu = qobject_cast<QMenu*>(m);
++                        if (menu) {
++                              menu->setParent(nullptr);
++                              menu->deleteLater();
+                               }
+                         }
+                   mb->clear();
+@@ -931,9 +932,10 @@ void Workspace::readGlobalMenuBar()
+                               QMenuBar* mb = mscore->menuBar();
+                               const QObjectList menus(mb->children()); // need a copy
+                               for (QObject* m : menus) {
+-                                    if (qobject_cast<QMenu*>(m)) {
+-                                          m->setParent(nullptr);
+-                                          m->deleteLater();
++                                    QMenu* menu = qobject_cast<QMenu*>(m);
++                                    if (menu) {
++                                          menu->setParent(nullptr);
++                                          menu->deleteLater();
+                                           }
+                                     }
+                               mb->clear();
+-- 
+2.25.0
+

MuseScore-3.3.4.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab8bade6c7eec6a9ae03f435cad65e79c4ca031d19020aa6e2a4da2868f49a2a
-size 62827836

MuseScore-3.4.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0bfaf6a42faeae2d4c5b8404508a2e479612d3c33d7c73b0fa2616fb5d7c9b8
+size 62951880

correct-revision.patch

@@ -2,4 +2,4 @@
 +++ b/mscore/revision.h
 @@ -1 +1 @@
 -3543170
-+7684abe
++20414b2

musescore.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Tue Jan 28 15:41:26 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 3.4.1. Changes since 3.3.4:
+  * MuseScore crashed after closing a menu bar pop-up window
+    if no score is opened
+  * Audio glitches on note input and playback happened on
+    macOS and other platforms
+  * Parts corruption happened on timewise delete of individual beats
+  * Crash happened when undoing "Beam middle" setting on a single note
+  * Pedal lines alignment applied to the whole system, not individual
+    staff
+  * "Don't play trill" option silenced the note playback
+  * Slurs on small staves were displaced in some cases
+  * Barline handles were drawn incorrectly after dragging one
+  * Strings in the Part dialogue were ambiguous
+  * Y Offset value of fretboards didn't restore after undoing
+    the values being changed from Edit Mode
+  * Replacing a note with an accidental left the accidental
+    on the new note
+  * Adding Intervals (above/below) didn't take into consideration
+    the accidental toggle state
+  * Multiple chord symbols attached to same note didn't copy as
+    part of the range
+  * Strings in fret diagrams without "X" or "O" displayed as "?" on Linux
+  * MuseScore crashed when changing a triplet's rest's duration
+  * Images attached to rests weren't imported from MuseScore 2
+  * Tremolo Bar dialog had multiple UX issues
+  * AppImage: system printers weren't available in the print dialog
+- Check https://musescore.org/fr/handbook/developers-handbook/release-notes
+  for the complete list of changes.
+- Update correct-revision.patch
+- Update use-system-qtwebengine-files.patch
+- Add upstream patch 0001-fix-299654-Crash-on-startup-with-Qt-5.14.patch
+
 -------------------------------------------------------------------
 Wed Dec  4 19:59:11 UTC 2019 - Cor Blom <cornelis@solcon.nl>
 

musescore.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package musescore
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,11 +17,11 @@
 
 
 %define         rname mscore
-%define         version_lesser 3.3
+%define         version_lesser 3.4
 %define fontdir %{_datadir}/fonts/%{name}
 %define docdir  %{_docdir}/%{name}
 Name:           musescore
-Version:        3.3.4
+Version:        3.4.1
 Release:        0
 Summary:        A WYSIWYG music score typesetter
 # Musescore code license is GPL-2.0
@@ -36,8 +36,10 @@ Source1:        %{rname}.desktop
 Patch0:         correct-revision.patch
 # PATCH-FIX-OPENSUSE: really use qmake-qt5
 Patch1:         use-qtmake-qt5.patch
-# PATC-FIX-OPENSUSE: don't install qtwebengine files, they are not needed
+# PATCH-FIX-OPENSUSE: don't install qtwebengine files, they are not needed
 Patch2:         use-system-qtwebengine-files.patch
+# PATCH-FIX-UPSTREAM
+Patch3:         0001-fix-299654-Crash-on-startup-with-Qt-5.14.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -99,8 +101,7 @@ BuildArch:      noarch
 Additional fonts for use by the MuseScore music notation program.
 
 %prep
-%setup -q -n MuseScore-%{version}
+%autosetup -p1 -n MuseScore-%{version}
-%autopatch -p1
 
 # fix EOL encoding
 sed 's/\r$//' fonts/bravura/OFL-FAQ.txt > tmpfile
@@ -148,9 +149,6 @@ install -d -m 755 %{buildroot}%docdir
 install -p -m 644 thirdparty/beatroot/COPYING         %{buildroot}%docdir/COPYING.beatroot
 install -p -m 644 thirdparty/beatroot/README.txt      %{buildroot}%docdir/README.txt.beatroot
 install -p -m 644 thirdparty/intervaltree/README      %{buildroot}%docdir/README.intervaltree
-install -p -m 644 thirdparty/kQOAuth/COPYING          %{buildroot}%docdir/COPYING.kQOAuth
-install -p -m 644 thirdparty/kQOAuth/README           %{buildroot}%docdir/README.kQOAuth
-install -p -m 644 thirdparty/kQOAuth/README.md        %{buildroot}%docdir/README.md.kQOAuth
 install -p -m 644 thirdparty/ofqf/README.md           %{buildroot}%docdir/README.md.ofqf
 install -p -m 644 thirdparty/rtf2html/ChangeLog       %{buildroot}%docdir/ChangeLog.rtf2html
 install -p -m 644 thirdparty/rtf2html/COPYING.LESSER  %{buildroot}%docdir/COPYING.LESSER.rtf2html

use-system-qtwebengine-files.patch

@@ -1,11 +1,12 @@
-diff -ur a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
+diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
---- a/mscore/CMakeLists.txt	2019-11-14 08:45:52.000000000 +0100
+index 6c489e8..03f26a0 100644
-+++ b/mscore/CMakeLists.txt	2019-11-15 14:27:31.268000000 +0100
+--- a/main/CMakeLists.txt
-@@ -738,21 +738,6 @@
++++ b/main/CMakeLists.txt
+@@ -217,21 +217,6 @@ if (MINGW)
  else (MINGW)
  
     if ( NOT MSVC )
--## install qwebengine core
+-      ## install qwebengine core
 -      if (NOT APPLE AND USE_WEBENGINE)
 -         install(PROGRAMS
 -            ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
@@ -21,5 +22,5 @@ diff -ur a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
 -            )
 -      endif(NOT APPLE AND USE_WEBENGINE)
  
-       target_link_libraries(mscore
+       set_target_properties (
-          ${ALSA_LIB}
+          mscore