Fix compilation with Qt 5.5

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

3 files changed, 57 insertions, 2 deletions

diff --git a/media-sound/qtractor/ChangeLog b/media-sound/qtractor/ChangeLog
index 95571a4faaa1..88e53e3bb75e 100644
--- a/media-sound/qtractor/ChangeLog
+++ b/media-sound/qtractor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/qtractor
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/ChangeLog,v 1.66 2015/08/01 10:53:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/ChangeLog,v 1.67 2015/08/02 16:01:54 yngwin Exp $
+
+  02 Aug 2015; Ben de Groot <yngwin@gentoo.org>
+  +files/qtractor-0.7.0-qt55-includes.patch, qtractor-0.7.0.ebuild:
+  Fix compilation with Qt 5.5
 
 *qtractor-0.7.0 (01 Aug 2015)
 
diff --git a/media-sound/qtractor/files/qtractor-0.7.0-qt55-includes.patch b/media-sound/qtractor/files/qtractor-0.7.0-qt55-includes.patch
new file mode 100644
index 000000000000..a8c4546eaa70
--- /dev/null
+++ b/media-sound/qtractor/files/qtractor-0.7.0-qt55-includes.patch
@@ -0,0 +1,47 @@
+diff -burN qtractor-0.7.0.orig/src/qtractorCurve.h qtractor-0.7.0/src/qtractorCurve.h
+--- qtractor-0.7.0.orig/src/qtractorCurve.h	2015-07-25 06:06:44.869457637 +0800
++++ qtractor-0.7.0/src/qtractorCurve.h	2015-08-02 23:44:59.664835605 +0800
+@@ -26,7 +26,7 @@
+ #include "qtractorMidiSequence.h"
+ 
+ #include <QColor>
+-
++#include <QObject>
+ 
+ // Forward declarations.
+ class qtractorTimeScale;
+diff -burN qtractor-0.7.0.orig/src/qtractorMidiEngine.h qtractor-0.7.0/src/qtractorMidiEngine.h
+--- qtractor-0.7.0.orig/src/qtractorMidiEngine.h	2015-07-25 06:06:44.887457637 +0800
++++ qtractor-0.7.0/src/qtractorMidiEngine.h	2015-08-02 23:45:24.057834421 +0800
+@@ -30,6 +30,7 @@
+ #include <alsa/asoundlib.h>
+ 
+ #include <QHash>
++#include <QObject>
+ 
+ // Forward declarations.
+ class qtractorMidiBus;
+diff -burN qtractor-0.7.0.orig/src/qtractorMidiTimer.h qtractor-0.7.0/src/qtractorMidiTimer.h
+--- qtractor-0.7.0.orig/src/qtractorMidiTimer.h	2015-07-25 06:06:44.890457637 +0800
++++ qtractor-0.7.0/src/qtractorMidiTimer.h	2015-08-02 23:45:44.008833452 +0800
+@@ -23,7 +23,7 @@
+ #define __qtractorMidiTimer_h
+ 
+ #include <QStringList>
+-
++#include <QObject>
+ 
+ //----------------------------------------------------------------------
+ // class qtractorMidiTimer -- ALSA sequencer timer stuff (singleton).
+diff -burN qtractor-0.7.0.orig/src/qtractorTimeScale.h qtractor-0.7.0/src/qtractorTimeScale.h
+--- qtractor-0.7.0.orig/src/qtractorTimeScale.h	2015-07-25 06:06:44.900457637 +0800
++++ qtractor-0.7.0/src/qtractorTimeScale.h	2015-08-02 23:46:02.666832546 +0800
+@@ -26,7 +26,7 @@
+ 
+ #include <QStringList>
+ #include <QColor>
+-
++#include <QObject>
+ 
+ //----------------------------------------------------------------------
+ // class qtractorTimeScale -- Time scale conversion helper class.
diff --git a/media-sound/qtractor/qtractor-0.7.0.ebuild b/media-sound/qtractor/qtractor-0.7.0.ebuild
index 232ded6d93b1..06f474a790e5 100644
--- a/media-sound/qtractor/qtractor-0.7.0.ebuild
+++ b/media-sound/qtractor/qtractor-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/qtractor-0.7.0.ebuild,v 1.1 2015/08/01 10:53:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/qtractor-0.7.0.ebuild,v 1.2 2015/08/02 16:01:54 yngwin Exp $
 
 EAPI=5
 
@@ -46,6 +46,10 @@ DEPEND="${RDEPEND}
 
 DOCS="README ChangeLog TODO AUTHORS"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qt55-includes.patch
+}
+
 src_configure() {
 	econf \
 		$(use_enable mad libmad) \