SHA256
1
0
forked from pool/musescore

Accepting request 870672 from multimedia:apps

- Add compatibility with qml-autoreqprov
- Updated to 3.6.2
  * Fixed an issue with gap between staff and final barline with
    courtesy clef
  * Fixed an issue when removing spanners from measures
    outside of the rewrite range
  * Fixed an accessibility issue with the score migration dialog
  * Fixed a crash related to QtWebEngineProcess after update
  * Fixed an issue with timeline showing part name rather than
    instrument name
  * Fixed an issue with focus of dockable windows when visibility
    is toggled
  * Fixed an issue where custom gliss text reverts to default "gliss"
  * Added missing Flügelhorns to instrument ordering definitions
  * Fixed an issue where beams cannot be connected over quarter rests
  * Fixed an issue where staff spacers do not work on last
    system of page
  * Fixed an issue with broken swapping of notes/chords with
    Shift + Left/Right
  * Fixed an issue with incomplete import from ScoreScan XML file
  * Fixed an issue with unsaved default settings to pre-3.6 score
    after 'reset styles to default'
  * Fixed an issue with Banjo fifth string fret numbers
  * Fixed an issue where invisible breath marks impact layout
  * Fixed a crash during the opening of a score with a missing
    section break
  * Applying tremolo is now a toggle operation
  * Fixed an issue where the Mixer panel is not fully shown when opened
  * Fixed an issue where an empty rehearsal mark is not deleted
    after entering a system break
  * Fixed an issue where multi-measure rest numbers can collide
    with other elements
  * Fixed an issue where deleting a breath/caesura leads
    to the wrong note being selected
  * Fixed an issue when parts inherit non-default style from score
  * Fixed a crash when changing time signature at the beginning
    of a corrupted measure
  * Fixed an issue with unreadable chord symbols
  * Updated the close icon for Import Midi Panel (and Find/GoTo)
  * Fixed an issue with auto-sizing of vertical frames when dragging
    the height handle
- Updated to 3.6.1
  * Fixed a crash on open of a file with start repeat in
    continuous view
  * Fixed an issue when switching tabs when opening a score while
    "Score migration dialog" is open
  * Fixed crashes when rearranging instrument positions and changing
    Ordering
  * Fixed an issue where the window is marked as modified, even when
    the last score is closed
  * Fixed a crash when opening scores with large orchestration
    created in older versions of MuseScore
  * Fixed an issue with incorrect order of Violins in
    Orchestra template
  * Fixed a crash when hiding palettes
  * Fixed an export failure when part name contains a slash
  * Fixed an issue where spacers do not function when vertical
    justification is enabled
  * Added an option to Copy SMuFL Symbol Code for symbols in
    Master Palette
  * Clef changes are no longer visible on hidden staves
  * Fixed an issue where first system indentation can cause
    measures to not fit on system
  * Fixed an issue with wrong key signatures upon
    "Reset Al Styles" in concert pitch scores
  * Display symbols' SMuFL name in Symbols Palette
  * Removed corner radius from new default rehearsal mark style
  * Fixed an issue where custom style defaults are ignored when
    creating new score from template
  * Fixed an issue where applying a key change to a selection causes
    a crash when transposing instruments are involved
  * Fixed an issue where an incomplete voice in local time signature
    leads to corruption upon import
  * Fixed an issue where swapping notes in a two-note tremolo causes
    corrupted tremolo, and crash
  * Fixed an issue where two-note tremolos display incorrectly
    on a stave with custom scale
  * Fixed an issue where measure number offset changes on reload
  * It is now possible to copy/paste the LetRing, PalmMute and
    Vibrato elements
  * The link on "Score migration dialog" now leads to Bilibili
    if using Chinese
- Removed enable-build-with-qt5.15 patch as building with
  QT 5.15 is now enabled by upstream
- From Balázs Dura-Kovács:
- removed fonts/gootville/readme.txt executable bit fix, as it was
  fixed in upstream
