Accepting request 863941 from home:dirkmueller:branches:multimedia:apps

- update to 20.12:
  * Fix QPainterPath compilation error (r15845)
  * Fixed several SysEx-related bugs in the Event editor (r15853)
    * SysEx load now remembers the last used path.
    * SysEx load now strips the F0/F7 bytes from the file when reading.
    * SysEx save now remembers the last used path.
    * SysEx save now fills in the FileDialog fields correctly.
    * SysEx save now adds the F0/F7 bytes to the data before saving.
  * Event Editor: Fix garbage on SysEx load error (r15855)
  * Event Parameter Dialog: Fix incorrect window title (r15857)
  * Fix length of notes added in percussion matrix (r15870)
  * Fix compilation error with Qt < 5.8 (r15872, r15896, others)
  * Fix issues with ALSA port name matching at file load (r15875,
    r15879, r15893-r15895, r15906, r15909)
  * Fix "&" in device name renders file unreadable.  Bug #1586. (r15886)
  * Matrix editor: Fix control rulers not appearing.  Bug #1543.
    (r15887)
  * Event editor: Fix crashes when editing (r15899, r15902, r15903)
  * Reduce connection check interval to 1 second (r15912)
  * Fix external controller port not working (r15915, r15916, r15919,
    r15927, r15929)
  * Fix ALSA timer selection persistence (r15936)
  * Fix disabled button text color (r15938)
  * Fix plugins not found (r15947)
  * Send proper CCs out the external controller port for motorized
    control surfaces.  Bug #1587. (r15952, r15954)
  * Fix unwanted CCs going out with old files.  Feature #482.  (r15961)
  * Fix slow load time with many segments.  Bug #1589.  (r16026)
  * Enable/Disable external controller port in the preferences (r15932,
    r15946, others)

OBS-URL: https://build.opensuse.org/request/show/863941
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/rosegarden?expand=0&rev=86

rosegarden-20.06.tar.bz2

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

rosegarden-20.12.tar.bz2

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

rosegarden-include-QPainterPath.patch

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

rosegarden.changes

@@ -1,3 +1,46 @@
+-------------------------------------------------------------------
+Mon Jan 18 00:12:21 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to 20.12:
+  * Fix QPainterPath compilation error (r15845)
+  * Fixed several SysEx-related bugs in the Event editor (r15853)
+    * SysEx load now remembers the last used path.
+    * SysEx load now strips the F0/F7 bytes from the file when reading.
+    * SysEx save now remembers the last used path.
+    * SysEx save now fills in the FileDialog fields correctly.
+    * SysEx save now adds the F0/F7 bytes to the data before saving.
+  * Event Editor: Fix garbage on SysEx load error (r15855)
+  * Event Parameter Dialog: Fix incorrect window title (r15857)
+  * Fix length of notes added in percussion matrix (r15870)
+  * Fix compilation error with Qt < 5.8 (r15872, r15896, others)
+  * Fix issues with ALSA port name matching at file load (r15875,
+    r15879, r15893-r15895, r15906, r15909)
+  * Fix "&" in device name renders file unreadable.  Bug #1586. (r15886)
+  * Matrix editor: Fix control rulers not appearing.  Bug #1543.
+    (r15887)
+  * Event editor: Fix crashes when editing (r15899, r15902, r15903)
+  * Reduce connection check interval to 1 second (r15912)
+  * Fix external controller port not working (r15915, r15916, r15919,
+    r15927, r15929)
+  * Fix ALSA timer selection persistence (r15936)
+  * Fix disabled button text color (r15938)
+  * Fix plugins not found (r15947)
+  * Send proper CCs out the external controller port for motorized
+    control surfaces.  Bug #1587. (r15952, r15954)
+  * Fix unwanted CCs going out with old files.  Feature #482.  (r15961)
+  * Fix slow load time with many segments.  Bug #1589.  (r16026)
+  * Enable/Disable external controller port in the preferences (r15932,
+    r15946, others)
+  * Transport buttons (play, stop, etc...) on MIDI controllers are now
+    supported so long as they use Pro Tools standard CCs (110-118).
+    Feature #423.  (r15962-r15964)
+  * Korg nanoKONTROL2 support (r15994-r16013, r16015, r16016, r16021)
+  * Icon Loader (r15862-r15865, r15868)
+  * New ExternalController class (r15922)
+  * Preferences dialog (r15939-r15944)
+  * ALSA MIDI interface (r15975-r15993)
+- remove rosegarden-include-QPainterPath.patch (obsolete)
+
 -------------------------------------------------------------------
 Sun Aug 16 21:19:31 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 

rosegarden.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package rosegarden
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,16 +12,17 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 Name:           rosegarden
-Version:        20.06
+Version:        20.12
 Release:        0
-License:        GPL-2.0-or-later
 Summary:        Midi, Audio And Notation Editor
-Url:            http://www.rosegardenmusic.com/
+License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Sound/Midi
+URL:            https://www.rosegardenmusic.com/
 Source0:        https://sourceforge.net/projects/rosegarden/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.xpm
 Source2:        %{name}.1
@@ -29,7 +30,6 @@ 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
@@ -41,33 +41,31 @@ BuildRequires:  ladspa-devel
 BuildRequires:  libjack-devel
 BuildRequires:  liblo-devel
 BuildRequires:  liblrdf-devel
-BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5Gui)
-BuildRequires: pkgconfig(Qt5Network)
-BuildRequires: pkgconfig(Qt5PrintSupport)
-BuildRequires: pkgconfig(Qt5Widgets)
-BuildRequires: pkgconfig(Qt5Xml)
-BuildRequires: pkgconfig(Qt5Test)
-BuildRequires: cmake(Qt5LinguistTools)
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  lilypond-fonts-common >= 2.20
 BuildRequires:  lirc-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 #BuildRequires:  pkgconfig(libxml++-2.6)
 BuildRequires:  shared-mime-info
 BuildRequires:  update-desktop-files
+BuildRequires:  cmake(Qt5LinguistTools)
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5PrintSupport)
+BuildRequires:  pkgconfig(Qt5Test)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(libxml-2.0)
 Requires:       dssi
-Requires:       xsynth-dssi
+Requires:       jack
 Requires:       ladspa
 Requires:       ladspa-swh-plugins
 Requires:       lilypond-fonts-common >= 2.20
-Requires:       jack
+Requires:       xsynth-dssi
-Recommends:     qsynth
 Recommends:     fluidsynth-dssi
-Icon:           rosegarden.xpm
+Recommends:     qsynth
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Rosegarden is a well-rounded audio and MIDI sequencer,
@@ -83,8 +81,8 @@ home recording environments.
 
 # 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
+for i in `grep -rl "%{_bindir}/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done
-for i in `grep -rl "/usr/bin/python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done
+for i in `grep -rl "%{_bindir}/python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done
 
 %build
 #export DEBUG_LADSPA
@@ -98,7 +96,7 @@ export CXXFLAGS="$CFLAGS"
        -DCMAKE_INSTALL_LOCALEDIR:PATH=%{_datadir}/locale/
 
 #make svnheader
-make %{?_smp_mflags}
+%make_build
 
 %install
 mkdir -p %{buildroot}%{_datadir}/%{name}/scripts
@@ -129,7 +127,6 @@ install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_mandir}/man1/"
 %fdupes -s %{buildroot}%{_datadir}/
 
 %files
-%defattr(-,root,root)
 %doc AUTHORS README
 %license COPYING
 %dir %{_datadir}/metainfo