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

Accepting request 349004 from home:plater

Browse Source 
Update to 15.10.2

OBS-URL: https://build.opensuse.org/request/show/349004
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/rosegarden?expand=0&rev=62
This commit is contained in:
Dave Plater 2015-12-15 14:40:40 +00:00 committed by Git OBS Bridge
parent e0ab4321e9
commit e7646d8d09
6 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rosegarden-10.10-filepaths.patch
View File

@ -1,6 +1,8 @@
--- src/gui/widgets/FileDialog.cpp.orig 2014-12-17 14:30:23.000000000 +0100 Index: src/gui/widgets/FileDialog.cpp
+++ src/gui/widgets/FileDialog.cpp 2015-08-29 21:06:53.992239554 +0200 ===================================================================
@@ -58,8 +58,8 @@ --- src/gui/widgets/FileDialog.cpp.orig
+++ src/gui/widgets/FileDialog.cpp
@@ -58,8 +58,8 @@ FileDialog::FileDialog(QWidget *parent,
#else #else
QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path(); QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path();
#endif #endif
@ -11,9 +13,11 @@
QString rosegarden = home + "/rosegarden"; QString rosegarden = home + "/rosegarden";
RG_DEBUG << "FileDialog::FileDialog(...)" << endl RG_DEBUG << "FileDialog::FileDialog(...)" << endl
--- src/gui/studio/BankEditorDialog.cpp.orig 2014-12-17 14:30:23.000000000 +0100 Index: src/gui/studio/BankEditorDialog.cpp
+++ src/gui/studio/BankEditorDialog.cpp 2015-08-29 21:07:37.151687434 +0200 ===================================================================
@@ -1562,7 +1562,7 @@ --- src/gui/studio/BankEditorDialog.cpp.orig
+++ src/gui/studio/BankEditorDialog.cpp
@@ -1568,7 +1568,7 @@ BankEditorDialog::slotImport()
#else #else
QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path(); QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path();
#endif #endif

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

@ -1,6 +1,7 @@
diff -Ndur rosegarden-14.02/scripts/distclean.sh rosegarden-14.02-fix-bashisms/scripts/distclean.sh Index: scripts/distclean.sh
--- rosegarden-14.02/scripts/distclean.sh 2014-03-03 13:58:44.000000000 +0200 ===================================================================
+++ rosegarden-14.02-fix-bashisms/scripts/distclean.sh 2014-11-29 04:16:27.094140542 +0200 --- scripts/distclean.sh.orig
+++ scripts/distclean.sh
@@ -1,12 +1,10 @@ @@ -1,12 +1,10 @@
#!/bin/sh #!/bin/sh
-rm -f {,src/,po/,docs/,data/}CMakeCache.txt -rm -f {,src/,po/,docs/,data/}CMakeCache.txt
@ -22,10 +23,11 @@ diff -Ndur rosegarden-14.02/scripts/distclean.sh rosegarden-14.02-fix-bashisms/s
+ done + done
+done +done
rm -rf RGbuild/* rm -rf RGbuild/*
diff -Ndur rosegarden-14.02/scripts/reorganise.sh rosegarden-14.02-fix-bashisms/scripts/reorganise.sh Index: scripts/reorganise.sh
--- rosegarden-14.02/scripts/reorganise.sh 2014-03-03 13:58:44.000000000 +0200 ===================================================================
+++ rosegarden-14.02-fix-bashisms/scripts/reorganise.sh 2014-11-29 04:21:14.766121081 +0200 --- scripts/reorganise.sh.orig
@@ -585,7 +585,7 @@ +++ scripts/reorganise.sh
@@ -585,7 +585,7 @@ for file in guitar/*.h ; do
fi fi
fi fi
done done
@ -34,7 +36,7 @@ diff -Ndur rosegarden-14.02/scripts/reorganise.sh rosegarden-14.02-fix-bashisms/
cd ../src cd ../src
@@ -601,21 +601,25 @@ @@ -601,21 +601,25 @@ for replacement in $replacements; do
perlcommand="s/$before/$after/g ; $perlcommand" perlcommand="s/$before/$after/g ; $perlcommand"
done done
@ -71,7 +73,7 @@ diff -Ndur rosegarden-14.02/scripts/reorganise.sh rosegarden-14.02-fix-bashisms/
done > $class_header_cache done > $class_header_cache
for hfile in $candidate_h ; do for hfile in $candidate_h ; do
@@ -788,8 +792,10 @@ @@ -788,8 +792,10 @@ add_includes document/RosegardenGUIDoc.c
echo Formatting at `date`... 1>&2 echo Formatting at `date`... 1>&2

3
rosegarden-14.12.tar.bz2
View File

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

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

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

6
rosegarden.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 15 14:30:34 UTC 2015 - davejplater@gmail.com
- Update to version 15.10.2 and refresh patches.
- Upstream changes see http://rosegardenmusic.com/wiki/dev:15.10
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Aug 29 19:27:19 UTC 2015 - tom.mbrt@googlemail.com Sat Aug 29 19:27:19 UTC 2015 - tom.mbrt@googlemail.com

4
rosegarden.spec
View File

@ -16,7 +16,7 @@
# #
Name: rosegarden Name: rosegarden
Version: 14.12 Version: 15.10.2
Release: 0 Release: 0
License: GPL-2.0+ License: GPL-2.0+
Summary: Midi, Audio And Notation Editor Summary: Midi, Audio And Notation Editor
@ -79,7 +79,7 @@ See the changelog for details.
%prep %prep
%setup -q %setup -q
%patch1 %patch1
%patch2 -p1 %patch2
# When we build svn we need to execute bootstrap.sh it doesn't harm the release build either. # When we build svn we need to execute bootstrap.sh it doesn't harm the release build either.
sh bootstrap.sh sh bootstrap.sh