[sonic-visualiser] Fix for Qt 4.8 disallowing virtual inheritance of QObject (Radek Novacek)

[Michel Alexandre Salim]

commit 49d868f28ca30d4db6cf722e895f091c6352520e
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Tue Aug 9 23:59:56 2011 +0200

    Fix for Qt 4.8 disallowing virtual inheritance of QObject (Radek Novacek)

 sonic-visualiser-1.8-no_virt_QObject.patch |   11 +++++++++++
 sonic-visualiser.spec                      |   14 +++++++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/sonic-visualiser-1.8-no_virt_QObject.patch b/sonic-visualiser-1.8-no_virt_QObject.patch
new file mode 100644
index 0000000..4245f92
--- /dev/null
+++ b/sonic-visualiser-1.8-no_virt_QObject.patch
@@ -0,0 +1,11 @@
+--- sonic-visualiser-1.8/svapp/audioio/AudioCallbackPlaySource.h.no_virt_QObject	2011-04-08 17:56:48.000000000 +0200
++++ sonic-visualiser-1.8/svapp/audioio/AudioCallbackPlaySource.h	2011-08-09 23:27:18.856064127 +0200
+@@ -51,7 +51,7 @@
+  * provides a method for a realtime thread to pick up the latest
+  * available sample data from these buffers.
+  */
+-class AudioCallbackPlaySource : public virtual QObject,
++class AudioCallbackPlaySource : public QObject,
+ 				public AudioPlaySource
+ {
+     Q_OBJECT
diff --git a/sonic-visualiser.spec b/sonic-visualiser.spec
index f9d6471..a4cb0b7 100644
--- a/sonic-visualiser.spec
+++ b/sonic-visualiser.spec
@@ -1,6 +1,6 @@
 Name:           sonic-visualiser
 Version:        1.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A program for viewing and exploring audio data
 
 Group:          Applications/Multimedia
@@ -10,7 +10,11 @@ Source0:        http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}
 Source1:        sonic-visualiser.desktop
 Patch0:         %{name}-1.8-gcc46.patch
 Patch1:         %{name}-1.8-implicit-dso.patch
+Patch2:         %{name}-1.8-no_virt_QObject.patch
+
+%if 0%{?el5}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%endif
 
 ## upstreamable patches
 # support raptor2
@@ -50,6 +54,7 @@ analysis plugin format – as well as applying standard audio effects.
 %setup -q
 %patch0 -p1 -b .gcc46
 %patch1 -p1 -b .implicit-dso
+%patch2 -p1 -b .no_virt_QObject
 
 %if 0%{?raptor2}
 %patch50 -p1 -b .raptor2
@@ -64,6 +69,8 @@ done
 %build
 %configure
 #qmake-qt4
+
+# not SMP-safe
 #make {?_smp_mflags}
 make
 
@@ -84,8 +91,10 @@ done
 desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
 
 
+%if 0%{?rhel}
 %clean
 rm -rf $RPM_BUILD_ROOT
+%endif
 
 
 %post
@@ -112,6 +121,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Aug  9 2011 Michel Salim <salimma at fedoraproject.org> - 1.8-3
+- Fix for Qt 4.8 disallowing virtual inheritance of QObject (Radek Novacek)
+
 * Sun Jul 31 2011 Rex Dieter <rdieter at fedoraproject.org> 1.8-2
 - rebuild (rasqal/redland)
 - patch for raptor2 support