- install new fonts, most of them are otf
- included additional third party licenses and readme files
- added MUSESCORE_REVISION and MUSESCORE_BUILD_CONFIG flags,
  so that Musescore wouldn't think it's a dev build
- tested on Tumbleweed with Qt 5.15.2. Couldn't reproduce issues
  with with palettes and migration window described here:
  https://github.com/musescore/MuseScore/pull/7119
- Update to 3.6
  * Added the new default notation fonts "Leland"
  * Added the new default text font "Edwin"
  * Added a new dialog that suggests trying out the new engraving
    defaults
  * Added automatic score ordering and bracketing
  * Added automatic vertical justification of staves
  * Added Mountain Dulcimer instrument and 3-string tab presets
  * Added portamento for FLUID synthesiser
  * Added Petaluma notation font
  * Added mnemonics for "Save", "Save As" and "Resource Manager"
  * And other improvements and bugfixes, for details see:
    https://github.com/musescore/MuseScore/releases/tag/v3.6
- Remove correct-revision.patch
- Add enable-build-with-qt515.patch to enable build with Qt 5.15

OBS-URL: https://build.opensuse.org/request/show/870672
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/musescore?expand=0&rev=23
This commit is contained in:
Richard Brown 2021-03-30 18:53:37 +00:00 committed by Git OBS Bridge
commit 552b7810e1
6 changed files with 185 additions and 26 deletions

View File

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

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

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

View File

@ -1,5 +0,0 @@
--- a/mscore/revision.h
+++ b/mscore/revision.h
@@ -1 +1 @@
-3543170
+cfb429a

View File

