diff --git a/mscore-3.6.2-qt-deprecation.patch b/mscore-3.6.2-qt-deprecation.patch new file mode 100644 index 0000000..5868fc5 --- /dev/null +++ b/mscore-3.6.2-qt-deprecation.patch @@ -0,0 +1,33 @@ +--- MuseScore-3.6.2/mscore/qml/palettes/Palette.qml.orig 2021-02-08 05:16:37.000000000 -0700 ++++ MuseScore-3.6.2/mscore/qml/palettes/Palette.qml 2021-02-24 20:09:00.553769644 -0700 +@@ -767,7 +767,7 @@ GridView { + // force not hiding palette cell if it is being dragged to a score + enabled: paletteCell.paletteDrag + target: mscore +- onElementDraggedToScoreView: paletteCell.paletteDrag = false ++ function onElementDraggedToScoreView() { paletteCell.paletteDrag = false; } + } + } // end ItemDelegate + } // end DelegateModel +--- MuseScore-3.6.2/mscore/qml/palettes/PalettesWidgetHeader.qml.orig 2021-02-08 05:16:37.000000000 -0700 ++++ MuseScore-3.6.2/mscore/qml/palettes/PalettesWidgetHeader.qml 2021-02-24 20:10:11.481616718 -0700 +@@ -224,7 +224,7 @@ Item { + + Connections { + target: palettesWidget +- onHasFocusChanged: { ++ function onHasFocusChanged () { + if (!palettesWidget.hasFocus && !palettesListPopup.inMenuAction) + palettesListPopup.visible = false; + } +--- MuseScore-3.6.2/mscore/qml/palettes/PaletteTree.qml.orig 2021-02-08 05:16:37.000000000 -0700 ++++ MuseScore-3.6.2/mscore/qml/palettes/PaletteTree.qml 2021-02-24 20:09:32.337701118 -0700 +@@ -771,7 +771,7 @@ ListView { + + Connections { + target: palettesWidget +- onHasFocusChanged: { ++ function onHasFocusChanged () { + if (!palettesWidget.hasFocus) { + paletteSelectionModel.clearSelection(); + expandedPopupIndex = null; diff --git a/mscore.spec b/mscore.spec index 6ec54d8..02232a7 100644 --- a/mscore.spec +++ b/mscore.spec @@ -4,7 +4,7 @@ Name: mscore Summary: Music Composition & Notation Software Version: %{shortver}.2 -Release: 1%{?dist} +Release: 2%{?dist} # The MuseScore project itself is GPLv2. Other licenses in play: # - rtf2html is LGPLv2+ # - paper4.png and paper5.png are LGPLv3 @@ -117,6 +117,9 @@ Patch1: %{name}-3.6.0-fix-qmake-path.patch Patch2: %{name}-3.6.0-unbundle.patch # Fix some glitches in the aeolus code Patch3: %{name}-3.5.0-aeolus.patch +# Fix deprecation warnings with Qt 5.15.x +# https://github.com/musescore/MuseScore/pull/7388 +Patch4: %{name}-3.6.2-qt-deprecation.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -402,6 +405,9 @@ rm %{buildroot}%{_fontconfig_templatedir}/fonts.dtd %{_datadir}/fonts/mscore-leland-fonts/metadata.json %changelog +* Sat Mar 6 2021 Jerry James - 3.6.2-2 +- Add upstream patch to silence Qt 5.15 deprecation warnings + * Mon Feb 8 2021 Jerry James - 3.6.2-1 - Version 3.6.2