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

Accepting request 905173 from multimedia:apps

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/905173
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rosegarden?expand=0&rev=39
This commit is contained in:
Dominique Leuenberger 2021-07-09 22:00:21 +00:00 committed by Git OBS Bridge
commit 2ab8d12b9e
3 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rosegarden.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 9 05:52:38 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
- Add scripts-sf2rg-python3.patch:
- Port scripts/sf2rg.py to Python 3
-------------------------------------------------------------------
Mon Jan 18 00:12:21 UTC 2021 - Dirk Müller <dmueller@suse.com>

5
rosegarden.spec
View File

@ -30,6 +30,8 @@ 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
# PATCH-FIX-OPENSUSE port scripts/sf2rg.py to Python 3
Patch3: scripts-sf2rg-python3.patch
BuildRequires: alsa-devel
BuildRequires: cmake >= 2.8.12
BuildRequires: dssi-devel
@ -116,9 +118,6 @@ chmod 644 %{buildroot}%{_datadir}/%{name}/scripts/README
chmod 644 %{buildroot}%{_datadir}/%{name}/scripts/color-list
#chmod 644 %%{buildroot}%%{_datadir}/%%{name}/scripts/simple-makefile
rm -f %{buildroot}%{_datadir}/%{name}/scripts/svn-to-hg-and-git.sh
pushd %{buildroot}%{_datadir}/%{name}/scripts
sed -i '1s/^#!.*/#!\/usr\/bin\/python/' sf2rg.py
popd
install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/pixmaps/%{name}.xpm"
%suse_update_desktop_file %{buildroot}/%{_datadir}/applications/com.rosegardenmusic.%{name}.desktop
#This is a man page made by help2man to satisfy factories hunger for one /usr/bin/ one man page.

60
scripts-sf2rg-python3.patch Normal file
View File

@ -0,0 +1,60 @@
Index: rosegarden-20.12/scripts/sf2rg.py
===================================================================
--- rosegarden-20.12.orig/scripts/sf2rg.py
+++ rosegarden-20.12/scripts/sf2rg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
"""
sf2rg.py a script that dumps soundfonts data in rosegarden xml data format
@@ -11,6 +11,10 @@ depends on :
* alsa to get /proc/asound/card0/wavetableD1
"""
+
+from __future__ import print_function
+from __future__ import unicode_literals
+
__revision__ = "0.1"
import os
@@ -278,7 +282,7 @@ class Sf2Rg:
)
msb = self.getNextMsb()
currentBankName = name
- if bankNames.has_key(name):
+ if name in bankNames:
name += ' #%02i' % bankCount
else:
bankId = msb
@@ -368,7 +372,7 @@ if __name__ == '__main__':
for o, a in optlist:
if o == "--help" or o == "-h":
- print usage()
+ print(usage())
sys.exit(0)
if o == "--load" or o == "-l":
@@ -386,17 +390,17 @@ if __name__ == '__main__':
elif o == "--stat" or o == "-s":
wtstat = WaveTableStat()
- print str(wtstat)
+ print(str(wtstat))
sys.exit(0)
if not sf2rg.sf2files:
- print usage()
+ print(usage())
sys.exit(1)
if outputFile is not None:
sf2rg.saveToRg(outputFile)
elif not quiet:
- print str(sf2rg)
+ print(str(sf2rg))