From d7676d311128a090d23cec521ccd9204d042f36c Mon Sep 17 00:00:00 2001 From: Brendan Jones Date: Dec 24 2017 20:06:40 +0000 Subject: Update to 17.12 --- diff --git a/.gitignore b/.gitignore index c15d12d..2d991d9 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ rosegarden-10.04.2.tar.bz2 /rosegarden-14.12.tar.bz2 /rosegarden-15.10.2.tar.bz2 /rosegarden-16.02.tar.bz2 +/rosegarden-17.12.tar.bz2 diff --git a/rosegarden-16.02-gcc6.patch b/rosegarden-16.02-gcc6.patch deleted file mode 100644 index 8a89070..0000000 --- a/rosegarden-16.02-gcc6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurp rosegarden-16.02.orig/src/gui/dialogs/PitchBendSequenceDialog.cpp rosegarden-16.02.mod/src/gui/dialogs/PitchBendSequenceDialog.cpp ---- rosegarden-16.02.orig/src/gui/dialogs/PitchBendSequenceDialog.cpp 2016-02-29 13:18:01.000000000 +0100 -+++ rosegarden-16.02.mod/src/gui/dialogs/PitchBendSequenceDialog.cpp 2016-04-25 07:30:49.578374291 +0200 -@@ -919,7 +919,7 @@ PitchBendSequenceDialog::addStepwiseEven - { - const int rawStepSize = spinboxToControlDelta(m_stepSize); - if (rawStepSize == 0) { return; } -- numSteps = abs(float(valueChange) / float(rawStepSize) + 0.5); -+ numSteps = fabs(float(valueChange) / float(rawStepSize) + 0.5); - break; - } - } diff --git a/rosegarden-16.02.README b/rosegarden-16.02.README deleted file mode 100644 index 35ed57f..0000000 --- a/rosegarden-16.02.README +++ /dev/null @@ -1,83 +0,0 @@ -====== ROSEGARDEN 16.02, codename "Querida" RELEASED ====== - -The Rosegarden team is proud to announce the release of version 16.02 of -Rosegarden, an audio and MIDI sequencer and musical notation editor for Linux. - -http://www.rosegardenmusic.com/ - -This release fixes a major bug in the new build system, along with several -other bugs. Qt 5 builds have been tested extensively, and building with either -version of Qt is considered production ready as of this release. - -In addition to fixing bugs, Yves has added a very nice new mouse quick entry -mode to the notation editor. This feature adds a floating green preview note -at the insertion point, and allows you to cycle through common note and rest -durations and accidentals without moving your cursor out of the editing area. - -Ted took on the big job of replacing our old MIDI THRU routing model with a -whole new system that allows fine control on a track by track level. This -renders the historical Studio menu routing control completely obsolete, and -provides a better experience when using Rosegarden with more than one MIDI -input device. - -BUG FIXES - - * Fix #1486, involving interacting with the loaded document while in the - middle of loading a new one - * Fix scroll bar refresh problem after adding segments - * Make it possible to disable LIRC, even when it's detected - * Correct the install location of data files on certain platforms - * Fix scrollbar problem after inserting segments - * Fix handling of segment labels when copying/pasting segments - * Reduce number of undo/redo events on the stack for some user actions (one - action one undo instead of one action two or more undos) - * Various tweaking and twiddling of tooltips, context sensitive help, and - layout spacing - * Fix notation editor context menu (#1492) - * Fix notation editor crash on double middle click (#1493) - * Fix label issue with drag copy undo. Bug #1450. Undo after ctrl+drag copy - now restores the properlabel to the original segment - * Fix Insert Controller Sequence (Bug #1478) Previously, in the NotationView, - adding a controller sequence where there were no matching controller sequences - would reset the start time of the segment to 0. Now it leaves the segment start - time alone. - * Fix #1478: Segments extended to the beginning after adding controller - sequence - * Fix refresh bug introduced by r14441 - * At file load time, only a single set of CCs goes out (#1480) - * Add "Allow Reset All Controllers" to preferences. This fixes bug #1485 and - is related to bug #1480 - * Fix #1504. THRU routing responds to changes in Track Parameters instantly - - -NEW FEATURES - - * Add the capability to store any number of comments pages in the - composition. This allow the translation of the notes displayed in a popup - dialog when the document is loaded. The comment page whose name matches the - locale language code is displayed. - * Add a French translation to the comment embedded in - lilypond-alternative-endings_new-way.rg example file. - * When using the mouse to enter notation, you see a preview of the note that - you will enter if you click the button - * New mouse quick entry mode: - * The mouse wheel can be used to select the note or rest duration - * A mouse mid click switches between note and rest insert mode - * Holding the Shift key while entering a note adds a sharp - * Holding the Control key while entering a note adds a flat - * Holding Shift + Ctrl while entering a note adds a natural - * Implement track-by-track THRU routing. The Recording filters "Thru - Routing" field in the Track Parameters box is now fully functional. The Studio - -> MIDI Through Routing menu option has been removed. - - -OTHER PEOPLE WHO CONTRIBUTED TO ROSEGARDEN DEVELOPMENT - - * Giovanni Mariani - * Timo Gurr - - -PEOPLE WHO CONTRIBUTED DEVICE FILES TO THE ROSEGARDEN LIBRARY - - * D. Michael McIntyre - * Ted Felix diff --git a/rosegarden-17.12.README b/rosegarden-17.12.README new file mode 100644 index 0000000..9122529 --- /dev/null +++ b/rosegarden-17.12.README @@ -0,0 +1,69 @@ +ROSEGARDEN 17.12, codename "Ultimate Pleasure" RELEASED + +The Rosegarden team is proud to announce the release of version 17.12 of +Rosegarden, a MIDI sequencer that features a rich understanding of music +notation along with basic support for digital audio. + +http://www.rosegardenmusic.com/ + +17.12 brings us numerous bug fixes by Yves Guillemot and Ted Felix. Ted +has also continued his work on cleaning up the source base with a +rewrite of the Audio Mixer window and simplified handling of the volume, +pan, etc... control change knobs and faders. + +BUG FIXES + + * Fix progress dialog lockups in KDE (bug #1546, r15031-r15034) + + * Fix disappearing lyrics in lyrics editor (bug #1547, r15035-r15036) + + * Fix bug #1548: Last syllable of lyrics is not copied between two + linked segments. (r15037) + + * Fix bug #1550: Crash with lyric editor and linked segments (r15038) + + * Fix bug #1551: No sound from an audio file when pressing rewind then + play. (r15039) + + * Fix bug #1549: Matrix Editor: Velocity ruler not updated correctly + when changing velocity using the velocity tool (r15041-r15046) + + * Fix alias change not updating label on the audio instrument + parameters. (r15058) + + * Fix miscellaneous cosmetic issues related to the ThornStyle upgrade. + (r15076-r15081) + + * Fix time mode toolbar buttons on the Event List and other windows. + (r15083) + + * Fix incorrect window titles on the preferences and document + properties windows. (r15084) + + * Fix garbage property names in Event Edit window. (r15085) + + * Display velocities modified from the velocity ruler in the status + bar for the notation editor. (r15088) + + * Fix bug #1552: Rosegarden fails to build with cmake-3.9.0. (r15089) + + * Fix crash when launching plugin dialog introduced by r14648. + (r15091) + + * Fix external controller audio volume/pan bug (r15107) + + * Fix crash in rulers when pressing mouse buttons (r15116) + + * Export to LilyPond as a repeat sequence several consecutive linked + segments is now possible (bug #1470, r15119) + + * Fix duplicate connection in initial autoload (r15122) + + * Fix crash when exporting to LilyPond. (bug #1553, r15135) + + * Fix lilypond options dialog too big. (r15140) + +NEW FEATURES + + * Add "Use track name for new segments" preference. (r15090) + diff --git a/rosegarden-separate-fonts.patch b/rosegarden-separate-fonts.patch index 700cc2a..578c83b 100644 --- a/rosegarden-separate-fonts.patch +++ b/rosegarden-separate-fonts.patch @@ -1,6 +1,7 @@ -diff -rupN rosegarden-10.02.old/data/data.qrc rosegarden-10.02/data/data.qrc ---- rosegarden-10.02.old/data/data.qrc 2010-02-13 20:53:39.000000000 -0500 -+++ rosegarden-10.02/data/data.qrc 2010-02-17 22:43:22.000000000 -0500 +diff --git a/data/data.qrc b/data/data.qrc +index 3b87ea7..448f9c6 100644 +--- a/data/data.qrc ++++ b/data/data.qrc @@ -10,9 +10,6 @@ running: DO NOT EDIT THIS FILE BY HAND! All changes will be LOST! --> @@ -11,22 +12,24 @@ diff -rupN rosegarden-10.02.old/data/data.qrc rosegarden-10.02/data/data.qrc ./pixmaps/icons/audio-nok.png ./pixmaps/icons/audio-ok.png ./pixmaps/icons/midi-nok.png -diff -rupN rosegarden-10.02.old/scripts/rebuild-qrc rosegarden-10.02/scripts/rebuild-qrc ---- rosegarden-10.02.old/scripts/rebuild-qrc 2010-02-13 20:52:50.000000000 -0500 -+++ rosegarden-10.02/scripts/rebuild-qrc 2010-02-17 22:09:46.000000000 -0500 -@@ -60,7 +60,7 @@ DO NOT EDIT THIS FILE BY HAND! All chan - - EOF +diff --git a/scripts/rebuild-qrc b/scripts/rebuild-qrc +index 9d42f93..b0db607 100755 +--- a/scripts/rebuild-qrc ++++ b/scripts/rebuild-qrc +@@ -85,7 +85,7 @@ EOF + # this script to send ts/qm entries to locale.qrc instead of + # data.qrc. --for ext in pfa png ts qss rc rg rgd rgp rgt xml xpm; do -+for ext in png ts qss rc rg rgd rgp rgt xml xpm; do +-for ext in pfa png qss rc rg rgd rgp rgt xml xpm; do ++for ext in png qss rc rg rgd rgp rgt xml xpm; do writeEntries $ext done -diff -rupN rosegarden-10.02.old/src/gui/editors/notation/SystemFont.cpp rosegarden-10.02/src/gui/editors/notation/SystemFont.cpp ---- rosegarden-10.02.old/src/gui/editors/notation/SystemFont.cpp 2010-02-13 20:52:47.000000000 -0500 -+++ rosegarden-10.02/src/gui/editors/notation/SystemFont.cpp 2010-02-17 23:38:26.000000000 -0500 -@@ -166,24 +166,15 @@ void +diff --git a/src/gui/editors/notation/SystemFont.cpp b/src/gui/editors/notation/SystemFont.cpp +index da2b070..416a916 100644 +--- a/src/gui/editors/notation/SystemFont.cpp ++++ b/src/gui/editors/notation/SystemFont.cpp +@@ -108,24 +108,15 @@ void SystemFont::unbundleFonts() { QStringList fontFiles; @@ -38,10 +41,10 @@ diff -rupN rosegarden-10.02.old/src/gui/editors/notation/SystemFont.cpp rosegard + fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-feta-nummer-design10.pfa"); + fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-parmesan-design20.pfa"); - NOTATION_DEBUG << "Found font files: " << fontFiles << endl; + NOTATION_DEBUG << "Found font files: " << fontFiles; - for (QStringList::const_iterator i = fontFiles.begin(); - i != fontFiles.end(); ++i) { + for (QStringList::const_iterator i = fontFiles.constBegin(); + i != fontFiles.constEnd(); ++i) { QString fontFile(*i); - QString name = QFileInfo(fontFile).fileName(); - if (fontFile.startsWith(":")) { diff --git a/rosegarden4.spec b/rosegarden4.spec index f38fe00..f6a0e21 100644 --- a/rosegarden4.spec +++ b/rosegarden4.spec @@ -1,8 +1,8 @@ -%global maj 16.02 +%global maj 17.12 Name: rosegarden4 Version: %{maj} -Release: 6%{?dist} +Release: 1%{?dist} Summary: MIDI, audio and notation editor Group: Applications/Multimedia License: GPLv2+ @@ -15,7 +15,6 @@ Source2: qmake-qt5.sh # Fedora doesn't want fonts built into the final binary Patch0: rosegarden-separate-fonts.patch -Patch1: rosegarden-16.02-gcc6.patch BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -77,7 +76,6 @@ use of Rosegarden. %prep %setup -q -n rosegarden-%{version} %patch0 -p1 -b .fonts -%patch1 -p1 -b .gcc6 # Release notes cp -a %{SOURCE1} ./README.%{maj} @@ -105,11 +103,10 @@ cd .. # # See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. # -appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/rosegarden.appdata.xml \ +appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/rosegarden.appdata.xml \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/rosegarden/a.png \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/rosegarden/b.png \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/rosegarden/c.png - desktop-file-install \ %if %fedora < 19 --vendor fedora \ @@ -118,7 +115,7 @@ desktop-file-install \ --delete-original \ --remove-category X-SuSE-Sequencer \ --remove-category X-Red-Hat-Base \ - %{buildroot}%{_datadir}/applications/rosegarden.desktop + %{buildroot}%{_datadir}/applications/com.rosegardenmusic.rosegarden.desktop # Install fonts in the %%_fontdir mkdir -p %{buildroot}/%{_fontdir} @@ -154,7 +151,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/icons/hicolor/*/mimetypes/application-x-rosegarden-*.png %{_datadir}/icons/hicolor/*/apps/rosegarden.png %{_datadir}/mime/packages/rosegarden.xml -%{_datadir}/appdata/rosegarden.appdata.xml +%{_datadir}/metainfo/rosegarden.appdata.xml %_font_pkg -n feta *feta*.pfa %doc data/fonts/README COPYING @@ -163,14 +160,8 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %doc data/fonts/README COPYING %changelog -* Thu Aug 03 2017 Fedora Release Engineering - 16.02-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 16.02-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Fedora Release Engineering - 16.02-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild +* Sun Dec 24 2017 Brendan Jones - 17.12-1 +- Update to 17.12 * Sat Feb 11 2017 Fedora Release Engineering - 16.02-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 46d61cd..747121f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d179f4d9b5d6b8fd1b71ba61ffc8faaa rosegarden-16.02.tar.bz2 +SHA512 (rosegarden-17.12.tar.bz2) = 109261e1a4153319eb8aea167a0fe4fdaff66c3464c0652dee30bf4a61d0bc1b4690f1885607af7dceffa34becb80596ee97e7eaa84aace573d54c92df588ea9