From 75fb32de7289f9b385e4941aacd728f4cbe7cf83 Mon Sep 17 00:00:00 2001 From: Brendan Jones Date: Feb 29 2016 17:20:42 +0000 Subject: Update to 2.0.2 --- diff --git a/.gitignore b/.gitignore index 774255e..4af4c37 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ mscore-0.9.6.2-free.tar.bz2 /mscore-1.3-free.tar.bz2 /MuseScore-2.0.0.zip /MuseScore-2.0.1.zip +/MuseScore-2.0.2.zip diff --git a/MuseScore-2.0.1-fix-compiling-for-qt5.5.patch b/MuseScore-2.0.1-fix-compiling-for-qt5.5.patch deleted file mode 100644 index 7ca0488..0000000 --- a/MuseScore-2.0.1-fix-compiling-for-qt5.5.patch +++ /dev/null @@ -1,51 +0,0 @@ -From fc8fad97be6e760fac90925fd5d5e587b5975606 Mon Sep 17 00:00:00 2001 -From: ws -Date: Wed, 8 Jul 2015 14:39:33 +0200 -Subject: [PATCH] fix compiling for qt5.5 - ---- - all.h | 11 +++++++++++ - mscore/pluginCreator.cpp | 8 +++++--- - 2 files changed, 16 insertions(+), 3 deletions(-) - -diff --git a/all.h b/all.h -index 261b2b4..dc52e2b 100644 ---- a/all.h -+++ b/all.h -@@ -162,5 +162,16 @@ - #include - #include - #include -+ -+ -+// change Q_ASSERT to NOP if not debugging -+ -+#ifdef QT_NO_DEBUG -+#undef Q_ASSERT_X -+#define Q_ASSERT_X(a,b,c) -+#undef Q_ASSERT -+#define Q_ASSERT(a) -+#endif -+ - #endif - -diff --git a/mscore/pluginCreator.cpp b/mscore/pluginCreator.cpp -index 0a3e89e..98444d7 100644 ---- a/mscore/pluginCreator.cpp -+++ b/mscore/pluginCreator.cpp -@@ -263,10 +263,12 @@ static void qmlMsgHandler(QtMsgType type, const char* msg) - case QtFatalMsg: - s = QString("Fatal: %1\n").arg(msg); - break; --/* Qt5.2? case QtTraceMsg: -- s = QString("Trace: %1\n").arg(msg); -+ default: -+ -+// Qt5.2? case QtTraceMsg: -+// Qt5.4 case QtInfoMsg: -+ s = QString("Info: %1\n").arg(msg); - break; -- */ - } - mscore->pluginCreator()->msg(s); - } diff --git a/MuseScore-2.0.1-remove-mp3-support.patch b/MuseScore-2.0.1-remove-mp3-support.patch deleted file mode 100644 index 0988891..0000000 --- a/MuseScore-2.0.1-remove-mp3-support.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -uNr MuseScore-2.0.1/CMakeLists.txt MuseScore-2.0.1.lame/CMakeLists.txt ---- MuseScore-2.0.1/CMakeLists.txt 2015-06-14 16:46:08.607596427 -0600 -+++ MuseScore-2.0.1.lame/CMakeLists.txt 2015-06-11 21:46:12.191493236 -0600 -@@ -50,7 +50,6 @@ - include (UsePkgConfig1) - include (TargetDoc) - include (FindPulseAudio) --include (FindLame) - include (GetCompilerVersion) - include (CreatePrecompiledHeader) - -@@ -443,7 +442,6 @@ - ${OGG_INCDIR} - ${VORBIS_INCDIR} - ${SNDFILE_INCDIR} -- ${LAME_INCLUDE_DIR} - ) - - ## -diff -uNr MuseScore-2.0.1/mscore/CMakeLists.txt MuseScore-2.0.1.lame/mscore/CMakeLists.txt ---- MuseScore-2.0.1/mscore/CMakeLists.txt 2015-06-14 16:46:08.831600086 -0600 -+++ MuseScore-2.0.1.lame/mscore/CMakeLists.txt 2015-06-13 11:01:20.298736472 -0600 -@@ -226,7 +226,7 @@ - importgtp.cpp importgtp-gp4.cpp importgtp-gp5.cpp importgtp-gp6.cpp fotomode.cpp drumtools.cpp - selinstrument.cpp texteditor.cpp editstafftype.cpp texttools.cpp - editpitch.cpp editstringdata.cpp editraster.cpp pianotools.cpp mediadialog.cpp -- workspace.cpp exportmp3.cpp chordview.cpp -+ workspace.cpp chordview.cpp - album.cpp albummanager.cpp - textstyle.cpp - lineproperties.cpp stafftextproperties.cpp splitstaff.cpp -diff -uNr MuseScore-2.0.1/mscore/file.cpp MuseScore-2.0.1.lame/mscore/file.cpp ---- MuseScore-2.0.1/mscore/file.cpp 2015-06-14 16:46:08.873600773 -0600 -+++ MuseScore-2.0.1.lame/mscore/file.cpp 2015-06-11 21:47:33.668903316 -0600 -@@ -1541,7 +1541,6 @@ - fl.append(tr("FLAC Audio (*.flac)")); - fl.append(tr("Ogg Vorbis Audio (*.ogg)")); - #endif -- fl.append(tr("MP3 Audio (*.mp3)")); - fl.append(tr("Standard MIDI File (*.mid)")); - fl.append(tr("MusicXML File (*.xml)")); - fl.append(tr("Compressed MusicXML File (*.mxl)")); -@@ -1605,7 +1604,6 @@ - fl.append(tr("FLAC Audio (*.flac)")); - fl.append(tr("Ogg Vorbis Audio (*.ogg)")); - #endif -- fl.append(tr("MP3 Audio (*.mp3)")); - fl.append(tr("Standard MIDI File (*.mid)")); - fl.append(tr("MusicXML File (*.xml)")); - fl.append(tr("Compressed MusicXML File (*.mxl)")); -@@ -1801,8 +1799,6 @@ - else if (ext == "wav" || ext == "flac" || ext == "ogg") - rv = saveAudio(cs, fn); - #endif -- else if (ext == "mp3") -- rv = saveMp3(cs, fn); - else if (ext == "spos") { - // save positions of segments - rv = savePositions(cs, fn, true); -diff -uNr MuseScore-2.0.1/mscore/musescore.cpp MuseScore-2.0.1.lame/mscore/musescore.cpp ---- MuseScore-2.0.1/mscore/musescore.cpp 2015-06-14 16:46:08.913601426 -0600 -+++ MuseScore-2.0.1.lame/mscore/musescore.cpp 2015-06-11 21:48:08.914513598 -0600 -@@ -2142,8 +2142,6 @@ - if (fn.endsWith(".wav") || fn.endsWith(".ogg") || fn.endsWith(".flac")) - return mscore->saveAudio(cs, fn); - #endif -- if (fn.endsWith(".mp3")) -- return mscore->saveMp3(cs, fn); - if (fn.endsWith(".spos")) - return savePositions(cs, fn, true); - if (fn.endsWith(".mpos")) diff --git a/mscore.spec b/mscore.spec index 05407bb..9668887 100644 --- a/mscore.spec +++ b/mscore.spec @@ -3,8 +3,8 @@ Name: mscore Summary: Music Composition & Notation Software -Version: %{shortver}.1 -Release: 7%{?dist} +Version: %{shortver}.2 +Release: 1%{?dist} # rtf2html is LGPLv2+ # paper4.png paper5.png are LGPLv3 # the rest is GPLv2 @@ -34,11 +34,6 @@ Patch2: musescore-2.0.1-dso-linking.patch Patch3: MuseScore-2.0.1-fix-desktop-file.patch # Use CXXFLAGS for precompiled header Patch4: musescore-2.0.1-fix-flags-for-precompiled-header.patch -# Drop mp3 support due to no lame in fedora -# http://musescore.org/en/node/57736 -Patch5: MuseScore-2.0.1-remove-mp3-support.patch -# Backported fix for Qt5.5 - rhbz#1263806 -Patch6: MuseScore-2.0.1-fix-compiling-for-qt5.5.patch # correct fonts-tabulature.xml location Patch7: MuseScore-2.0.1-fix-fonts_tabulature.patch @@ -128,8 +123,6 @@ This package contains the musical notation fonts for use of MuseScore. %patch2 -p1 -b .dso %patch3 -p1 %patch4 -p1 -b .fixflags -%patch5 -p1 -%patch6 -p1 %patch7 -p1 # Remove the precompiled binary @@ -151,14 +144,15 @@ sed -i '/rpath/d' CMakeLists.txt %build # Build the actual program -mkdir -p build.release -pushd build.release +mkdir -p build +pushd build %cmake -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_CXX_FLAGS="%{optflags} -fsigned-char" \ -DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG -fsigned-char" \ - .. -# make PREFIX=/usr lupdate %{?_smp_flags} + -DBUILD_LAME=OFF .. + #make PREFIX=/usr lupdate %{?_smp_flags} make PREFIX=/usr lrelease %{?_smp_flags} + make PREFIX=/usr manpages %{?_smp_flags} make PREFIX=/usr %{?_smp_flags} VERBOSE=1 pushd rdoc make PREFIX=/usr @@ -166,10 +160,10 @@ pushd build.release popd %install -pushd build.release +pushd build make install PREFIX=/usr DESTDIR=%{buildroot} popd -pushd build.release/rdoc +pushd build/rdoc make install PREFIX=/usr DESTDIR=%{buildroot} popd @@ -283,9 +277,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/%{name}-%{shortver}/ %exclude %{_datadir}/%{name}-%{shortver}/manual/ %{_datadir}/icons/hicolor/*/*/* -%{_datadir}/pixmaps/mscore.png %{_datadir}/applications/%{name}.desktop -%{_datadir}/mime/packages/%{name}.xml +%exclude %{_datadir}/mime/packages/musescore.xml +%{_datadir}/mime/packages/mscore.xml %{_mandir}/man1/* %{_datadir}/soundfonts/FluidR3Mono_GM.sf3 @@ -299,14 +293,15 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/fonts/mscore/FreeSerif*.ttf %{_datadir}/fonts/mscore/MuseJazz*.ttf %{_datadir}/fonts/mscore/MScoreText.ttf -%{_datadir}/fonts/mscore/mscoreTab.ttf -%{_datadir}/fonts/mscore/mscore-BC.ttf %{_datadir}/fonts/mscore/*.otf %{_datadir}/fonts/mscore/*.json %{_datadir}/fonts/mscore/*.xml %{_datadir}/appdata/%{fontfamilyname}.metainfo.xml %changelog +* Sat Feb 27 2016 Brendan Jones .1-7 +-Update to 2.02 + * Thu Feb 04 2016 Fedora Release Engineering - 2.0.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/musescore-2.0.1-separate-commonfiles.patch b/musescore-2.0.1-separate-commonfiles.patch index 8c09c70..4e45135 100644 --- a/musescore-2.0.1-separate-commonfiles.patch +++ b/musescore-2.0.1-separate-commonfiles.patch @@ -54,16 +54,17 @@ diff -up MuseScore-2.0.1/libmscore/stafftype.cpp MuseScore-2.0.1/libmscore/staff #endif _durationFonts.clear(); _fretFonts.clear(); -diff -up MuseScore-2.0.1/libmscore/sym.cpp MuseScore-2.0.1/libmscore/sym.cpp.separatecommon ---- MuseScore-2.0.1/libmscore/sym.cpp 2015-06-14 16:46:08.802599613 -0600 -+++ MuseScore-2.0.1/libmscore/sym.cpp.separatecommon 2015-06-14 16:46:08.812599776 -0600 -@@ -27,9 +27,9 @@ namespace Ms { +diff -Nurp MuseScore-2.0.2/libmscore/sym.cpp MuseScore-2.0.2/libmscore/sym.cpp.separatecommon +--- MuseScore-2.0.2/libmscore/sym.cpp 2015-07-16 23:02:34.000000000 +0200 ++++ MuseScore-2.0.2/libmscore/sym.cpp.separatecommon 2016-02-27 10:48:14.884033967 +0100 +@@ -34,9 +34,10 @@ namespace Ms { static const int FALLBACK_FONT = 2; // Bravura - QVector ScoreFont::_scoreFonts = { + QVector ScoreFont::_scoreFonts { - ScoreFont("Emmentaler", "MScore", ":/fonts/mscore/", "mscore.ttf" ), - ScoreFont("Gonville", "Gootville", ":/fonts/gootville/", "Gootville.otf" ), - ScoreFont("Bravura", "Bravura", ":/fonts/bravura/", "Bravura.otf" ) ++ + ScoreFont("Emmentaler", "MScore", "/usr/share/fonts/mscore/", "mscore.ttf" ), + ScoreFont("Gonville", "Gootville", "/usr/share/fonts/mscore/gootville/", "Gootville.otf" ), + ScoreFont("Bravura", "Bravura", "/usr/share/fonts/mscore/bravura/", "Bravura.otf" ) @@ -112,22 +113,15 @@ diff -up MuseScore-2.0.1/mscore/preferences.cpp MuseScore-2.0.1/mscore/preferenc fgColor.setNamedColor("#f9f9f9"); iconHeight = 24; iconWidth = 28; -@@ -144,7 +144,7 @@ void Preferences::init() - - antialiasedDrawing = true; - sessionStart = SessionStart::SCORE; -- startScore = ":/data/My_First_Score.mscz"; -+ startScore = INSTPREFIX "/share/" INSTALL_NAME "demos/My_First_Score.mscz"; - defaultStyleFile = ""; - - useMidiRemote = false; -@@ -154,7 +154,8 @@ void Preferences::init() - midiExpandRepeats = true; +--- MuseScore-2.0.2/mscore/preferences.cpp 2016-02-27 10:42:39.374123325 +0100 ++++ MuseScore-2.0.2/mscore/preferences.cpp.separatecommon 2016-02-27 10:40:01.026906809 +0100 +@@ -155,7 +155,7 @@ void Preferences::init() + midiExportRPNs = false; MScore::playRepeats = true; MScore::panPlayback = true; - instrumentList1 = ":/data/instruments.xml"; -+ + instrumentList1 = INSTPREFIX "/share/" INSTALL_NAME "instruments/instruments.xml"; instrumentList2 = ""; musicxmlImportLayout = true; + diff --git a/sources b/sources index f393d41..96fa109 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -018db9e7be71b2189b3bb2834ca58c34 MuseScore-2.0.1.zip +146fe596c42d2038bbb615f09c632a11 MuseScore-2.0.2.zip