@ -1,3 +1,132 @@
-------------------------------------------------------------------
Tue Feb 9 14:06:26 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Add compatibility with qml-autoreqprov
-------------------------------------------------------------------
Tue Feb 9 03:37:47 UTC 2021 - Dura-Kovács <balping314@gmail.com>
- Updated to 3.6.2
* Fixed an issue with gap between staff and final barline with
courtesy clef
* Fixed an issue when removing spanners from measures
outside of the rewrite range
* Fixed an accessibility issue with the score migration dialog
* Fixed a crash related to QtWebEngineProcess after update
* Fixed an issue with timeline showing part name rather than
instrument name
* Fixed an issue with focus of dockable windows when visibility
is toggled
* Fixed an issue where custom gliss text reverts to default "gliss"
* Added missing Flügelhorns to instrument ordering definitions
* Fixed an issue where beams cannot be connected over quarter rests
* Fixed an issue where staff spacers do not work on last
system of page
* Fixed an issue with broken swapping of notes/chords with
Shift + Left/Right
* Fixed an issue with incomplete import from ScoreScan XML file
* Fixed an issue with unsaved default settings to pre-3.6 score
after 'reset styles to default'
* Fixed an issue with Banjo fifth string fret numbers
* Fixed an issue where invisible breath marks impact layout
* Fixed a crash during the opening of a score with a missing
section break
* Applying tremolo is now a toggle operation
* Fixed an issue where the Mixer panel is not fully shown when opened
* Fixed an issue where an empty rehearsal mark is not deleted
after entering a system break
* Fixed an issue where multi-measure rest numbers can collide
with other elements
* Fixed an issue where deleting a breath/caesura leads
to the wrong note being selected
* Fixed an issue when parts inherit non-default style from score
* Fixed a crash when changing time signature at the beginning
of a corrupted measure
* Fixed an issue with unreadable chord symbols
* Updated the close icon for Import Midi Panel (and Find/GoTo)
* Fixed an issue with auto-sizing of vertical frames when dragging
the height handle
-------------------------------------------------------------------
Fri Jan 29 16:37:39 UTC 2021 - Balázs Dura-Kovács <balping314@gmail.com>
- Updated to 3.6.1
* Fixed a crash on open of a file with start repeat in
continuous view
* Fixed an issue when switching tabs when opening a score while
"Score migration dialog" is open
* Fixed crashes when rearranging instrument positions and changing
Ordering
* Fixed an issue where the window is marked as modified, even when
the last score is closed
* Fixed a crash when opening scores with large orchestration
created in older versions of MuseScore
* Fixed an issue with incorrect order of Violins in
Orchestra template
* Fixed a crash when hiding palettes
* Fixed an export failure when part name contains a slash
* Fixed an issue where spacers do not function when vertical
justification is enabled
* Added an option to Copy SMuFL Symbol Code for symbols in
Master Palette
* Clef changes are no longer visible on hidden staves
* Fixed an issue where first system indentation can cause
measures to not fit on system
* Fixed an issue with wrong key signatures upon
"Reset Al Styles" in concert pitch scores
* Display symbols' SMuFL name in Symbols Palette
* Removed corner radius from new default rehearsal mark style
* Fixed an issue where custom style defaults are ignored when
creating new score from template
* Fixed an issue where applying a key change to a selection causes
a crash when transposing instruments are involved
* Fixed an issue where an incomplete voice in local time signature
leads to corruption upon import
* Fixed an issue where swapping notes in a two-note tremolo causes
corrupted tremolo, and crash
* Fixed an issue where two-note tremolos display incorrectly
on a stave with custom scale
* Fixed an issue where measure number offset changes on reload
* It is now possible to copy/paste the LetRing, PalmMute and
Vibrato elements
* The link on "Score migration dialog" now leads to Bilibili
if using Chinese
- Removed enable-build-with-qt5.15 patch as building with
QT 5.15 is now enabled by upstream
-------------------------------------------------------------------
Tue Jan 19 11:04:54 UTC 2021 - Cor Blom <cornelis@solcon.nl>
- From Balázs Dura-Kovács:
- removed fonts/gootville/readme.txt executable bit fix, as it was
fixed in upstream
- install new fonts, most of them are otf
- included additional third party licenses and readme files
- added MUSESCORE_REVISION and MUSESCORE_BUILD_CONFIG flags,
so that Musescore wouldn't think it's a dev build
- tested on Tumbleweed with Qt 5.15.2. Couldn't reproduce issues
with with palettes and migration window described here:
https://github.com/musescore/MuseScore/pull/7119
-------------------------------------------------------------------
Fri Jan 15 12:11:09 UTC 2021 - Cor Blom <cornelis@solcon.nl>
- Update to 3.6
* Added the new default notation fonts "Leland"
* Added the new default text font "Edwin"
* Added a new dialog that suggests trying out the new engraving
defaults
* Added automatic score ordering and bracketing
* Added automatic vertical justification of staves
* Added Mountain Dulcimer instrument and 3-string tab presets
* Added portamento for FLUID synthesiser
* Added Petaluma notation font
* Added mnemonics for "Save", "Save As" and "Resource Manager"
* And other improvements and bugfixes, for details see:
https://github.com/musescore/MuseScore/releases/tag/v3.6
- Remove correct-revision.patch
- Add enable-build-with-qt515.patch to enable build with Qt 5.15
-------------------------------------------------------------------
Sat Oct 17 11:01:12 UTC 2020 - Cor Blom <cornelis@solcon.nl>

View File

