pool/rosegarden
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 435595 from home:plater

Browse Source 
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
This commit is contained in:
Dave Plater 2016-10-16 10:40:43 +00:00 committed by Git OBS Bridge
parent d0564019c6
commit 5f1b8d92c8
4 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rosegarden-fix-crash.patch Normal file
View File

@ -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;

10
rosegarden.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
.TH ROSEGARDEN "1" "November 2010" "http://www.rosegardenmusic.com" "Midi,Audio And Notation Editor" .TH ROSEGARDEN "1" "October 2016" "Rosegarden version: 16.06 ("Rhapsody in Blue")" "User Commands"
.SH NAME .SH NAME
Rosegarden \- ROSEGARDEN Rosegarden \- manual page for Rosegarden version: 16.06 ("Rhapsody in Blue")
.SH DESCRIPTION .SH DESCRIPTION
Thorn \- true Thorn \- true
.PP .PP
Build key: 6ea2c1bb54 Build key: 6308665195
Built against Qt version: 4.6.3 Built against Qt version: 5.5.0

10
rosegarden.changes
View File

@ -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 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 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. - 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 - Fixed latency compensation in subgroups through a mysterious
mechanism that seems to work. mechanism that seems to work.
- Fixed a subtle bug involving the drawing of track dividers - Fixed a subtle bug involving the drawing of track dividers
and vertical scrolling. and vertical scrolling.
- Changing note durations works correctly across barlines. So - Changing note durations works correctly across barlines. So
does adding dots to notes. does adding dots to notes.
- Menu items have a somewhat more consistent style. - Menu items have a somewhat more consistent style.

6
rosegarden.spec
View File

@ -26,9 +26,12 @@ Group: Productivity/Multimedia/Sound/Midi
Source0: %{name}/%{version}/%{name}-%{version}.tar.bz2 Source0: %{name}/%{version}/%{name}-%{version}.tar.bz2
Source1: %{name}.xpm Source1: %{name}.xpm
Source2: %{name}.1 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 Patch1: rosegarden-10.10-filepaths.patch
# PATCH-FIX-OPENSUSE ledest@gmail.com fix bashisms in scripts
Patch2: rosegarden-14.02-fix-bashisms.patch 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: alsa-devel
BuildRequires: cmake >= 2.8.12 BuildRequires: cmake >= 2.8.12
BuildRequires: dssi-devel BuildRequires: dssi-devel
@ -93,6 +96,7 @@ See the changelog for details.
%setup -q %setup -q
%patch1 %patch1
%patch2 %patch2
%patch3 -p1
# When we build svn we need to execute bootstrap.sh # When we build svn we need to execute bootstrap.sh
#sh bootstrap.sh #sh bootstrap.sh