Cor Blom 2019-01-04 15:12:39 +00:00 committed by Git OBS Bridge
parent 60df289f60
commit 9354aeb274
6 changed files with 58 additions and 4175 deletions

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

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

View File

@ -1,48 +0,0 @@
From ff014657939f30c0052a1d2d66d87d13833c5255 Mon Sep 17 00:00:00 2001
From: Joachim Schmitz <jojo@schmitz-digital.de>
Date: Tue, 18 Sep 2018 14:42:43 +0200
Subject: [PATCH] changes needed for MuseScore to build with Qt 5.12 (Alpha)
One needed for MSVC only (and only since Alpha, not with the previous
preview), the other needed for MSVC and MinGW.
Neither seems to cause issues with Qt 5.9 (like AppVeyor and Travis CI
prove)
---
mscore/editstringdata.cpp | 4 ++--
mscore/prefsdialog.ui | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/mscore/editstringdata.cpp b/mscore/editstringdata.cpp
index 21a621bac0..a86207e5db 100644
--- a/mscore/editstringdata.cpp
+++ b/mscore/editstringdata.cpp
@@ -52,7 +52,7 @@ EditStringData::EditStringData(QWidget *parent, QList<instrString> * strings, in
strg = (*_strings)[numOfStrings - i - 1];
_stringsLoc.append(strg);
QTableWidgetItem *newCheck = new QTableWidgetItem();
- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
+ newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
stringList->setItem(i, 0, newCheck);
QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
@@ -168,7 +168,7 @@ void EditStringData::newStringClicked()
_stringsLoc.insert(i, strg);
stringList->insertRow(i);
QTableWidgetItem *newCheck = new QTableWidgetItem();
- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
+ newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
stringList->setItem(i, 0, newCheck);
QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui
index 5dd493fdc7..21af750846 100644
--- a/mscore/prefsdialog.ui
+++ b/mscore/prefsdialog.ui
@@ -4276,7 +4276,6 @@ Adjusting latency can help synchronize your MIDI hardware with MuseScore's inter
</item>
</layout>
</widget>
- <pixmapfunction>getPixmap</pixmapfunction>
<customwidgets>
<customwidget>
<class>Awl::ColorLabel</class>

View File

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

View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Fri Jan 4 14:35:14 UTC 2019 - Cor Blom <cornelis@solcon.nl>
- Update to 3.0.0: A major feature release:
* Musical notation
+ Automatic placement - potential collisions between elements
are detected and resolved automatically, allowing you to easily
create great-looking scores with little need for manual adjustment
+ Improved parts facility - link parts to specific voices within
a staff
+ System dividers - automatically generate dividers between
systems
+ Staff type changes - change staff size, number of lines, and
other properties mid-score
+ Temporary and cutaway staves - staves may appear and disappear
as needed, including the ability to have empty measures be
completely invisible
+ MuseJazz font - give all elements in your scores a handwritten
appearance
+ Named noteheads - automatically display pitch names in
noteheads using a variety of different naming schemes
* Usability
+ Tours - get online help automatically as you need it
+ Timeline - navigate using a graphical overview of the music
structure of your score that shows rehearsal marks, changes of
tempo, key, and time signature, etc.
+ Score comparison tool - easily view differences between
versions of a score
+ Single page mode - vertically scrolling view of your score
+ Improved Inspector - control more element properties and set
style defaults directly from the Inspector window, including new
above/below placement settings
+ Palette search - enter a search term to quickly find any
symbol
+ Timewise note input and editing - insert and deletes notes and
rests within measures, automatically shifting subsequent music
forwards or backwards
+ Next/previous element - Alt+Right/Left shortcuts to navigate
through each element of your score
+ Auto-update - no longer necessary to download and install new
versions from musescore.org
* Playback
+ Improved Mixer - mute individual voices, collapse channels
into a single column, assign MIDI ports and channels
+ Improved Piano Roll Editor - easier control of the playback
parameters of each note in your score
+ Redesigned Play Panel - docked within main window
- Removed no longer necessary remove_diff_match_patch.diff
- Removed now included fix-build-qt512.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 27 00:03:00 UTC 2018 - Cor Blom <cornelis@solcon.nl> Thu Dec 27 00:03:00 UTC 2018 - Cor Blom <cornelis@solcon.nl>

View File

@ -1,7 +1,7 @@
# #
# spec file for package musescore # spec file for package musescore
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,13 +17,13 @@
%define rname mscore %define rname mscore
%define version_lesser 2.3 %define version_lesser 3.0
%define fontdir %{_datadir}/fonts/%{name} %define fontdir %{_datadir}/fonts/%{name}
%define docdir %{_docdir}/%{name} %define docdir %{_docdir}/%{name}
Name: musescore Name: musescore
Version: 2.3.2 Version: 3.0.0
Release: 0 Release: 0
Summary: A WYSIWYG music score typesetter Summary: A WYSIWYG music score typesetter
# Musescore code license is GPL-2.0 # Musescore code license is GPL-2.0
@ -32,14 +32,8 @@ Summary: A WYSIWYG music score typesetter
License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND MIT License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND MIT
Group: Productivity/Multimedia/Sound/Editors and Convertors Group: Productivity/Multimedia/Sound/Editors and Convertors
URL: https://musescore.org URL: https://musescore.org
Source0: %{name}-%{version}.tar.gz Source0: https://github.com/musescore/MuseScore/archive/v%{version_lesser}/MuseScore-%{version_lesser}.tar.gz
Source1: %{rname}.desktop Source1: %{rname}.desktop
# PATCH to solve license conflict. It removes the diff_patch_match library,
# which is not actually used.
# See https://sourceforge.net/p/mscore/mailman/message/36429212/
Patch0: remove_diff_match_patch.diff
# PATCH-FIX-UPSTREAM: fix build with Qt 5.12
Patch1: fix-build-qt512.patch
BuildRequires: alsa-devel BuildRequires: alsa-devel
BuildRequires: cmake >= 3.0 BuildRequires: cmake >= 3.0
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -78,9 +72,7 @@ BuildArch: noarch
Additional fonts for use by the MuseScore music notation program. Additional fonts for use by the MuseScore music notation program.
%prep %prep
%setup -q -n MuseScore-%{version} %setup -q -n MuseScore-%{version_lesser}
%patch0 -p1
%patch1 -p1
# remove precompiled binary # remove precompiled binary
rm thirdparty/rtf2html/rtf2html rm thirdparty/rtf2html/rtf2html

File diff suppressed because it is too large Load Diff