From 0f89493c59fd02668ff9f12e577056fa9f3462c58e6568597aa137c9177d683e Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Sat, 16 Jan 2021 11:46:26 +0000 Subject: [PATCH 1/8] first version of update to 3.6. Needs additional work. OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=83 --- MuseScore-3.5.2.tar.gz | 3 --- MuseScore-3.6.tar.gz | 3 +++ correct-revision.patch | 5 ----- enable-build-with-qt515.patch | 18 ++++++++++++++++++ musescore.changes | 7 +++++++ musescore.spec | 13 +++++++------ use-qtmake-qt5.patch | 14 +++++++------- 7 files changed, 42 insertions(+), 21 deletions(-) delete mode 100644 MuseScore-3.5.2.tar.gz create mode 100644 MuseScore-3.6.tar.gz delete mode 100644 correct-revision.patch create mode 100644 enable-build-with-qt515.patch diff --git a/MuseScore-3.5.2.tar.gz b/MuseScore-3.5.2.tar.gz deleted file mode 100644 index f725401..0000000 --- a/MuseScore-3.5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068 -size 66326638 diff --git a/MuseScore-3.6.tar.gz b/MuseScore-3.6.tar.gz new file mode 100644 index 0000000..9240917 --- /dev/null +++ b/MuseScore-3.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75cd1d78aa71ffc8eed95d59367f945b2e38e7df1b9de8bf439ac046b27e05ff +size 67827521 diff --git a/correct-revision.patch b/correct-revision.patch deleted file mode 100644 index f80d598..0000000 --- a/correct-revision.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/mscore/revision.h -+++ b/mscore/revision.h -@@ -1 +1 @@ --3543170 -+cfb429a diff --git a/enable-build-with-qt515.patch b/enable-build-with-qt515.patch new file mode 100644 index 0000000..d0b1117 --- /dev/null +++ b/enable-build-with-qt515.patch @@ -0,0 +1,18 @@ +diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake +--- a/build/FindQt5.cmake 2021-01-14 14:33:11.000000000 +0100 ++++ b/build/FindQt5.cmake 2021-01-15 13:28:45.346084556 +0100 +@@ -36,14 +36,6 @@ + ) + endif(WIN32) + +-# For Windows, because of these lines, for some unknown reason, the build of the .msi package fails. +-if(NOT ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows") +- find_package(Qt5Core 5.15.0 QUIET) +- if (Qt5Core_FOUND) +- message(FATAL_ERROR "MuseScore 3 does not support Qt 5.15: 5.15.0 shows empty palettes panel, 5.15.1 and later crash when opening pre-3.6 scores due to QTBUG-77337") +- endif() +-endif() +- + find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED) + + foreach(_component ${_components}) diff --git a/musescore.changes b/musescore.changes index 54f124c..7048236 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 15 12:11:09 UTC 2021 - Cor Blom + +- Update to 3.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 diff --git a/musescore.spec b/musescore.spec index 53d7651..cc8c390 100644 --- a/musescore.spec +++ b/musescore.spec @@ -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 @@ -17,11 +17,11 @@ %define rname mscore -%define version_lesser 3.5 +%define version_lesser 3.6 %define fontdir %{_datadir}/fonts/%{name} %define docdir %{_docdir}/%{name} Name: musescore -Version: 3.5.2 +Version: 3.6 Release: 0 Summary: A WYSIWYG music score typesetter # Musescore code license is GPL-2.0 @@ -32,9 +32,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 +# Force build with Qt 5.15, despite reported problems. +# See: https://github.com/musescore/MuseScore/pull/7119 +Patch0: enable-build-with-qt515.patch +# PATCH-FIX-OPENSUSE: openSUSE has qmake-qt5 qmake was reserved for qt4, which is no longer present Patch1: use-qtmake-qt5.patch # PATCH-FIX-OPENSUSE: don't install qtwebengine files, they are not needed Patch2: use-system-qtwebengine-files.patch diff --git a/use-qtmake-qt5.patch b/use-qtmake-qt5.patch index a29dd81..2655351 100644 --- a/use-qtmake-qt5.patch +++ b/use-qtmake-qt5.patch @@ -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) From 94b2934bb0d792127bf5319b40145e279faa8cbddebb865d040960639b34a13a Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Sun, 17 Jan 2021 10:01:37 +0000 Subject: [PATCH 2/8] Accepting request 863765 from home:balping:branches:multimedia:apps - 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 OBS-URL: https://build.opensuse.org/request/show/863765 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=84 --- musescore.changes | 13 +++++++++++++ musescore.spec | 40 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/musescore.changes b/musescore.changes index 7048236..4358d27 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Jan 16 17:11:19 UTC 2021 - 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 diff --git a/musescore.spec b/musescore.spec index cc8c390..452635e 100644 --- a/musescore.spec +++ b/musescore.spec @@ -18,6 +18,7 @@ %define rname mscore %define version_lesser 3.6 +%define revision 1977cb3 %define fontdir %{_datadir}/fonts/%{name} %define docdir %{_docdir}/%{name} Name: musescore @@ -115,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 @@ -136,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.md fonts/edwin/LICENSE.md.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 @@ -148,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 @@ -155,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 @@ -211,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.md.edwin +%doc fonts/leland/README.md.leland +%doc fonts/leland/LICENSE.txt.leland + %changelog From 946a6957d9f4a7145be52857d1327149337844961061f477344ef643775ab36a Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Tue, 19 Jan 2021 10:53:24 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=85 --- MuseScore-3.6.tar.gz | 4 ++-- musescore.changes | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/MuseScore-3.6.tar.gz b/MuseScore-3.6.tar.gz index 9240917..75d9978 100644 --- a/MuseScore-3.6.tar.gz +++ b/MuseScore-3.6.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75cd1d78aa71ffc8eed95d59367f945b2e38e7df1b9de8bf439ac046b27e05ff -size 67827521 +oid sha256:554cfbb329b184260efdd9522777b2d8422c21f535d0955720517c37912d9ccf +size 67835667 diff --git a/musescore.changes b/musescore.changes index 4358d27..7048236 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -Sat Jan 16 17:11:19 UTC 2021 - 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 From f7b0f902240067bb658a62a34397bd254f9c616ae5ae65d3e327918d0eed644a Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Tue, 19 Jan 2021 11:06:50 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=86 --- musescore.changes | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/musescore.changes b/musescore.changes index 7048236..c5f7203 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,7 +1,32 @@ ------------------------------------------------------------------- +Tue Jan 19 11:04:54 UTC 2021 - Cor Blom + +- 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 - 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 From a12010daed5e31ebf0c90e8756347ce6e7e7f67481a49589cb417bedd8a1d143 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 29 Jan 2021 19:13:19 +0000 Subject: [PATCH 5/8] Accepting request 867765 from home:balping:branches:multimedia:apps - Updated to 3.6.1 - Removed enable-build-with-qt5.15 patch as building with QT 5.15 is now enabled by upstream OBS-URL: https://build.opensuse.org/request/show/867765 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=87 --- MuseScore-3.6.1.tar.gz | 3 +++ MuseScore-3.6.tar.gz | 3 --- enable-build-with-qt515.patch | 18 -------------- musescore.changes | 47 +++++++++++++++++++++++++++++++++++ musescore.spec | 15 +++++------ 5 files changed, 56 insertions(+), 30 deletions(-) create mode 100644 MuseScore-3.6.1.tar.gz delete mode 100644 MuseScore-3.6.tar.gz delete mode 100644 enable-build-with-qt515.patch diff --git a/MuseScore-3.6.1.tar.gz b/MuseScore-3.6.1.tar.gz new file mode 100644 index 0000000..98b3a85 --- /dev/null +++ b/MuseScore-3.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca0e71995aeef50f65e52ef93e1663b91d3cbbbd68086ff949fe121da8e3081d +size 68754499 diff --git a/MuseScore-3.6.tar.gz b/MuseScore-3.6.tar.gz deleted file mode 100644 index 75d9978..0000000 --- a/MuseScore-3.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:554cfbb329b184260efdd9522777b2d8422c21f535d0955720517c37912d9ccf -size 67835667 diff --git a/enable-build-with-qt515.patch b/enable-build-with-qt515.patch deleted file mode 100644 index d0b1117..0000000 --- a/enable-build-with-qt515.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake ---- a/build/FindQt5.cmake 2021-01-14 14:33:11.000000000 +0100 -+++ b/build/FindQt5.cmake 2021-01-15 13:28:45.346084556 +0100 -@@ -36,14 +36,6 @@ - ) - endif(WIN32) - --# For Windows, because of these lines, for some unknown reason, the build of the .msi package fails. --if(NOT ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows") -- find_package(Qt5Core 5.15.0 QUIET) -- if (Qt5Core_FOUND) -- message(FATAL_ERROR "MuseScore 3 does not support Qt 5.15: 5.15.0 shows empty palettes panel, 5.15.1 and later crash when opening pre-3.6 scores due to QTBUG-77337") -- endif() --endif() -- - find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED) - - foreach(_component ${_components}) diff --git a/musescore.changes b/musescore.changes index c5f7203..23ec635 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Fri Jan 29 16:37:39 UTC 2021 - Balázs Dura-Kovács + +- 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 diff --git a/musescore.spec b/musescore.spec index 452635e..5fb65d4 100644 --- a/musescore.spec +++ b/musescore.spec @@ -18,11 +18,11 @@ %define rname mscore %define version_lesser 3.6 -%define revision 1977cb3 +%define revision d0fc8e9 %define fontdir %{_datadir}/fonts/%{name} %define docdir %{_docdir}/%{name} Name: musescore -Version: 3.6 +Version: 3.6.1 Release: 0 Summary: A WYSIWYG music score typesetter # Musescore code license is GPL-2.0 @@ -33,13 +33,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 -# Force build with Qt 5.15, despite reported problems. -# See: https://github.com/musescore/MuseScore/pull/7119 -Patch0: enable-build-with-qt515.patch # PATCH-FIX-OPENSUSE: openSUSE has qmake-qt5 qmake was reserved for qt4, which is no longer present -Patch1: use-qtmake-qt5.patch +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++ @@ -152,7 +149,7 @@ 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.md fonts/edwin/LICENSE.md.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 @@ -247,7 +244,7 @@ install -p -m 644 share/wallpaper/COPYRIGHT %{buildroot}%docdir/COPYIN # 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.md.edwin +%doc fonts/edwin/LICENSE.txt.edwin %doc fonts/leland/README.md.leland %doc fonts/leland/LICENSE.txt.leland From 79d10e0d4281f7b91856a14e7816e4442280c3dab1bb8e7e404f683033287a21 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Sat, 30 Jan 2021 14:15:53 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=88 --- musescore.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/musescore.changes b/musescore.changes index 23ec635..8fe8ccb 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Jan 29 16:37:39 UTC 2021 - Balázs Dura-Kovács +Fri Jan 29 16:37:39 UTC 2021 - Balázs Dura-Kovács - Updated to 3.6.1 * Fixed a crash on open of a file with start repeat in @@ -58,6 +58,7 @@ Tue Jan 19 11:04:54 UTC 2021 - Cor Blom - 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 From 6e572e0fa92bd7f62e94371065d1f18847f0ea99bf1598323a93b0ff992d87af Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Tue, 9 Feb 2021 07:32:56 +0000 Subject: [PATCH 7/8] Accepting request 870384 from home:balping:branches:multimedia:apps Updated to 3.6.2 Bug needs to be addressed: https://bugzilla.opensuse.org/show_bug.cgi?id=1181905 OBS-URL: https://build.opensuse.org/request/show/870384 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=89 --- MuseScore-3.6.1.tar.gz | 3 --- MuseScore-3.6.2.tar.gz | 3 +++ musescore.changes | 44 ++++++++++++++++++++++++++++++++++++++++++ musescore.spec | 4 ++-- 4 files changed, 49 insertions(+), 5 deletions(-) delete mode 100644 MuseScore-3.6.1.tar.gz create mode 100644 MuseScore-3.6.2.tar.gz diff --git a/MuseScore-3.6.1.tar.gz b/MuseScore-3.6.1.tar.gz deleted file mode 100644 index 98b3a85..0000000 --- a/MuseScore-3.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca0e71995aeef50f65e52ef93e1663b91d3cbbbd68086ff949fe121da8e3081d -size 68754499 diff --git a/MuseScore-3.6.2.tar.gz b/MuseScore-3.6.2.tar.gz new file mode 100644 index 0000000..be5772f --- /dev/null +++ b/MuseScore-3.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45 +size 69077899 diff --git a/musescore.changes b/musescore.changes index 8fe8ccb..178ca35 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Tue Feb 9 03:37:47 UTC 2021 - Dura-Kovács + +- 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 diff --git a/musescore.spec b/musescore.spec index 5fb65d4..fe704e3 100644 --- a/musescore.spec +++ b/musescore.spec @@ -18,11 +18,11 @@ %define rname mscore %define version_lesser 3.6 -%define revision d0fc8e9 +%define revision 3224f34 %define fontdir %{_datadir}/fonts/%{name} %define docdir %{_docdir}/%{name} Name: musescore -Version: 3.6.1 +Version: 3.6.2 Release: 0 Summary: A WYSIWYG music score typesetter # Musescore code license is GPL-2.0 From 56c053549b3d82dd62cbe0e898e01f37f7b25f19018374aafae3c6acbeee3723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dura-Kov=C3=A1cs?= Date: Tue, 9 Feb 2021 16:20:40 +0000 Subject: [PATCH 8/8] Accepting request 870633 from home:Vogtinator:qmlautoreqprov - Add compatibility with qml-autoreqprov OBS-URL: https://build.opensuse.org/request/show/870633 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=90 --- musescore.changes | 5 +++++ musescore.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/musescore.changes b/musescore.changes index 178ca35..1b75407 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 9 14:06:26 UTC 2021 - Fabian Vogt + +- Add compatibility with qml-autoreqprov + ------------------------------------------------------------------- Tue Feb 9 03:37:47 UTC 2021 - Dura-Kovács diff --git a/musescore.spec b/musescore.spec index fe704e3..c2b1415 100644 --- a/musescore.spec +++ b/musescore.spec @@ -16,6 +16,9 @@ # +# Internal QML imports +%global __requires_exclude qmlimport\\((MuseScore|FileIO).* + %define rname mscore %define version_lesser 3.6 %define revision 3224f34