commit: dce90f2d8ca58174011be65b4a69317f68601c71
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 8 07:24:23 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jul 8 07:24:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dce90f2d
media-sound/cadence: updated live + bump to 0.9.1
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/cadence/Manifest | 1 +
.../{cadence-9999.ebuild => cadence-0.9.1.ebuild} | 25 ++++++++++++----
media-sound/cadence/cadence-9999.ebuild | 21 +++++++++----
.../cadence/files/cadence-0.9.1-fix-qt5.15.patch | 34 ++++++++++++++++++++++
4 files changed, 69 insertions(+), 12 deletions(-)
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index 33b251b97fa..181363346ae 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1 +1,2 @@
DIST cadence-0.9.0.tar.gz 2202265 BLAKE2B
03d38f611df05597d2b4016f263d36f2386be421383a38b51dee519514e6d1ed79bf92ea2a789ea868a25d4c805e9e94cd0971f479b772799bf6bf3170349b4a
SHA512
381c9c57c1d96452a91969e134420d63ef06f5ec144050779d0a06a1098e8ed1693c70165b6640e04acc448d382e717e71ead1b29ba5043f0668675850cad7d1
+DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B
0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1
SHA512
daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219
diff --git a/media-sound/cadence/cadence-9999.ebuild
b/media-sound/cadence/cadence-0.9.1.ebuild
similarity index 82%
copy from media-sound/cadence/cadence-9999.ebuild
copy to media-sound/cadence/cadence-0.9.1.ebuild
index 3618cd021dd..0a8ae5f9a15 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-0.9.1.ebuild
@@ -3,13 +3,22 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit git-r3 python-single-r1 xdg desktop
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit python-single-r1 xdg desktop
DESCRIPTION="Collection of tools useful for audio production"
HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence";
-EGIT_REPO_URI="https://github.com/falkTX/Cadence.git";
-KEYWORDS=""
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/falkTX/Cadence.git";
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/Cadence-${PV}"
+fi
+
LICENSE="GPL-2"
SLOT="0"
@@ -29,7 +38,11 @@ CDEPEND="
pulseaudio? ( media-sound/pulseaudio[jack] )
"
RDEPEND="${CDEPEND}"
-DEPEND="${RDEPEND}"
+DEPEND="${CDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-qt5.15.patch
+)
src_prepare() {
sed -i -e "s/python3/${EPYTHON}/" \
@@ -58,7 +71,7 @@ src_compile() {
src_install() {
emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
- python_fix_shebang ${ED}
+ python_fix_shebang "${ED}"
# Clean up stuff that shouldn't be installed
rm -rf "${ED}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
diff --git a/media-sound/cadence/cadence-9999.ebuild
b/media-sound/cadence/cadence-9999.ebuild
index 3618cd021dd..b0f1b5c6668 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -3,13 +3,22 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit git-r3 python-single-r1 xdg desktop
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit python-single-r1 xdg desktop
DESCRIPTION="Collection of tools useful for audio production"
HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence";
-EGIT_REPO_URI="https://github.com/falkTX/Cadence.git";
-KEYWORDS=""
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/falkTX/Cadence.git";
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/Cadence-${PV}"
+fi
+
LICENSE="GPL-2"
SLOT="0"
@@ -29,7 +38,7 @@ CDEPEND="
pulseaudio? ( media-sound/pulseaudio[jack] )
"
RDEPEND="${CDEPEND}"
-DEPEND="${RDEPEND}"
+DEPEND="${CDEPEND}"
src_prepare() {
sed -i -e "s/python3/${EPYTHON}/" \
@@ -58,7 +67,7 @@ src_compile() {
src_install() {
emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
- python_fix_shebang ${ED}
+ python_fix_shebang "${ED}"
# Clean up stuff that shouldn't be installed
rm -rf "${ED}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
diff --git a/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch
b/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch
new file mode 100644
index 00000000000..b9c52167e37
--- /dev/null
+++ b/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch
@@ -0,0 +1,34 @@
+From c167f35fbb76c4246c730b29262a59da73010412 Mon Sep 17 00:00:00 2001
+From: Alex Tsitsimpis <[email protected]>
+Date: Thu, 4 Jun 2020 12:49:40 +0300
+Subject: [PATCH] Fix build with Qt 5.15+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Building with Qt 5.15 failed with the following error:
+
+../widgets/pixmapdial.cpp:231:26: error: aggregate ‘QPainterPath ballPath’ has
incomplete type and cannot be defined
+ 231 | QPainterPath ballPath;
+ | ^~~~~~~~
+../widgets/pixmapdial.cpp:278:26: error: aggregate ‘QPainterPath ballPath’ has
incomplete type and cannot be defined
+ 278 | QPainterPath ballPath;
+ | ^~~~~~~~
+
+Signed-off-by: Alex Tsitsimpis <[email protected]>
+---
+ c++/widgets/pixmapdial.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/c++/widgets/pixmapdial.cpp b/c++/widgets/pixmapdial.cpp
+index 37dcffd..0b5e0f5 100644
+--- a/c++/widgets/pixmapdial.cpp
++++ b/c++/widgets/pixmapdial.cpp
+@@ -22,6 +22,7 @@
+ #include <QtCore/QTimer>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPaintEvent>
++#include <QtGui/QPainterPath>
+
+ PixmapDial::PixmapDial(QWidget* parent)
+ : QDial(parent),
