[mscore] Update to 1.1.
Orcan Ogetbil
oget at fedoraproject.org
Fri Jul 29 20:58:26 UTC 2011
commit 53aa6eea9f5eeb4e01ad0fd4d01cb15303b18c92
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Fri Jul 29 16:58:14 2011 -0400
Update to 1.1.
.gitignore | 1 +
mscore-separate-commonfiles.patch | 30 +++++++++++-----------
mscore-use-default-soundfont.patch | 50 +++++++++++++++++++++---------------
mscore.spec | 21 ++++++++------
sources | 2 +-
5 files changed, 58 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b381700..00bd64f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ mscore-0.9.6.1-free.tar.bz2
mscore-0.9.6.2-free.tar.bz2
/mscore-0.9.6.3-free.tar.bz2
/mscore-1.0-free.tar.bz2
+/mscore-1.1-free.tar.bz2
diff --git a/mscore-separate-commonfiles.patch b/mscore-separate-commonfiles.patch
index dd39394..c1b5e2e 100644
--- a/mscore-separate-commonfiles.patch
+++ b/mscore-separate-commonfiles.patch
@@ -1,7 +1,7 @@
-diff -rupN mscore-1.0.old/mscore/mscore/mscore.cpp mscore-1.0/mscore/mscore/mscore.cpp
---- mscore-1.0.old/mscore/mscore/mscore.cpp 2011-02-04 16:13:12.000000000 -0500
-+++ mscore-1.0/mscore/mscore/mscore.cpp 2011-02-08 22:58:03.000000000 -0500
-@@ -1888,17 +1888,17 @@ int main(int argc, char* av[])
+diff -rupN mscore-1.1.old/mscore/mscore/mscore.cpp mscore-1.1/mscore/mscore/mscore.cpp
+--- mscore-1.1.old/mscore/mscore/mscore.cpp 2011-07-28 22:00:11.000000000 -0400
++++ mscore-1.1/mscore/mscore/mscore.cpp 2011-07-28 22:01:23.000000000 -0400
+@@ -1906,17 +1906,17 @@ int main(int argc, char* av[])
// load internal fonts
//
@@ -18,13 +18,13 @@ diff -rupN mscore-1.0.old/mscore/mscore/mscore.cpp mscore-1.0/mscore/mscore/msco
exit(-1);
}
- if (-1 == QFontDatabase::addApplicationFont(":/fonts/MuseJazz.ttf")) {
-+ if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-MuseJazz.ttf")) {
++ if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-MuseJazz-Medium.ttf")) {
fprintf(stderr, "Mscore: fatal error: cannot load internal font MuseJazz.ttf\n");
if (!debugMode)
exit(-1);
-diff -rupN mscore-1.0.old/mscore/mscore/mscore.qrc mscore-1.0/mscore/mscore/mscore.qrc
---- mscore-1.0.old/mscore/mscore/mscore.qrc 2011-02-04 16:13:12.000000000 -0500
-+++ mscore-1.0/mscore/mscore/mscore.qrc 2011-02-08 22:59:23.000000000 -0500
+diff -rupN mscore-1.1.old/mscore/mscore/mscore.qrc mscore-1.1/mscore/mscore/mscore.qrc
+--- mscore-1.1.old/mscore/mscore/mscore.qrc 2011-07-27 09:32:43.000000000 -0400
++++ mscore-1.1/mscore/mscore/mscore.qrc 2011-07-28 22:02:05.000000000 -0400
@@ -5,11 +5,11 @@
<file>data/previous.png</file>
<file>data/next.png</file>
@@ -43,7 +43,7 @@ diff -rupN mscore-1.0.old/mscore/mscore/mscore.qrc mscore-1.0/mscore/mscore/msco
<file>data/text_italic.svg</file>
<file>data/text_left.svg</file>
@@ -33,12 +33,12 @@
- <file>data/viewmag.xpm</file>
+ <file>data/viewmag.svg</file>
<file>data/subscript.svg</file>
<file>data/superscript.svg</file>
- <file>fonts/mscore-20.ttf</file>
@@ -60,9 +60,9 @@ diff -rupN mscore-1.0.old/mscore/mscore/mscore.qrc mscore-1.0/mscore/mscore/msco
<file>data/speaker.svg</file>
<file>data/midiin.svg</file>
<file>data/undo.svg</file>
-diff -rupN mscore-1.0.old/mscore/mscore/preferences.cpp mscore-1.0/mscore/mscore/preferences.cpp
---- mscore-1.0.old/mscore/mscore/preferences.cpp 2011-02-04 16:13:12.000000000 -0500
-+++ mscore-1.0/mscore/mscore/preferences.cpp 2011-02-08 23:03:00.000000000 -0500
+diff -rupN mscore-1.1.old/mscore/mscore/preferences.cpp mscore-1.1/mscore/mscore/preferences.cpp
+--- mscore-1.1.old/mscore/mscore/preferences.cpp 2011-07-28 22:00:11.000000000 -0400
++++ mscore-1.1/mscore/mscore/preferences.cpp 2011-07-28 22:04:20.000000000 -0400
@@ -115,7 +115,7 @@ void Preferences::init()
bgUseColor = true;
fgUseColor = false;
@@ -90,7 +90,7 @@ diff -rupN mscore-1.0.old/mscore/mscore/preferences.cpp mscore-1.0/mscore/mscore
alternateNoteEntryMethod = false;
proximity = 6;
-@@ -344,7 +344,7 @@ void Preferences::read()
+@@ -345,7 +345,7 @@ void Preferences::read()
bgUseColor = s.value("bgUseColor", true).toBool();
fgUseColor = s.value("fgUseColor", false).toBool();
bgWallpaper = s.value("bgWallpaper").toString();
@@ -108,5 +108,5 @@ diff -rupN mscore-1.0.old/mscore/mscore/preferences.cpp mscore-1.0/mscore/mscore
+ startScore = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx").toString();
+ instrumentList = s.value("instrumentList", INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml").toString();
- s.beginGroup("PlayPanel");
- playPanelPos = s.value("pos", QPoint(100, 300)).toPoint();
+ readShortcuts();
+ }
diff --git a/mscore-use-default-soundfont.patch b/mscore-use-default-soundfont.patch
index 6f97662..b4c2daf 100644
--- a/mscore-use-default-soundfont.patch
+++ b/mscore-use-default-soundfont.patch
@@ -1,34 +1,42 @@
-diff -rupN mscore-0.9.6.old/mscore/mscore/mscore.cpp mscore-0.9.6/mscore/mscore/mscore.cpp
---- mscore-0.9.6.old/mscore/mscore/mscore.cpp 2010-06-07 17:26:55.000000000 -0400
-+++ mscore-0.9.6/mscore/mscore/mscore.cpp 2010-06-14 20:44:00.000000000 -0400
-@@ -1845,7 +1845,7 @@ int main(int argc, char* av[])
+diff -rupN mscore-1.1.old/mscore/mscore/mscore.cpp mscore-1.1/mscore/mscore/mscore.cpp
+--- mscore-1.1.old/mscore/mscore/mscore.cpp 2011-07-27 09:32:43.000000000 -0400
++++ mscore-1.1/mscore/mscore/mscore.cpp 2011-07-28 21:54:28.000000000 -0400
+@@ -1883,7 +1883,7 @@ int main(int argc, char* av[])
if (!useFactorySettings)
preferences.read();
else {
-- preferences.soundFont = mscoreGlobalShare + "/sound/TimGM6mb.sf2";
-+ preferences.soundFont = QString(INSTPREFIX "/share/soundfonts/default.sf2");
+- preferences.soundFont = mscoreGlobalShare+"sound/TimGM6mb.sf2";
++ preferences.soundFont = QString(INSTPREFIX "/share/soundfonts/default.sf2");
}
QSplashScreen* sc = 0;
-diff -rupN mscore-0.9.6.old/mscore/mscore/preferences.cpp mscore-0.9.6/mscore/mscore/preferences.cpp
---- mscore-0.9.6.old/mscore/mscore/preferences.cpp 2010-06-07 17:26:55.000000000 -0400
-+++ mscore-0.9.6/mscore/mscore/preferences.cpp 2010-06-14 20:45:20.000000000 -0400
-@@ -360,10 +360,10 @@ void Preferences::read()
+@@ -3288,4 +3288,4 @@ void MuseScore::closeWebPanelPermanently
+ showWebPanel(false);
+ preferences.showWebPanel = false;
+ preferences.dirty = true;
+- }
+\ No newline at end of file
++ }
+diff -rupN mscore-1.1.old/mscore/mscore/preferences.cpp mscore-1.1/mscore/mscore/preferences.cpp
+--- mscore-1.1.old/mscore/mscore/preferences.cpp 2011-07-27 09:32:44.000000000 -0400
++++ mscore-1.1/mscore/mscore/preferences.cpp 2011-07-28 21:56:37.000000000 -0400
+@@ -361,12 +361,8 @@ void Preferences::read()
+ playNotes = s.value("playNotes", true).toBool();
lPort = s.value("lPort").toString();
rPort = s.value("rPort").toString();
-
-- soundFont = s.value("soundFont", mscoreGlobalShare+"/sound/TimGM6mb.sf2").toString();
-+ soundFont = s.value("soundFont", QString(INSTPREFIX "/share/soundfonts/default.sf2")).toString();
- if (soundFont == ":/data/piano1.sf2") {
- // silently change to new default sound font
-- soundFont = mscoreGlobalShare + "/sound/TimGM6mb.sf2";
-+ soundFont = QString(INSTPREFIX "/share/soundfonts/default.sf2");
- }
+- defaultSoundfont = mscoreGlobalShare+"sound/TimGM6mb.sf2";
++ defaultSoundfont = QString(INSTPREFIX "/share/soundfonts/default.sf2");
+ soundFont = s.value("soundFont", defaultSoundfont).toString();
+- if (soundFont == ":/data/piano1.sf2") {
+- // silently change to new default sound font
+- soundFont = defaultSoundfont;
+- }
showNavigator = s.value("showNavigator", true).toBool();
showStatusBar = s.value("showStatusBar", true).toBool();
-diff -rupN mscore-0.9.6.old/mscore/share/sound/CMakeLists.txt mscore-0.9.6/mscore/share/sound/CMakeLists.txt
---- mscore-0.9.6.old/mscore/share/sound/CMakeLists.txt 2010-06-07 17:27:27.000000000 -0400
-+++ mscore-0.9.6/mscore/share/sound/CMakeLists.txt 2010-06-14 20:46:18.000000000 -0400
+ showPlayPanel = s.value("showPlayPanel", false).toBool();
+diff -rupN mscore-1.1.old/mscore/share/sound/CMakeLists.txt mscore-1.1/mscore/share/sound/CMakeLists.txt
+--- mscore-1.1.old/mscore/share/sound/CMakeLists.txt 2011-07-27 09:32:55.000000000 -0400
++++ mscore-1.1/mscore/share/sound/CMakeLists.txt 2011-07-28 21:57:16.000000000 -0400
@@ -20,6 +20,6 @@
install(FILES
diff --git a/mscore.spec b/mscore.spec
index ec15305..dc9b0ca 100644
--- a/mscore.spec
+++ b/mscore.spec
@@ -1,9 +1,8 @@
%global fontfamilyname %{name}
-%global majorver -1.0
Name: mscore
Summary: Music Composition & Notation Software
-Version: 1.0
+Version: 1.1
Release: 1%{?dist}
# rtf2html is LGPLv2+
# paper4.png paper5.png are LGPLv3
@@ -13,10 +12,10 @@ Group: Applications/Multimedia
URL: http://musescore.org/en
# Upstream tarball contains a non-free soundfont "Gort's Minipiano"
# We generate our own tarball by removing this soundfont via:
-# wget http://download.sourceforge.net/mscore/MuseScore-1.0.tar.bz2
-# tar jxf MuseScore-1.0.tar.bz2
+# wget http://download.sourceforge.net/mscore/mscore-1.1.tar.bz2
+# tar jxf mscore-1.1.tar.bz2
# rm -f mscore-*/mscore/mscore/data/piano1.sf2
-# tar jcf mscore-1.0-free.tar.bz2 mscore-1.0/
+# tar jcf mscore-1.1-free.tar.bz2 mscore-1.1/
Source0: %{name}-%{version}-free.tar.bz2
# For building the jazz font
Source1: %{name}-ConvertFont.ff
@@ -53,6 +52,7 @@ BuildRequires: libsndfile-devel >= 1.0.19
BuildRequires: portaudio-devel
BuildRequires: qt4-devel
BuildRequires: qtsingleapplication-devel
+BuildRequires: qt-webkit-devel
Requires: %{name}-fonts = %{version}-%{release}
Requires: soundfont2-default
@@ -205,7 +205,7 @@ mkdir -p %{buildroot}/%{_mandir}/man1
install -pm 644 %{name}/packaging/%{name}.1 %{buildroot}/%{_mandir}/man1/
# Openoffice templates
-cp -a %{name}/utils/OOoMuseScore/ %{buildroot}/%{_datadir}/%{name}%{?majorver}
+cp -a %{name}/utils/OOoMuseScore/ %{buildroot}/%{_datadir}/%{name}-%{version}
# There are many doc files spread around the tarball. Let's collect them
pushd %{name}
@@ -247,8 +247,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%doc mscore/{ChangeLog*,COPYING*,NEWS,README*}
%{_bindir}/%{name}
-%{_datadir}/%{name}%{?majorver}
-%exclude %{_datadir}/%{name}%{?majorver}/man/
+%{_datadir}/%{name}-%{version}/
+%exclude %{_datadir}/%{name}-%{version}/man/
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/%{name}.xml
@@ -258,12 +258,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files doc
%defattr(-,root,root,-)
-%doc %{_datadir}/%{name}%{?majorver}/man/
+%doc %{_datadir}/%{name}-%{version}/man/
%_font_pkg %{fontfamilyname}*.ttf
%changelog
+* Thu Jul 28 2011 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.1-1
+- Update to 1.1.
+
* Tue Feb 08 2011 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0-1
- Update to 1.0.
diff --git a/sources b/sources
index fe1facd..aab0988 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c0477e9aaa963590d48a6bfb771c4df mscore-1.0-free.tar.bz2
+54b695773ef3efe818ec714b3074e682 mscore-1.1-free.tar.bz2
More information about the scm-commits
mailing list