Accepting request 489921 from multimedia:apps

1

OBS-URL: https://build.opensuse.org/request/show/489921
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rosegarden?expand=0&rev=28
This commit is contained in:
Dominique Leuenberger 2017-05-27 11:13:35 +00:00 committed by Git OBS Bridge
commit 004d8190f1
7 changed files with 51 additions and 35 deletions

View File

@ -1,10 +1,10 @@
Index: src/gui/widgets/FileDialog.cpp
===================================================================
--- src/gui/widgets/FileDialog.cpp.orig
+++ src/gui/widgets/FileDialog.cpp
@@ -58,8 +58,8 @@ FileDialog::FileDialog(QWidget *parent,
--- src/gui/widgets/FileDialog.cpp.orig 2017-04-19 15:39:16.000000000 +0200
+++ src/gui/widgets/FileDialog.cpp 2017-04-21 18:31:36.613889673 +0200
@@ -56,8 +56,8 @@ FileDialog::FileDialog(QWidget *parent,
#else
QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path();
QString home = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
#endif
- QString examples = home + "/.local/share/rosegarden/examples";
- QString templates = home + "/.local/share/rosegarden/templates";
@ -15,9 +15,9 @@ Index: src/gui/widgets/FileDialog.cpp
RG_DEBUG << "FileDialog::FileDialog(...)"
Index: src/gui/studio/BankEditorDialog.cpp
===================================================================
--- src/gui/studio/BankEditorDialog.cpp.orig
+++ src/gui/studio/BankEditorDialog.cpp
@@ -1568,7 +1568,7 @@ BankEditorDialog::slotImport()
--- src/gui/studio/BankEditorDialog.cpp.orig 2017-04-19 15:39:14.000000000 +0200
+++ src/gui/studio/BankEditorDialog.cpp 2017-04-21 18:31:36.613889673 +0200
@@ -1553,7 +1553,7 @@ BankEditorDialog::slotImport()
#else
QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path();
#endif

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1044334f2c1a2ac7560d80910e0721c8913bd924f8185a393f630c89020340db
size 6362923

3
rosegarden-17.04.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:988a6141c5b0a8e85c029f650de78bf57100c4d778c22d0194b0692584640ece
size 6454603

View File

@ -1,13 +0,0 @@
--- 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;

View File

@ -1,5 +1,5 @@
.\" 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"
.TH ROSEGARDEN "1" "October 2016" "Rosegarden version: 17.04 ("Twice in a Blue Moon")" "User Commands"
.SH NAME
Rosegarden \- manual page for Rosegarden version: 16.06 ("Rhapsody in Blue")
.SH DESCRIPTION

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Fri Apr 21 16:32:14 UTC 2017 - davejplater@gmail.com
- Update to release 17.04 codename "Twice in a blue moon".
- Removed rosegarden-fix-crash.patch fix is in this version.
- Rebased rosegarden-10.10-filepaths.patch.
- Upstream changes:
*Bug Fixes
* Fix memory leak: delete StartupLogo when closing it.
* Add compilation fix for Ubuntu 16.04.01 LTS.
* TrackParameterBox: Fix initial track label problem.
* Fix #1534: Send channel setup when output is changed.
* TrackParameterBox: Make color combo visible for audio tracks.
* autoload: Fix audio track colors.
* Fix #1532: Crash when trying to edit a triggered segment.
* Fix #1536: Crash on dangling Instrument IDs.
* Fix “Always use default studio” stickiness.
* Fix #1538: No sound when entering notes with keyboard.
* Fix time stamp bug in MIDI file export.
* Improve progress dialogs throughout the application.
* Repair control rulers in Qt 5 builds.
* Cleanup incorrect name and filter during audio file export.
* Fix compilation with -DQT_STRICT_ITERATORS.
* Fix compilation without jack.
* Enable -DQT_NO_URL_CAST_FROM_STRING and fix compilation
accordingly.
* Fix “all piano” issue with empty connections.
* Fix MIDI import connection problem.
* Fix a bug in the parallels checker, bug #1544.
* Fix #1491 Xruns on exit.
* Fix wait cursor.
*New Features
* Hide unused frames for audio tracks in track parameters.
* Improve handling of collapsing frames in track parameters
and document properties.
* Track 20 recent files, rather than 10.
* Replace stylesheet with custom QStyle.
-------------------------------------------------------------------
Sun Nov 13 06:51:49 UTC 2016 - davejplater@gmail.com

View File

@ -16,22 +16,19 @@
#
Name: rosegarden
Version: 16.06
Version: 17.04
Release: 0
License: GPL-2.0+
Summary: Midi, Audio And Notation Editor
Url: http://www.rosegardenmusic.com/
Group: Productivity/Multimedia/Sound/Midi
# http://sourceforge.net/projects/rosegarden/files/ This source url prevents me from checking out the tarball.
Source0: %{name}/%{version}/%{name}-%{version}.tar.bz2
Source0: https://sourceforge.net/projects/rosegarden/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
Source1: %{name}.xpm
Source2: %{name}.1
# 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
@ -73,11 +70,6 @@ Requires: lilypond
Requires: jack
Recommends: qsynth
Recommends: fluidsynth-dssi
# This is old, rosegarden was a kde3 app called rosegarden4 and it's first qt4 version had the qt4 suffix.
#Provides: rosegarden-qt4 = %%{version}
#Obsoletes: rosegarden-qt4 < %%{version}
#Provides: rosegarden4 = %%{version}
#Obsoletes: rosegarden4 < %%{version}
Icon: rosegarden.xpm
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -96,7 +88,6 @@ See the changelog for details.
%setup -q
%patch1
%patch2
%patch3 -p1
# When we build svn we need to execute bootstrap.sh
#sh bootstrap.sh