rpm/musescore
SHA256
1
0
Fork 0
forked from pool/musescore
Code Pull Requests Activity

- Update to 3.4.2:

Browse Source 
* Telemetry dialog was not accessible for visually impaired people
  * Drum input palette worked incorrectly due to the changes
    involving single click behaviour
  * MuseScore crashed when pressing numbers/letters in a different
    voice when inputting tabs
  * Hidden pedal items were no longer displayed
  * "L" letter could not be typed when entering text
- Remove 0001-fix-299654-Crash-on-startup-with-Qt-5.14.patch (part
  of tarball now)
- update correct-revision.patch

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=72
This commit is contained in:
Cor Blom 2020-02-07 13:42:46 +00:00 committed by Git OBS Bridge
parent acd369a02a
commit 94a4547767
6 changed files with 20 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,45 +0,0 @@
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

3
MuseScore-3.4.1.tar.gz
View File

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

3
MuseScore-3.4.2.tar.gz Normal file
View File

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

2
correct-revision.patch
View File

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

15
musescore.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Feb 7 13:39:49 UTC 2020 - Cor Blom <cornelis@solcon.nl>
- Update to 3.4.2:
* Telemetry dialog was not accessible for visually impaired people
* Drum input palette worked incorrectly due to the changes
involving single click behaviour
* MuseScore crashed when pressing numbers/letters in a different
voice when inputting tabs
* Hidden pedal items were no longer displayed
* "L" letter could not be typed when entering text
- Remove 0001-fix-299654-Crash-on-startup-with-Qt-5.14.patch (part
of tarball now)
- update correct-revision.patch
-------------------------------------------------------------------
Tue Jan 28 15:41:26 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

4
musescore.spec
View File

@ -21,7 +21,7 @@
%define fontdir %{_datadir}/fonts/%{name}
%define docdir %{_docdir}/%{name}
Name: musescore
Version: 3.4.1
Version: 3.4.2
Release: 0
Summary: A WYSIWYG music score typesetter
# Musescore code license is GPL-2.0
@ -38,8 +38,6 @@ Patch0: correct-revision.patch
Patch1: use-qtmake-qt5.patch
# 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++