From 5f1b8d92c83e08e71a392b3a695265e752a400b207ff23d63995e8e5932b16c7 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sun, 16 Oct 2016 10:40:43 +0000 Subject: [PATCH] Accepting request 435595 from home:plater Fix crash OBS-URL: https://build.opensuse.org/request/show/435595 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/rosegarden?expand=0&rev=70 --- rosegarden-fix-crash.patch | 13 +++++++++++++ rosegarden.1 | 10 +++++----- rosegarden.changes | 10 ++++++++-- rosegarden.spec | 6 +++++- 4 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 rosegarden-fix-crash.patch diff --git a/rosegarden-fix-crash.patch b/rosegarden-fix-crash.patch new file mode 100644 index 0000000..837ca39 --- /dev/null +++ b/rosegarden-fix-crash.patch @@ -0,0 +1,13 @@ +--- a/src/document/RosegardenDocument.cpp ++++ b/src/document/RosegardenDocument.cpp +@@ -947,6 +947,10 @@ + + Instrument *instrument = m_studio.getInstrumentById(instrumentId); + ++ // If this instrument doesn't exist, try the next track. ++ if (!instrument) ++ continue; ++ + // If this isn't a MIDI instrument, try the next track. + if (instrument->getType() != Instrument::Midi) + continue; diff --git a/rosegarden.1 b/rosegarden.1 index e487cda..2ec89cf 100644 --- a/rosegarden.1 +++ b/rosegarden.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH ROSEGARDEN "1" "November 2010" "http://www.rosegardenmusic.com" "Midi,Audio And Notation Editor" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. +.TH ROSEGARDEN "1" "October 2016" "Rosegarden version: 16.06 ("Rhapsody in Blue")" "User Commands" .SH NAME -Rosegarden \- ROSEGARDEN +Rosegarden \- manual page for Rosegarden version: 16.06 ("Rhapsody in Blue") .SH DESCRIPTION Thorn \- true .PP -Build key: 6ea2c1bb54 -Built against Qt version: 4.6.3 +Build key: 6308665195 +Built against Qt version: 5.5.0 diff --git a/rosegarden.changes b/rosegarden.changes index 1c571bb..446bb08 100644 --- a/rosegarden.changes +++ b/rosegarden.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 16 07:56:16 UTC 2016 - davejplater@gmail.com + +- Added rosegarden-fix-crash.patch to fix rosegarden bug: + https://sourceforge.net/p/rosegarden/bugs/1536/ + ------------------------------------------------------------------- Wed Jul 20 13:25:45 UTC 2016 - davejplater@gmail.com @@ -66,7 +72,7 @@ Sat Mar 19 19:11:21 UTC 2016 - crrodriguez@opensuse.org ------------------------------------------------------------------- Fri Mar 18 16:58:54 UTC 2016 - crrodriguez@opensuse.org -- Build against QT5 in openSUSE 13.2 or later +- Build against QT5 in openSUSE 13.2 or later - Only provide rosegarden-qt4 in old products with QT4. ------------------------------------------------------------------- @@ -254,7 +260,7 @@ Sun Dec 22 21:34:10 UTC 2013 - zaitor@opensuse.org - Fixed latency compensation in subgroups through a mysterious mechanism that seems to work. - Fixed a subtle bug involving the drawing of track dividers - and vertical scrolling. + and vertical scrolling. - Changing note durations works correctly across barlines. So does adding dots to notes. - Menu items have a somewhat more consistent style. diff --git a/rosegarden.spec b/rosegarden.spec index 4cd6bf0..f83ce93 100644 --- a/rosegarden.spec +++ b/rosegarden.spec @@ -26,9 +26,12 @@ Group: Productivity/Multimedia/Sound/Midi Source0: %{name}/%{version}/%{name}-%{version}.tar.bz2 Source1: %{name}.xpm Source2: %{name}.1 -# This patch fixes the file search paths for examples, templates and midi driver libraries. +# PATCH-FIX-OPENSUSE davejplater@gmail.com This patch fixes the file search paths for examples, templates and midi driver libraries. Patch1: rosegarden-10.10-filepaths.patch +# PATCH-FIX-OPENSUSE ledest@gmail.com fix bashisms in scripts Patch2: rosegarden-14.02-fix-bashisms.patch +#PATCH_FIX-UPSTREAM davejplater@gmail.com Fixes https://sourceforge.net/p/rosegarden/bugs/1536/ +Patch3: rosegarden-fix-crash.patch BuildRequires: alsa-devel BuildRequires: cmake >= 2.8.12 BuildRequires: dssi-devel @@ -93,6 +96,7 @@ See the changelog for details. %setup -q %patch1 %patch2 +%patch3 -p1 # When we build svn we need to execute bootstrap.sh #sh bootstrap.sh