@ -1,7 +1,7 @@
#
# spec file for package musescore
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,12 +16,16 @@
#
# Internal QML imports
%global __requires_exclude qmlimport\\((MuseScore|FileIO).*
%define rname mscore
%define version_lesser 3.5
%define version_lesser 3.6
%define revision 3224f34
%define fontdir %{_datadir}/fonts/%{name}
%define docdir %{_docdir}/%{name}
Name: musescore
Version: 3.5.2
Version: 3.6.2
Release: 0
Summary: A WYSIWYG music score typesetter
# Musescore code license is GPL-2.0
@ -32,12 +36,10 @@ Group: Productivity/Multimedia/Sound/Editors and Convertors
URL: https://musescore.org
Source0: https://github.com/musescore/MuseScore/archive/v%{version}/MuseScore-%{version}.tar.gz
Source1: %{rname}.desktop
# PATCH-FIX-UPSTREAM: see https://github.com/musescore/MuseScore/releases
Patch0: correct-revision.patch
# PATCH-FIX-OPENSUSE: really use qmake-qt5
Patch1: use-qtmake-qt5.patch
# PATCH-FIX-OPENSUSE: openSUSE has qmake-qt5 qmake was reserved for qt4, which is no longer present
Patch0: use-qtmake-qt5.patch
# PATCH-FIX-OPENSUSE: don't install qtwebengine files, they are not needed
Patch2: use-system-qtwebengine-files.patch
Patch1: use-system-qtwebengine-files.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -114,15 +116,18 @@ sed 's/\r$//' thirdparty/rtf2html/README.ru > tmpfile
touch -r thirdparty/rtf2html/README.ru tmpfile
mv -f tmpfile thirdparty/rtf2html/README.ru
# remove executable bit
chmod -x fonts/gootville/readme.txt
sed 's/\r$//' thirdparty/portmidi/README.txt > tmpfile
touch -r thirdparty/portmidi/README.txt tmpfile
mv -f tmpfile thirdparty/portmidi/README.txt
%build
%define __builddir build.release
%cmake \
-DCMAKE_BUILD_TYPE=RELEASE \
-DMUSESCORE_BUILD_CONFIG=release \
-DUSE_SYSTEM_FREETYPE="ON" \
-DBUILD_WEBENGINE="ON"
-DBUILD_WEBENGINE="ON" \
-DMUSESCORE_REVISION=%{revision}
%make_jobs lrelease all
# Put the desktop file in place for the packaging
@ -135,6 +140,21 @@ strip-nondeterminism -t zip %{buildroot}%{_datadir}/%{rname}-%{version_lesser}/w
# install fonts
mkdir -p %{buildroot}%{fontdir}
install -p -m 644 fonts/*.ttf %{buildroot}/%{fontdir}
install -p -m 644 fonts/*/*.ttf %{buildroot}/%{fontdir}
install -p -m 644 fonts/bravura/BravuraText.otf %{buildroot}/%{fontdir}
install -p -m 644 fonts/campania/Campania.otf %{buildroot}/%{fontdir}
install -p -m 644 fonts/edwin/*.otf %{buildroot}/%{fontdir}
install -p -m 644 fonts/gootville/GootvilleText.otf %{buildroot}/%{fontdir}
install -p -m 644 fonts/leland/LelandText.otf %{buildroot}/%{fontdir}
install -p -m 644 fonts/musejazz/MuseJazzText.otf %{buildroot}/%{fontdir}
install -p -m 644 fonts/petaluma/PetalumaText.otf %{buildroot}/%{fontdir}
# unique names for font docs
mv fonts/edwin/README.md fonts/edwin/README.md.edwin
mv fonts/edwin/GPL_LICENSE.txt fonts/edwin/GPL_LICENSE.txt.edwin
mv fonts/edwin/LICENSE.txt fonts/edwin/LICENSE.txt.edwin
mv fonts/leland/README.md fonts/leland/README.md.leland
mv fonts/leland/LICENSE.txt fonts/leland/LICENSE.txt.leland
# update desktop file
%suse_update_desktop_file -n %{rname} AudioVideo AudioVideoEditing
@ -147,6 +167,8 @@ install -p -m 644 demos/*.mscz %{buildroot}%{_datadir}/%{rname}-%{version_lesser
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/dtl/COPYING %{buildroot}%docdir/COPYING.BSD.dtl
install -p -m 644 thirdparty/freetype/README %{buildroot}%docdir/README.freetype
install -p -m 644 thirdparty/intervaltree/README %{buildroot}%docdir/README.intervaltree
install -p -m 644 thirdparty/ofqf/README.md %{buildroot}%docdir/README.md.ofqf
install -p -m 644 thirdparty/rtf2html/ChangeLog %{buildroot}%docdir/ChangeLog.rtf2html
@ -154,6 +176,10 @@ install -p -m 644 thirdparty/rtf2html/COPYING.LESSER %{buildroot}%docdir/COPYIN
install -p -m 644 thirdparty/rtf2html/README %{buildroot}%docdir/README.rtf2html
install -p -m 644 thirdparty/rtf2html/README.mscore %{buildroot}%docdir/README.mscore.rtf2html
install -p -m 644 thirdparty/rtf2html/README.ru %{buildroot}%docdir/README.ru.rtf2html
install -p -m 644 thirdparty/portmidi/README.txt %{buildroot}%docdir/README.txt.portmidi
install -p -m 644 thirdparty/portmidi/license.txt %{buildroot}%docdir/license.txt.portmidi
install -p -m 644 thirdparty/qt-google-analytics/README.md %{buildroot}%docdir/README.md.qt-google-analytics
install -p -m 644 thirdparty/qt-google-analytics/LICENSE.txt %{buildroot}%docdir/LICENSE.qt-google-analytics
install -p -m 644 thirdparty/singleapp/LGPL_EXCEPTION.txt %{buildroot}%docdir/LGPL_EXCEPTION.txt.singleapp
install -p -m 644 thirdparty/singleapp/LICENSE.GPL3 %{buildroot}%docdir/LICENSE.GPL3.singleapp
install -p -m 644 thirdparty/singleapp/LICENSE.LGPL %{buildroot}%docdir/LICENSE.LGPL.singleapp
@ -210,10 +236,19 @@ install -p -m 644 share/wallpaper/COPYRIGHT %{buildroot}%docdir/COPYIN
%files fonts
%dir %{fontdir}
%{fontdir}/*.ttf
%{fontdir}/*.otf
%doc fonts/README.md
%doc fonts/bravura/bravura-text.md
%doc fonts/bravura/OFL-FAQ.txt
%doc fonts/bravura/OFL.txt
%doc fonts/campania/LICENSE
%doc fonts/gootville/readme.txt
# see section 'unique names for font docs' above
%doc fonts/edwin/README.md.edwin
%doc fonts/edwin/GPL_LICENSE.txt.edwin
%doc fonts/edwin/LICENSE.txt.edwin
%doc fonts/leland/README.md.leland
%doc fonts/leland/LICENSE.txt.leland
%changelog

View File

@ -1,7 +1,7 @@
diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake
--- a/build/FindQt5.cmake 2020-10-07 16:33:23.000000000 +0200
+++ b/build/FindQt5.cmake 2020-10-08 00:36:33.765299122 +0200
@@ -45,7 +45,7 @@
--- a/build/FindQt5.cmake 2021-01-14 14:33:11.000000000 +0100
+++ b/build/FindQt5.cmake 2021-01-15 13:28:45.346084556 +0100
@@ -55,7 +47,7 @@
include_directories(${QT_INCLUDES})
@ -11,8 +11,8 @@ diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake
QT_INSTALL_ARCHDATA
QT_INSTALL_BINS
diff -ur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2020-10-07 16:33:23.000000000 +0200
+++ b/CMakeLists.txt 2020-10-08 00:35:59.616698386 +0200
--- a/CMakeLists.txt 2021-01-14 14:33:11.000000000 +0100
+++ b/CMakeLists.txt 2021-01-15 13:24:07.140841485 +0100
@@ -25,7 +25,7 @@
include(build/functions.cmake) # library of CMake functions ("fn__" namespace)
@ -20,5 +20,5 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt
-fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake)
+fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake-qt5)
set (CI $ENV{CI})
if (CI)
# Libraries linked via full path no longer produce linker search paths.
cmake_policy(SET CMP0003 NEW)