media-sound/rosegarden: bump to 20.06 and fixed 19.12

Closes: https://bugs.gentoo.org/730242
Closes: https://bugs.gentoo.org/730240
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

4 files changed, 93 insertions, 1 deletions

diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 81d41355110d..a7e010c3d192 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,3 +1,4 @@
 DIST rosegarden-17.12.1.tar.bz2 6692715 BLAKE2B 698ecfb58754ee292e589e0fb3618e2076a6e59dde1f06d15ed3bad43313cc79ed03307364350f5cd2323350173119ccc71b42c839d8498d360461a19801a96a SHA512 8bd4a464bbf2825d6c2fb8d36123e68d94de7f4e997c6ed8efc5670e87799781eb8251995890979c9d107d4fc58c636fe73e699c859c8e95aa567c4289958495
 DIST rosegarden-19.06.tar.bz2 6667374 BLAKE2B c204a99dd46a0dcbfda6afc361ec31b7f211d2b95a8d171ff3fb06e37b3dbabc2b36fdbc04a3dfc821a9e331681d2a1e2395e91a86fe9d9fecd3af173f5b675b SHA512 13eddd4ec88662f3275d83bf40471ca0a34d43b3c9c9f07cf46b891c74f087ec7fe0d4b8ffe8204f2f3a30829352f4d952bb035a5bd09a7b6bdeb41ff5d1e8d8
 DIST rosegarden-19.12.tar.bz2 6672820 BLAKE2B f4541c894d0de7f4c5fc435ce463b9fc6940cf1c595e9d9b6c168f51b9e05e63a449b8f3a99456801baf864d0788130368ed87c81646af04a6f2891a6372e444 SHA512 22c45346b1a4d69f009e59091bdf5f5f68633241a48df7bd6ee73462cc281ee7182be3d48c3afc0843aa551145c203a8b881501891eb84b6d3f3def5f7650fc6
+DIST rosegarden-20.06.tar.bz2 6821122 BLAKE2B 2c37729133f60524466c9eb6cb761e36698acc2addee802fa01b498c4450e0f87a8d02dc66f893e87c23484f7fc4f32e4e4e13f01a457a86363b4fa98bca4a1d SHA512 7f3892697b99344d47e2bf398f6fe82de9867a093f3396d571730a30f3442a923f16a5472a74bda865205696ff3834c0a188ceefae17e56b137d8df1a56e03f7
diff --git a/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch b/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch
new file mode 100644
index 000000000000..bb4244baeba9
--- /dev/null
+++ b/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch
@@ -0,0 +1,24 @@
+diff --git a/src/gui/general/ThornStyle.cpp b/src/gui/general/ThornStyle.cpp
+index 4374607..de426f1 100644
+--- a/src/gui/general/ThornStyle.cpp
++++ b/src/gui/general/ThornStyle.cpp
+@@ -34,6 +34,7 @@
+ #include <QLabel>
+ #include <QLayout>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRadioButton>
+ #include <QStyleFactory>
+ #include <QStyleOption>
+diff --git a/src/gui/widgets/Panner.cpp b/src/gui/widgets/Panner.cpp
+index ceba4ea..ead23fa 100644
+--- a/src/gui/widgets/Panner.cpp
++++ b/src/gui/widgets/Panner.cpp
+@@ -24,6 +24,7 @@
+ #include "misc/Debug.h"
+ #include "base/Profiler.h"
+ 
++#include <QPainterPath>
+ #include <QPolygon>
+ #include <QMouseEvent>
+ 
diff --git a/media-sound/rosegarden/rosegarden-19.12.ebuild b/media-sound/rosegarden/rosegarden-19.12.ebuild
index 7ed9801029fe..90aba0b637d2 100644
--- a/media-sound/rosegarden/rosegarden-19.12.ebuild
+++ b/media-sound/rosegarden/rosegarden-19.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,10 @@ DEPEND="${RDEPEND}
 	dev-qt/qttest:5
 "
 
+PATCHES=(
+	"${FILESDIR}"/rosegarden-fix-qt5.15.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 }
diff --git a/media-sound/rosegarden/rosegarden-20.06.ebuild b/media-sound/rosegarden/rosegarden-20.06.ebuild
new file mode 100644
index 000000000000..90aba0b637d2
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-20.06.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg virtualx
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="https://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/ladspa-sdk:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	media-libs/libsamplerate:=
+	media-libs/libsndfile:=
+	sci-libs/fftw:3.0
+	sys-libs/zlib:=
+	virtual/jack
+	x11-libs/libSM:=
+	lirc? ( app-misc/lirc:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/rosegarden-fix-qt5.15.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	 virtx cmake_src_test
+}