rpm/rosegarden
SHA256
1
0
Fork 0
forked from pool/rosegarden
Code Pull Requests Activity

Accepting request 811154 from multimedia:apps

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/811154
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rosegarden?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger
2020-06-03 18:36:38 +00:00
committed by Git OBS Bridge
parent 83fcbdd07a f5b29f5017
commit 872818f5aa
7 changed files with 80 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rosegarden-10.10-filepaths.patch
View File

@@ -1,7 +1,7 @@
Index: src/gui/widgets/FileDialog.cpp
Index: rosegarden-19.12/src/gui/widgets/FileDialog.cpp
===================================================================
--- 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
--- rosegarden-19.12.orig/src/gui/widgets/FileDialog.cpp 2020-06-03 13:56:13.142007118 +0200
+++ rosegarden-19.12/src/gui/widgets/FileDialog.cpp 2020-06-03 13:56:27.638580234 +0200
@@ -56,8 +56,8 @@ FileDialog::FileDialog(QWidget *parent,
#else
QString home = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
@@ -13,10 +13,10 @@ Index: src/gui/widgets/FileDialog.cpp
QString rosegarden = home + "/rosegarden";
RG_DEBUG << "FileDialog::FileDialog(...)"
Index: src/gui/studio/BankEditorDialog.cpp
Index: rosegarden-19.12/src/gui/studio/BankEditorDialog.cpp
===================================================================
--- 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
--- rosegarden-19.12.orig/src/gui/studio/BankEditorDialog.cpp 2020-06-03 13:56:13.142007118 +0200
+++ rosegarden-19.12/src/gui/studio/BankEditorDialog.cpp 2020-06-03 13:56:27.638580234 +0200
@@ -1553,7 +1553,7 @@ BankEditorDialog::slotImport()
#else
QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path();

14
rosegarden-14.02-fix-bashisms.patch
View File

@@ -1,7 +1,7 @@
Index: scripts/distclean.sh
Index: rosegarden-19.12/scripts/distclean.sh
===================================================================
--- scripts/distclean.sh.orig
+++ scripts/distclean.sh
--- rosegarden-19.12.orig/scripts/distclean.sh 2020-06-03 13:56:12.929998737 +0200
+++ rosegarden-19.12/scripts/distclean.sh 2020-06-03 13:56:42.131153109 +0200
@@ -1,12 +1,10 @@
#!/bin/sh
-rm -f {,src/,po/,docs/,data/}CMakeCache.txt
@@ -23,10 +23,10 @@ Index: scripts/distclean.sh
+ done
+done
rm -rf RGbuild/*
Index: scripts/reorganise.sh
Index: rosegarden-19.12/scripts/reorganise.sh
===================================================================
--- scripts/reorganise.sh.orig
+++ scripts/reorganise.sh
--- rosegarden-19.12.orig/scripts/reorganise.sh 2020-06-03 13:56:12.929998737 +0200
+++ rosegarden-19.12/scripts/reorganise.sh 2020-06-03 13:56:42.131153109 +0200
@@ -585,7 +585,7 @@ for file in guitar/*.h ; do
fi
fi
@@ -80,7 +80,7 @@ Index: scripts/reorganise.sh
-for file in */*.{cpp,h} */*/*.{cpp,h} */*/*/*.{cpp,h} ; do
- perl -i -p -e 's,^//(inc|dec|ndec|replacement_candidate)!,,' $file
+for e in cpp h; do
+ for file in */*.$e */*/*.$e */*/*/*.$e ; do
+ for file in */*.$e */*/*.$e */*/*/*.$e ; do
+ perl -i -p -e 's,^//(inc|dec|ndec|replacement_candidate)!,,' $file
+ done
done

3
rosegarden-19.06.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c3d605ae14861eed3c048bb9529d6372ab1b04530ce0f53511b69b151593899
size 6667374

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

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81df8bc0c4c99f7c9f86b192fdfb924fb9334849f4c1def93c6aff060deb8ae1
size 6672820

24
rosegarden-include-QPainterPath.patch Normal file
View File

@@ -0,0 +1,24 @@
Index: rosegarden-19.12/src/gui/widgets/Panner.cpp
===================================================================
--- rosegarden-19.12.orig/src/gui/widgets/Panner.cpp 2020-06-03 13:56:12.753991778 +0200
+++ rosegarden-19.12/src/gui/widgets/Panner.cpp 2020-06-03 13:56:46.291317540 +0200
@@ -26,6 +26,7 @@
#include <QPolygon>
#include <QMouseEvent>
+#include <QPainterPath>
#include <iostream>
Index: rosegarden-19.12/src/gui/general/ThornStyle.cpp
===================================================================
--- rosegarden-19.12.orig/src/gui/general/ThornStyle.cpp 2019-12-12 03:21:05.000000000 +0200
+++ rosegarden-19.12/src/gui/general/ThornStyle.cpp 2020-06-03 14:09:38.489355952 +0200
@@ -34,6 +34,7 @@
#include <QLabel>
#include <QLayout>
#include <QPainter>
+#include <QPainterPath>
#include <QRadioButton>
#include <QStyleFactory>
#include <QStyleOption>

35
rosegarden.changes
View File

@@ -1,3 +1,38 @@
-------------------------------------------------------------------
Wed Jun 3 12:03:20 UTC 2020 - Dave Plater <davejplater@gmail.com>
- Update to stable release is 19.12 and add patch to fix factory
build: rosegarden-include-QPainterPath.patch.
- Upstream changes:
*Fix synth plugin Send Test Note button (r15502)
*Plugin Editor: Fix Send Test Note not sustaining (r15511)
*Treat Left + Right mouse buttons as Middle button in Matrix and
Notation editors (r15522)
*Matrix: Fix no update on delete. Bug #1569. (r15616)
*Fix missing metronome beat when expanding end during recording
(r15621)
*Style: Make QLineEdit text gray when disabled (r15631)
*Fix transposing keys by interval (r15632)
*RMW: Reduce calls to leave/enterActionState() (r15641)
*Matrix Editor: Implement new auto-scroll behavior
(r15525 - r15544)
*Segment Canvas: Implement new auto-scroll behavior
(r15546 - r15551)
*Notation Editor: Implement new auto-scroll behavior
(r15553 - r15555)
*Add –convert command line option (r15607)
*Add quaver triplet to standard quantizations (r15613)
*Quantize: Add arbitrary quantization units. Feature #477(r15630)
*Preferences: Allow dangerous operations during playback. Feature
#478. (r15643, r15646, r15647, r15651)
*Add ability to enable metronome during count-in and
enable/disable during recording. Feature #453. (r15649)
*Segment Parameters box cleanup (r15562 - r15597, r15604)
*Replace FastVector with std::vector (r15609)
*Quantize dialog cleanup (r15611 - r15614,
r15617 - r15620, r15623 - r15629)
*Preferences cleanup (r15634 - r15640)
-------------------------------------------------------------------
Thu May 7 13:01:46 UTC 2020 - Dave Plater <davejplater@gmail.com>

20
rosegarden.spec
View File

@@ -16,7 +16,7 @@
#
Name: rosegarden
Version: 19.06
Version: 19.12
Release: 0
License: GPL-2.0-or-later
Summary: Midi, Audio And Notation Editor
@@ -29,6 +29,7 @@ Source2: %{name}.1
Patch1: rosegarden-10.10-filepaths.patch
# PATCH-FIX-OPENSUSE ledest@gmail.com fix bashisms in scripts
Patch2: rosegarden-14.02-fix-bashisms.patch
Patch3: rosegarden-include-QPainterPath.patch
BuildRequires: alsa-devel
BuildRequires: cmake >= 2.8.12
BuildRequires: dssi-devel
@@ -50,7 +51,7 @@ BuildRequires: pkgconfig(Qt5Test)
BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: lilypond
BuildRequires: lilypond-fonts-common >= 2.20
BuildRequires: lirc-devel
BuildRequires: pkg-config
#BuildRequires: pkgconfig(libxml++-2.6)
@@ -78,8 +79,8 @@ home recording environments.
%prep
%setup -q
%patch1
%patch2
%autopatch -p1
# When we build svn we need to execute bootstrap.sh
#sh bootstrap.sh
for i in `grep -rl "/usr/bin/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done
@@ -127,17 +128,6 @@ mkdir -p %{buildroot}%{_mandir}/man1
install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_mandir}/man1/"
%fdupes -s %{buildroot}%{_datadir}/
%post
%mime_database_post
%desktop_database_post
%postun
%mime_database_postun
%desktop_database_postun
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc AUTHORS README