rpms/mscore/F-10 import.log, NONE, 1.1 mscore-no-awl-plugin.patch, NONE, 1.1 mscore-separate-commonfiles.patch, NONE, 1.1 mscore-use-pclite-soundfont.patch, NONE, 1.1 mscore.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Orcan Ogetbil
oget at fedoraproject.org
Tue Mar 24 01:45:34 UTC 2009
Author: oget
Update of /cvs/pkgs/rpms/mscore/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21446/F-10
Modified Files:
.cvsignore sources
Added Files:
import.log mscore-no-awl-plugin.patch
mscore-separate-commonfiles.patch
mscore-use-pclite-soundfont.patch mscore.spec
Log Message:
* Mon Mar 23 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-3
- Add Provides: musescore = %%{name}-%%{version}
- Replace "fluid-soundfont" requirement with "soundfont2" (just for F-10, this
will be "soundfont2-default" when fluid-soundfont is default in F-10)
* Fri Mar 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-2
- Add extra BR:tex-cm-lgc for F-11+. This is necessary to build the fonts from source
- Update icon scriptlets according to the new guidelines
* Sat Feb 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-1
- Initial Fedora build
--- NEW FILE import.log ---
mscore-0_9_4-3_fc10:F-10:mscore-0.9.4-3.fc10.src.rpm:1237859078
mscore-no-awl-plugin.patch:
--- NEW FILE mscore-no-awl-plugin.patch ---
diff -rupN mscore-0.9.4.old/mscore/awl/CMakeLists.txt mscore-0.9.4/mscore/awl/CMakeLists.txt
--- mscore-0.9.4.old/mscore/awl/CMakeLists.txt 2009-02-06 05:32:19.000000000 -0500
+++ mscore-0.9.4/mscore/awl/CMakeLists.txt 2009-02-21 02:00:59.000000000 -0500
@@ -83,28 +83,4 @@ QT4_WRAP_CPP (mocs2
colorlabel.h
)
-add_library (
- awlplugin SHARED
- ${PROJECT_BINARY_DIR}/all.h
- ${PROJECT_BINARY_DIR}/all.h.pch
- ${mocs2}
- awlplugin.cpp
- aslider.cpp
- knob.cpp
- panknob.cpp
- volknob.cpp
- midipanknob.cpp
- colorlabel.cpp
- )
-
-## "-D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG -include ${PROJECT_SOURCE_DIR}/all.h"
-
-set_target_properties( awlplugin
- PROPERTIES
- COMPILE_FLAGS
- "-D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG -include ${PROJECT_SOURCE_DIR}/all.h"
- )
-
-install( TARGETS awlplugin DESTINATION ${QT_PLUGINS_DIR}/designer/ )
-
endif (NOT MINGW AND NOT APPLE)
mscore-separate-commonfiles.patch:
--- NEW FILE mscore-separate-commonfiles.patch ---
diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.cpp mscore-0.9.4/mscore/mscore/mscore.cpp
--- mscore-0.9.4.old/mscore/mscore/mscore.cpp 2009-02-06 05:33:28.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/mscore.cpp 2009-02-21 13:10:15.000000000 -0500
@@ -1576,12 +1576,12 @@ int main(int argc, char* argv[])
//
// load internal fonts
//
- if (-1 == QFontDatabase::addApplicationFont(":/fonts/mscore-20.ttf")) {
+ if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-20.ttf")) {
fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
if (!debugMode)
exit(-1);
}
- if (-1 == QFontDatabase::addApplicationFont(":/fonts/mscore1-20.ttf")) {
+ if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore1-20.ttf")) {
fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
if (!debugMode)
exit(-1);
diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
--- mscore-0.9.4.old/mscore/mscore/mscore.qrc 2009-02-21 12:56:04.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/mscore.qrc 2009-02-21 13:06:05.000000000 -0500
@@ -2,9 +2,9 @@
<RCC version="1.0">
<qresource>
<file>data/repeat.svg</file>
- <file>data/paper1.png</file>
- <file>data/paper2.png</file>
- <file>data/paper3.png</file>
+
+
+
<file>data/text_bold.svg</file>
<file>data/text_italic.svg</file>
<file>data/text_left.svg</file>
@@ -29,11 +29,11 @@
<file>data/viewmag.xpm</file>
<file>data/subscript.svg</file>
<file>data/superscript.svg</file>
- <file alias="fonts/mscore-20.ttf">fonts/mscore-20.ttf</file>
- <file alias="fonts/mscore1-20.ttf">fonts/mscore1-20.ttf</file>
- <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
+
+
+
<file>data/splash.jpg</file>
- <file alias="data/demo.msc">../demos/promenade.msc</file>
+
<file>data/speaker.svg</file>
<file>data/midiin.svg</file>
diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
--- mscore-0.9.4.old/mscore/mscore/preferences.cpp 2009-02-21 12:56:04.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/preferences.cpp 2009-02-21 13:34:13.000000000 -0500
@@ -122,7 +122,7 @@ void Preferences::init()
bgUseColor = true;
fgUseColor = false;
bgWallpaper = QString();
- fgWallpaper = ":/data/paper3.png";
+ fgWallpaper = INSTPREFIX "/share/" INSTALL_NAME "wallpaper/paper3.png";
fgColor.setRgb(50, 50, 50);
bgColor.setRgb(0x76, 0x76, 0x6e);
@@ -163,7 +163,7 @@ void Preferences::init()
layoutBreakColor = Qt::green;
antialiasedDrawing = true;
sessionStart = SCORE_SESSION;
- startScore = ":/data/demo.msc";
+ startScore = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc";
workingDirectory = ".";
lastSaveDirectory = ".";
lastSaveCopyDirectory = ".";
@@ -185,7 +185,7 @@ void Preferences::init()
midiExpandRepeats = true;
playRepeats = true;
- instrumentList = ":/data/instruments.xml";
+ instrumentList = INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml";
alternateNoteEntryMethod = false;
useMidiOutput = false;
@@ -403,8 +403,8 @@ void Preferences::read()
else if (ss == "empty")
sessionStart = EMPTY_SESSION;
- startScore = s.value("startScore", ":/data/demo.msc").toString();
- instrumentList = s.value("instrumentList", ":/data/instruments.xml").toString();
+ startScore = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc").toString();
+ instrumentList = s.value("instrumentList", INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml").toString();
s.beginGroup("PlayPanel");
playPanelPos = s.value("pos", QPoint(100, 300)).toPoint();
mscore-use-pclite-soundfont.patch:
--- NEW FILE mscore-use-pclite-soundfont.patch ---
diff -rupN mscore-0.9.4.old/mscore/mscore/fluid.cpp mscore-0.9.4/mscore/mscore/fluid.cpp
--- mscore-0.9.4.old/mscore/mscore/fluid.cpp 2009-02-06 05:33:28.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/fluid.cpp 2009-02-20 22:39:16.000000000 -0500
@@ -58,9 +58,9 @@ bool ISynth::init(int sampleRate)
p = QString(getenv("DEFAULT_SOUNDFONT"));
if (p.isEmpty()) {
//
- // fallback to integrated soundfont
+ // fallback to default soundfont
//
- p = ":/data/piano1.sf2";
+ p = INSTPREFIX "/share/soundfonts/PCLite.sf2";
}
bool rv = loadSoundFont(p);
if (!rv) {
diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
--- mscore-0.9.4.old/mscore/mscore/mscore.qrc 2009-02-06 05:33:28.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/mscore.qrc 2009-02-20 22:41:59.000000000 -0500
@@ -34,7 +34,7 @@
<file alias="data/instruments.xml">../share/templates/instruments.xml</file>
<file>data/splash.jpg</file>
<file alias="data/demo.msc">../demos/promenade.msc</file>
- <file>data/piano1.sf2</file>
+
<file>data/speaker.svg</file>
<file>data/midiin.svg</file>
<file>data/undo.svg</file>
diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
--- mscore-0.9.4.old/mscore/mscore/preferences.cpp 2009-02-06 05:33:28.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/preferences.cpp 2009-02-20 22:40:42.000000000 -0500
@@ -136,11 +136,7 @@ void Preferences::init()
enableMidiInput = true;
playNotes = true;
-#ifdef USE_GLOBAL_FLUID
- soundFont = INSTPREFIX "/piano1.sf2";
-#else
- soundFont = ":/data/piano1.sf2";
-#endif
+ soundFont = INSTPREFIX "/share/soundfonts/PCLite.sf2";
lPort = "";
rPort = "";
@@ -342,11 +338,8 @@ void Preferences::read()
lPort = s.value("lPort").toString();
rPort = s.value("rPort").toString();
-#ifdef USE_GLOBAL_FLUID
- soundFont = s.value("soundFont", INSTPREFIX "/piano1.sf2").toString();
-#else
- soundFont = s.value("soundFont", ":/data/piano1.sf2").toString();
-#endif
+ soundFont = s.value("soundFont", INSTPREFIX "/share/soundfonts/PCLite.sf2").toString();
+
showNavigator = s.value("showNavigator", true).toBool();
showStatusBar = s.value("showStatusBar", true).toBool();
showPlayPanel = s.value("showPlayPanel", false).toBool();
--- NEW FILE mscore.spec ---
%define fontfamilyname %{name}
%define minorver -0.9
Name: mscore
Summary: Music Composition & Notation Software
Version: 0.9.4
Release: 3%{?dist}
# rtf2html is LGPLv2+
# paper4.png paper5.png are LGPLv3
# the rest is GPLv2
License: GPLv2 and LGPLv2+ and LGPLv3
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://downloads.sourceforge.net/mscore/mscore-0.9.4.tar.bz2
# tar jxf mscore-*.tar.bz2
# rm -f mscore-*/mscore/mscore/data/piano1.sf2
# tar jcf mscore-0.9.4-free.tar.bz2 mscore-0.9.4/
Source0: %{name}-%{version}-free.tar.bz2
# Use Fedora's default soundfont instead of the removed one:
Patch0: %{name}-use-pclite-soundfont.patch
# The upstream provides a stipped down version of AWL plugin for qtdesigner.
# We don't really need to package this. The full version of AWL plugin
# will be part of the upcoming muse2.
Patch1: %{name}-no-awl-plugin.patch
# We don't build the common files (font files, wallpapers, demo song, instrument
# list) into the binary executable to reduce its size. This is also useful to
# inform the users about the existence of different choices for common files.
# The font files need to be separated due to the font packaging guidelines.
Patch2: %{name}-separate-commonfiles.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake jack-audio-connection-kit-devel qt4-devel
BuildRequires: alsa-lib-devel portaudio-devel fluidsynth-devel
BuildRequires: desktop-file-utils
# Fonts related:
BuildRequires: t1utils fontforge texlive fontpackages-devel
%if "%{fedora}" >= "11"
BuildRequires: tex-cm-lgc
%endif
Requires: %{name}-%{fontfamilyname}-fonts = %{version}-%{release}
# Doxygen documentation is useless. Hence we don't build it for now.
# Otherwise it needs:
# BuildRequires: graphviz doxygen texlive-latex texlive-dvips
Requires: soundfont2
Provides: musescore = %{name}-%{version}
%description
MuseScore is a free cross platform WYSIWYG music notation program. Some
highlights:
* WYSIWYG, notes are entered on a "virtual note sheet"
* Unlimited number of staves
* Up to four voices per staff
* Easy and fast note entry with mouse, keyboard or MIDI
* Integrated sequencer and FluidSynth software synthesizer
* Import and export of MusicXML and Standard MIDI Files (SMF)
* Available in 12 languages
%package %{fontfamilyname}-fonts
Summary: MuseScore fonts
Group: User Interface/X
License: GPL+ with exceptions
Requires: fontpackages-filesystem
%description %{fontfamilyname}-fonts
MuseScore is a free cross platform WYSIWYG music notation program.
This package contains the musical notation fonts for use of MuseScore.
%prep
%setup -q
%patch0 -p1 -b .soundfont
%patch1 -p1 -b .noawlplugin
%patch2 -p1 -b .separatecommon
# Remove the precompiled binary
rm mscore/rtf2html/rtf2html
# Force Fedora specific flags:
find . -name CMakeLists.txt -exec sed -i 's|-O3|%{optflags}|' {} \;
find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{optflags}|' {} \;
# Use global fluidsynth instead of the bundled one:
sed -i 's|USE_GLOBAL_FLUID FALSE|USE_GLOBAL_FLUID TRUE|' %{name}/CMakeLists.txt
# Do not build the bundled qt scripting interface:
sed -i 's|BUILD_SCRIPT_INTERFACE TRUE|BUILD_SCRIPT_INTERFACE FALSE|' %{name}/CMakeLists.txt
sed -i 's|BUILD_SCRIPT_DEBUG TRUE|BUILD_SCRIPT_DEBUG FALSE|' %{name}/CMakeLists.txt
# Fix EOL encoding
sed 's|\r||' %{name}/rtf2html/README > tmpfile
touch -r %{name}/rtf2html/README tmpfile
mv -f tmpfile %{name}/rtf2html/README
# Fix for systems (usually 64bit ones) where size_t != unsigned int
sed -i 's|relStaff %%d, %%d|relStaff %%d, %%zd|' %{name}/%{name}/importxml.cpp
# Remove preshipped fonts. We will build them from source
rm -f %{name}/%{name}/fonts/*.ttf
%build
# Build the actual program
mkdir build
pushd build
export PATH=${PATH}:%{_libdir}/qt4/bin
%cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{optflags}" ../mscore
make lupdate %{?_smp_flags}
make lrelease %{?_smp_flags}
make %{?_smp_flags} VERBOSE=1
popd
# Build fonts from source:
pushd %{name}/%{name}/fonts
./genFont
popd
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# Install fonts
mkdir -p %{buildroot}/%{_fontdir}
install -pm 644 %{name}/%{name}/fonts/%{fontfamilyname}*.ttf %{buildroot}/%{_fontdir}
# Desktop file
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
# Move images to the freedesktop location
mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32x32,64x64}/apps/
mv %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm \
%{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
mv %{buildroot}/%{_datadir}/pixmaps/%{name}.png \
%{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/
# Manpage
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}%{?minorver}
# There are many doc files spread around the tarball. Let's collect them
pushd %{name}
mv rtf2html/ChangeLog ChangeLog.rtf2html
mv rtf2html/COPYING.LESSER COPYING.LESSER.rtf2html
mv rtf2html/README README.rtf2html
mv rtf2html/README.mscore README.mscore.rtf2html
mv rtf2html/README.ru README.ru.rtf2html
mv osdabzip/README README.osdabzip
mv osdabzip/README.mscore README.mscore.osdabzip
mv share/wallpaper/COPYRIGHT COPYING.wallpaper
popd
%check
# The tests seem outdated. Skipping.
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%doc mscore/{ChangeLog*,COPYING*,manual/manual-de.odt,NEWS,README*}
%{_bindir}/%{name}
%{_datadir}/%{name}%{?minorver}
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/*
%_font_pkg -n %{fontfamilyname} %{fontfamilyname}*.ttf
%changelog
* Mon Mar 23 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-3
- Add Provides: musescore = %%{name}-%%{version}
- Replace "fluid-soundfont" requirement with "soundfont2" (just for F-10, this
will be "soundfont2-default" when fluid-soundfont is default in F-10)
* Fri Mar 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-2
- Add extra BR:tex-cm-lgc for F-11+. This is necessary to build the fonts from source
- Update icon scriptlets according to the new guidelines
* Sat Feb 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-1
- Initial Fedora build
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 7 Mar 2009 17:22:55 -0000 1.1
+++ .cvsignore 24 Mar 2009 01:45:04 -0000 1.2
@@ -0,0 +1 @@
+mscore-0.9.4-free.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 7 Mar 2009 17:22:55 -0000 1.1
+++ sources 24 Mar 2009 01:45:04 -0000 1.2
@@ -0,0 +1 @@
+69dd95b38a848b4f4ce4a4c47a7030ea mscore-0.9.4-free.tar.bz2
More information about the fedora-extras-commits
mailing list