From 8182180894405f0d70e6a4cb981ea5aa795c35c2fbbcefe130700c390984e0b9 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 4 Feb 2011 12:17:55 +0000 Subject: [PATCH] Accepting request 60052 from home:plater Reviewed ok OBS-URL: https://build.opensuse.org/request/show/60052 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/rosegarden?expand=0&rev=7 --- CHANGES.txt | 112 ++++++++++++++++++++++++ rosegarden-10.02-plugin-lib64path.patch | 8 +- rosegarden-10.10-filepaths.patch | 14 +-- rosegarden-10.10.tar.bz2 | 3 - rosegarden-11.02.tar.bz2 | 3 + rosegarden-gcc46fix.patch | 12 +++ rosegarden.changes | 81 +++++++++++++++++ rosegarden.spec | 37 ++++---- 8 files changed, 240 insertions(+), 30 deletions(-) create mode 100644 CHANGES.txt delete mode 100644 rosegarden-10.10.tar.bz2 create mode 100644 rosegarden-11.02.tar.bz2 create mode 100644 rosegarden-gcc46fix.patch diff --git a/CHANGES.txt b/CHANGES.txt new file mode 100644 index 0000000..3ab8156 --- /dev/null +++ b/CHANGES.txt @@ -0,0 +1,112 @@ +The Rosegarden team is proud to announce the release of version 11.02 of +Rosegarden, an audio and MIDI sequencer and musical notation editor for Linux. + +http://www.rosegardenmusic.com/ + +This is a bug fix release that addresses a few of those annoying problems that +hang around for the longest time, because they are rather complicated to fix. +The most notable of these is that nine years after the first complaints, we +have FINALLY found some sensible way to handle tied notes in the matrix and +notation editors. We really painted ourselves into a corner with our design, +and we scratched our heads for years just trying to come up with some plan of +attack for this one. In the end, what we did was address the problem by +modifying the behavior of selections to treat chains of tied notes as an +unbreakable whole, instead of as separate links in an easily broken chain. This +behavior is quite different, but it seems to be working rather well. + +The splash screen photo shows a winter scene from Michael's rose garden on +Christmas Day, 2010, five days before Michael's beloved black labrador retriever +died from complications arising from canine epilepsy. + + +Bug Fixes + + * Track numbers are no longer cut off + + * The notation and matrix editors now treat a series of tied notes as + though it were a single unit, which fixes several problems that have been + outstanding since as far back as 2002 + + * Resizing a segment via click and drag near the edge or with the resize + tool now leaves that segment as the selected segment + + * When attempting to select a note by clicking toward the extreme edges of + the note head, it is less likely that you will move the note instead of merely + selecting it + + * Insertion / Playback pointer correctly advances in Notation editor when + entered notes are split and tied. + + * Progress dialogs tweaked to fine tune their behavior + + * Alt+PgUp and Alt+PgDown now highlight the events in a segment in Notation + view consistently + + + +New Features + + * The matrix editor represents tied notes with a different fill pattern + + * The split-and-tie long notes option has been made the factory default + once more, in light of the vastly improved handling of ties in the matrix and + notation editors + + + +Available Languages +The following translations are complete and up to date for this release: + + * Spanish (español o castellano) + * French (français) + * German (Deutsch) + +The following languages are missing fewer than 50 translations: + + * Czech (česky) + +The following languages are missing fewer than 100 translations: + + * Japanese (日本語) + * Swedish (svenska) + * Finnish (suomi) + +The following languages are missing fewer than 500 translations: + + * Chinese (中文) + * Italian (italiano) + +The following languages are missing more than 1000 translations: + + * Russian (русский) + * Dutch (Nederlands) + +The following languages are missing more than 2000 translations: + + * Indonesian (Bahasa Indonesia) + +The following languages are missing more than 4000 translations: + + * Catalan (Català) + * Welsh (Cymraeg) + * Estonian (eesti) + * Basque (euskara) + * Polish (polski) + +Statistics based on the number of “unfinished” translations. This reflects the +number of strings needing a translator's attention, and in some cases there may +be existing translations awaiting approval. + + +Active translators for this release: + + * D. Michael McIntyre + * Thorsten Alteholz + * Yves Guillemot + + + +People who contributed device files to the Rosegarden Library + + * Peter Knaggs + * Shannon Hughes diff --git a/rosegarden-10.02-plugin-lib64path.patch b/rosegarden-10.02-plugin-lib64path.patch index 31a41c2..8724c8c 100644 --- a/rosegarden-10.02-plugin-lib64path.patch +++ b/rosegarden-10.02-plugin-lib64path.patch @@ -1,7 +1,7 @@ Index: src/sound/LADSPAPluginFactory.cpp =================================================================== ---- src/sound/LADSPAPluginFactory.cpp.orig -+++ src/sound/LADSPAPluginFactory.cpp +--- src/sound/LADSPAPluginFactory.cpp.orig 2010-12-17 01:12:44.000000000 +0200 ++++ src/sound/LADSPAPluginFactory.cpp 2010-12-17 01:12:48.000000000 +0200 @@ -565,7 +565,7 @@ LADSPAPluginFactory::getPluginPath() path = cpath; @@ -13,8 +13,8 @@ Index: src/sound/LADSPAPluginFactory.cpp path = std::string(home) + "/.ladspa:" + path; Index: src/sound/DSSIPluginFactory.cpp =================================================================== ---- src/sound/DSSIPluginFactory.cpp.orig -+++ src/sound/DSSIPluginFactory.cpp +--- src/sound/DSSIPluginFactory.cpp.orig 2010-12-17 01:12:44.000000000 +0200 ++++ src/sound/DSSIPluginFactory.cpp 2010-12-17 01:12:48.000000000 +0200 @@ -234,7 +234,7 @@ DSSIPluginFactory::getPluginPath() path = cpath; diff --git a/rosegarden-10.10-filepaths.patch b/rosegarden-10.10-filepaths.patch index 1b19b53..8f9f2ce 100644 --- a/rosegarden-10.10-filepaths.patch +++ b/rosegarden-10.10-filepaths.patch @@ -1,8 +1,8 @@ -Index: rosegarden-10.04/src/gui/widgets/FileDialog.cpp +Index: src/gui/widgets/FileDialog.cpp =================================================================== ---- rosegarden-10.04.orig/src/gui/widgets/FileDialog.cpp -+++ rosegarden-10.04/src/gui/widgets/FileDialog.cpp -@@ -47,8 +47,8 @@ FileDialog::FileDialog(QWidget *parent, +--- src/gui/widgets/FileDialog.cpp.orig 2010-12-17 01:12:44.000000000 +0200 ++++ src/gui/widgets/FileDialog.cpp 2010-12-17 01:13:37.000000000 +0200 +@@ -49,8 +49,8 @@ FileDialog::FileDialog(QWidget *parent, QList urls; QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path(); @@ -13,10 +13,10 @@ Index: rosegarden-10.04/src/gui/widgets/FileDialog.cpp QString rosegarden = home + "/rosegarden"; RG_DEBUG << "FileDialog::FileDialog(...)" << endl -Index: rosegarden-10.04/src/gui/studio/BankEditorDialog.cpp +Index: src/gui/studio/BankEditorDialog.cpp =================================================================== ---- rosegarden-10.04.orig/src/gui/studio/BankEditorDialog.cpp -+++ rosegarden-10.04/src/gui/studio/BankEditorDialog.cpp +--- src/gui/studio/BankEditorDialog.cpp.orig 2010-12-17 01:12:44.000000000 +0200 ++++ src/gui/studio/BankEditorDialog.cpp 2010-12-17 01:13:37.000000000 +0200 @@ -1554,7 +1554,7 @@ void BankEditorDialog::slotImport() { diff --git a/rosegarden-10.10.tar.bz2 b/rosegarden-10.10.tar.bz2 deleted file mode 100644 index 073d5de..0000000 --- a/rosegarden-10.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0924dc136dd0e4a3352370449b8349c2339848672c5382111cd9073eff2447c5 -size 5748328 diff --git a/rosegarden-11.02.tar.bz2 b/rosegarden-11.02.tar.bz2 new file mode 100644 index 0000000..c9ca21a --- /dev/null +++ b/rosegarden-11.02.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9aee73936c2bf5efb0dc184a8c54089bc012e8c0b7a68fd2526ef9f67098193 +size 5818771 diff --git a/rosegarden-gcc46fix.patch b/rosegarden-gcc46fix.patch new file mode 100644 index 0000000..efabc82 --- /dev/null +++ b/rosegarden-gcc46fix.patch @@ -0,0 +1,12 @@ +Index: src/sound/AudioCache.h +=================================================================== +--- src/sound/AudioCache.h.orig 2010-01-05 16:41:33.000000000 +0200 ++++ src/sound/AudioCache.h 2010-12-17 01:16:27.000000000 +0200 +@@ -17,6 +17,7 @@ + #define _AUDIO_CACHE_H_ + + #include ++#include + + namespace Rosegarden + { diff --git a/rosegarden.changes b/rosegarden.changes index dde00d7..394b015 100644 --- a/rosegarden.changes +++ b/rosegarden.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Fri Feb 4 09:06:54 UTC 2011 - davejplater@gmail.com + +- Update to version 11.02, rosegarden-gcc46fix.patch is merged. +- Upstream bug Fixes: *Track numbers are no longer cut off + *The notation and matrix editors now treat a series of tied + notes as though it were a single unit, which fixes several + problems that have been outstanding since as far back as 2002 + *Resizing a segment via click and drag near the edge or with the + resize tool now leaves that segment as the selected segment + *When attempting to select a note by clicking toward the extreme + edges of the note head, it is less likely that you will move the + note instead of merely selecting it. + *Insertion / Playback pointer correctly advances in Notation + editor when entered notes are split and tied. + *Progress dialogs tweaked to fine tune their behavior. + *Alt+PgUp and Alt+PgDown now highlight the events in a segment in + Notation view consistently. +- New Features: *The matrix editor represents tied notes with a + different fill pattern + *The split-and-tie long notes option has been made the factory + default once more, in light of the vastly improved handling of + ties in the matrix and notation editors. +- Translations complete and uptodate: Spanish French German +- Missing less than 50 translations: Czech (česky) +- Missing less than 100 translations: Japanese Swedish Finnish +- Missing less than 500 translations: Chinese Italian +- Missing more than 1000 translations: Russian Dutch +- Missing more than 2000 translations: Indonesian +- Missing more than 4000 translations: Catalan Welsh Estonian, Basque Polish + +------------------------------------------------------------------- +Sat Dec 4 18:42:26 UTC 2010 - davejplater@gmail.com + +- Update to svn snapshot 10.10.12152 +- Upstream changes : + *Italian update by Mario Moles + *Czech update by Pavel Fric + *Resizing a segment via click and drag near the edge or with the + resize tool now leaves that segment as the selected segment. + *Fixed the grace note bug. + +------------------------------------------------------------------- +Wed Nov 24 07:34:37 UTC 2010 - davejplater@gmail.com + +- Update to svn snapshot 10.10.12147 +- Upstream changes : + *ifdef around code that only works in Qt 4.6+ + +------------------------------------------------------------------- +Tue Nov 23 07:21:32 UTC 2010 - davejplater@gmail.com + +- Update to svn snapshot 10.10.12146 +- Added CHANGES.txt and various other text docs +- Upstream changes : + *fix #3114498 + *patch from J. P. Morris in connection with #3109133 + *Also removing the deprecated constructor in LineEdit + *Modified the InsertTupletDialog to have SpinBoxes, and also the + tuplet.png + *Correct some comments + *Some layout fixes to TupletDialog and InsertTupletDialog; remove + redundant includes correct "Insert rest" to "Insert Rest" + *Adding an insertion mode for general tuplets + *nice little triplet time beaming incremental improvement from + Colin Fletcher + *Holding down Ctrl while dragging in the loop ruler now causes the + playback position pointer to snap to beat. + *Enable QGraphicsView::IndirectPainting mode on Panner. + *Single sweep selecitons are working now. + *Skip indications in spilt-by-pitch. + *More work on handling ties in the matrix. + *A fixed point size of 7 is the number here.My track numbers no + longer have the top third cut off. + *Prep for 11.02, I'm guessing. 10.12 might be possible. We'll go + with "Claire de Lune" for this one. "Don Juan" proposed for the + next one, simply because I used to have a Don Juan rose. It's a + good classic red climber. + *I also fixed a stylesheet issue that I'm not bothering to + propagate to the stable 10_10 branch. + ------------------------------------------------------------------- Fri Nov 5 21:30:15 UTC 2010 - davejplater@gmail.com diff --git a/rosegarden.spec b/rosegarden.spec index f777ae0..d9d21d1 100644 --- a/rosegarden.spec +++ b/rosegarden.spec @@ -1,7 +1,7 @@ # -# spec file for package rosegarden (Version 10.10) +# spec file for package rosegarden4 (Version 11.02) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,27 +13,28 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ -# # norootforbuild - Name: rosegarden -BuildRequires: libjack-devel -BuildRequires: libqt4-devel >= 4.4.0 -BuildRequires: alsa-devel dssi-devel fftw3-devel ladspa-devel liblrdf-devel libxml2-devel lirc-devel -BuildRequires: libsamplerate-devel libsndfile-devel -BuildRequires: fdupes liblo-devel shared-mime-info update-desktop-files -Version: 10.10 -Release: 1 +BuildRequires: libjack-devel xorg-x11-util-devel +BuildRequires: libqt4-devel >= 4.4.0 pkg-config liblo-devel +BuildRequires: alsa-devel dssi-devel fftw3-devel ladspa-devel liblrdf-devel +BuildRequires: libsamplerate-devel libsndfile-devel libxml2-devel lirc-devel +BuildRequires: fdupes shared-mime-info update-desktop-files hicolor-icon-theme +Version: 11.02 +Release: 0 License: GPLv2+ Source0: http://sourceforge.net/projects/rosegarden/rosegarden-%{version}.tar.bz2 Source1: rosegarden.xpm Source2: rosegarden.1 +Source3: CHANGES.txt # This patch fixes the 64 bit lib search path for dssi and ladspa and is distro specific for now. Patch0: rosegarden-10.02-plugin-lib64path.patch # This patch fixes the file search paths for examples, templates and midi driver libraries. -Patch1: rosegarden-%{version}-filepaths.patch +Patch1: rosegarden-10.10-filepaths.patch +#This patch is merged upstream but I'm leaving it here for future gcc46 errors. +#Patch2: rosegarden-gcc46fix.patch Group: Productivity/Multimedia/Sound/Midi Summary: Midi, Audio And Notation Editor Icon: rosegarden.xpm @@ -71,7 +72,10 @@ Authors: %prep %setup -q %patch0 -%patch1 -p1 +%patch1 +#This patch is merged upstream but I'm leaving it here for future gcc46 errors. +#%%patch2 +# When we build svn we need to execute bootstrap.sh it doesn't harm the release build either. sh bootstrap.sh %{?suse_update_config:%{suse_update_config -f}} @@ -81,7 +85,6 @@ export QTDIR=/usr/ export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb" export CXXFLAGS="$CFLAGS" # -fmessage-length=0 -O2 -fno-strict-aliasing -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -#sh bootstrap.sh %configure --enable-debug --localedir=%{_datadir}/rosegarden/locale/ %__make %{?jobs:-j%{jobs}} # This translation handling make section is possibly only necessary when building svn @@ -104,6 +107,8 @@ chmod 644 %{buildroot}%{_datadir}/rosegarden/scripts/lircrc.rosegarden chmod 644 %{buildroot}%{_datadir}/rosegarden/scripts/README chmod 644 %{buildroot}%{_datadir}/rosegarden/scripts/color-list chmod 644 %{buildroot}%{_datadir}/rosegarden/scripts/simple-makefile +# Copy CHANGES.txt, created from sourceforge web page. +cp -v %{S:3} ./ %__install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/pixmaps/rosegarden.xpm" %suse_update_desktop_file %{buildroot}/%{_datadir}/applications/rosegarden.desktop @@ -123,7 +128,7 @@ rm -rf %buildroot %files %defattr(-,root,root) -%dir %{_datadir}/icons/hicolor +%doc AUTHORS COPYING README CHANGES.txt %dir %{_datadir}/rosegarden/ %dir %{_datadir}/rosegarden/autoload %dir %{_datadir}/rosegarden/chords @@ -140,7 +145,7 @@ rm -rf %buildroot %{_datadir}/pixmaps/rosegarden.xpm %{_datadir}/applications/rosegarden.desktop %{_bindir}/rosegarden - %{_mandir}/man1/* +%{_mandir}/man1/* %{_datadir}/rosegarden/* %{_datadir}/rosegarden/presets/* %{_datadir}/rosegarden/pixmaps/*