Signed-off-by: Igor Gnatenko i.gnatenko.brain@gmail.com --- .gitignore | 1 + MuseScore-2.0.1-remove-mp3-support.patch | 71 -------------------------------- mscore.spec | 12 +++--- sources | 2 +- 4 files changed, 8 insertions(+), 78 deletions(-) delete mode 100644 MuseScore-2.0.1-remove-mp3-support.patch
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-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 a4f1061..41faedc 100644 --- a/mscore.spec +++ b/mscore.spec @@ -3,8 +3,8 @@
Name: mscore Summary: Music Composition & Notation Software -Version: %{shortver}.1 -Release: 4%{?dist} +Version: %{shortver}.2 +Release: 1%{?dist} # rtf2html is LGPLv2+ # paper4.png paper5.png are LGPLv3 # the rest is GPLv2 @@ -34,9 +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
BuildRequires: alsa-lib-devel BuildRequires: cmake @@ -124,7 +121,6 @@ This package contains the musical notation fonts for use of MuseScore. %patch2 -p1 -b .dso %patch3 -p1 %patch4 -p1 -b .fixflags -%patch5 -p1
# Remove the precompiled binary rm thirdparty/rtf2html/rtf2html @@ -150,6 +146,7 @@ pushd build.release %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" \ + -DBUILD_LAME=OFF \ .. # make PREFIX=/usr lupdate %{?_smp_flags} make PREFIX=/usr lrelease %{?_smp_flags} @@ -301,6 +298,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/appdata/%{fontfamilyname}.metainfo.xml
%changelog +* Sun Aug 02 2015 Igor Gnatenko ignatenkobrain@fedoraproject.org - 2.0.2-1 +- Update to 2.0.2 + * Tue Jul 14 2015 Brendan Jones brendan.jones.it@gmail.com 2.0.1-4 - Rebuilt
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
On Sun, Aug 02, 2015 at 02:39:24AM +0300, Igor Gnatenko wrote:
Signed-off-by: Igor Gnatenko i.gnatenko.brain@gmail.com
And this is sent to devel because?
From the look of it, it belongs to the mailbox of the package maintainers or in
bugzilla, but I'm not sure I understand why sending it to devel.
Pierre
+1
@Igor: patches should be sent through bugzilla or by mail to package owners, unless you have a good reason like requests for comments or serious dispute w/ package owners though there are better ways. Moreover, not contacting package maintainer won't encourage provenpackagers to give it a shot if that's what you expected.
Regards, H.
Dudes, I don't have time sometimes to report problems to bugzilla, attach patches there. I just wanted to help. If you think it's useless (I don't think so) -- I will not contribute at all.
On Sun, Aug 2, 2015 at 7:46 PM Haïkel hguemar@fedoraproject.org wrote:
+1
@Igor: patches should be sent through bugzilla or by mail to package owners, unless you have a good reason like requests for comments or serious dispute w/ package owners though there are better ways. Moreover, not contacting package maintainer won't encourage provenpackagers to give it a shot if that's what you expected.
Regards, H. -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct
On Sunday, 02 August 2015 at 22:21, Igor Gnatenko wrote:
Dudes, I don't have time sometimes to report problems to bugzilla, attach patches there. I just wanted to help. If you think it's useless (I don't think so) -- I will not contribute at all.
It's much less useful sending patches to the devel list than sending them directly to package maintainer or attaching to bugzilla.
I wouldn't expect a patch for one of my packages to be sent here and I believe most other packagers wouldn't either.
Regards, Dominik
On Mon, 3 Aug 2015 00:59:55 +0200, Dominik 'Rathann' Mierzejewski wrote:
On Sunday, 02 August 2015 at 22:21, Igor Gnatenko wrote:
Dudes, I don't have time sometimes to report problems to bugzilla, attach patches there. I just wanted to help. If you think it's useless (I don't think so) -- I will not contribute at all.
It's much less useful sending patches to the devel list than sending them directly to package maintainer or attaching to bugzilla.
I wouldn't expect a patch for one of my packages to be sent here and I believe most other packagers wouldn't either.
Have you checked the original message? devel@ was only in Cc, To-header contained more recipients.
After spending time on creating that patch, submitting it via http://bugz.fedoraproject.org/mscore would require just a tiny bit of effort.
But we all know the problem of non-responsive maintainers in bugzilla. So, mailing patches isn't a bad idea. If that doesn't lead to anything, using bugzilla doesn't give any guarantees either. ;-)
On Mon, Aug 3, 2015 at 2:13 AM, Michael Schwendt mschwendt@gmail.com wrote:
After spending time on creating that patch, submitting it via http://bugz.fedoraproject.org/mscore would require just a tiny bit of effort.
Once configured, git-bz makes it even easier. My ~/.gitconfig has:
[bz] browser = firefox3 default-tracker = bugzilla.redhat.com
[bz-tracker "bugzilla.redhat.com"] default-product = Fedora default-version = rawhide
Adjust browser using something else than FF, this is the browser with which you have an active logged in session cookie to bugzilla.redhat.com. Then commit something and do "git bz file $packagename HEAD" in the package dir.
On 3 August 2015 at 09:14, Ville Skyttä ville.skytta@iki.fi wrote:
On Mon, Aug 3, 2015 at 2:13 AM, Michael Schwendt mschwendt@gmail.com wrote:
After spending time on creating that patch, submitting it via http://bugz.fedoraproject.org/mscore would require just a tiny bit of effort.
Once configured, git-bz makes it even easier. My ~/.gitconfig has:
[bz] browser = firefox3 default-tracker = bugzilla.redhat.com
[bz-tracker "bugzilla.redhat.com"] default-product = Fedora default-version = rawhide
Adjust browser using something else than FF, this is the browser with which you have an active logged in session cookie to bugzilla.redhat.com. Then commit something and do "git bz file $packagename HEAD" in the package dir.
This is great, I had no idea this functionality existed!
On Mon, 3 Aug 2015 01:13:52 +0200 Michael Schwendt mschwendt@gmail.com wrote:
On Mon, 3 Aug 2015 00:59:55 +0200, Dominik 'Rathann' Mierzejewski wrote:
On Sunday, 02 August 2015 at 22:21, Igor Gnatenko wrote:
Dudes, I don't have time sometimes to report problems to bugzilla, attach patches there. I just wanted to help. If you think it's useless (I don't think so) -- I will not contribute at all.
It's much less useful sending patches to the devel list than sending them directly to package maintainer or attaching to bugzilla.
I wouldn't expect a patch for one of my packages to be sent here and I believe most other packagers wouldn't either.
Have you checked the original message? devel@ was only in Cc, To-header contained more recipients.
After spending time on creating that patch, submitting it via http://bugz.fedoraproject.org/mscore would require just a tiny bit of effort.
But we all know the problem of non-responsive maintainers in bugzilla. So, mailing patches isn't a bad idea. If that doesn't lead to anything, using bugzilla doesn't give any guarantees either. ;-)
Sure, but the mailing list won't scale... if all patches go here it will become difficult to discuss other topics or find things you care about. :)
I think posting patches or other issues here is fine as long as theres some reason to involve the larger development community. ie, maintainer isn't answering and its important, unsure what to do to fix things, etc.
kevin
On 08/03/2015 04:37 PM, Kevin Fenzi wrote:
On Mon, 3 Aug 2015 01:13:52 +0200
I think posting patches or other issues here is fine as long as theres some reason to involve the larger development community.
... like in this case.
Broken upgrade paths and disinterest in fixing them have a long history. They therefore need a wider audience.
Ralf
On Mon, Aug 3, 2015, 15:15 Ville Skyttä ville.skytta@iki.fi wrote:
Once configured, git-bz makes it even easier. My ~/.gitconfig has:
[bz] browser = firefox3 default-tracker = bugzilla.redhat.com
[bz-tracker "bugzilla.redhat.com"] default-product = Fedora default-version = rawhide
Adjust browser using something else than FF, this is the browser with which you have an active logged in session cookie to bugzilla.redhat.com. Then commit something and do "git bz file $packagename HEAD" in the package dir.
Would be great to add this to fedora-packager and document it on the wiki?
-
Dominik 'Rathann' Mierzejewski -
Haïkel -
Igor Gnatenko -
Jonathan Underwood -
Kevin Fenzi -
Michael Schwendt -
Michel Alexandre Salim -
Pierre-Yves Chibon -
Ralf Corsepius -
Ville Skyttä