From 0d59bd62f00a25981e6d39c7cf68ea7143840edc Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Feb 08 2009 13:51:50 +0000
Subject: - Fix compilation problem with GCC 4.4


---

diff --git a/sonic-visualiser-1.4-gcc44.patch b/sonic-visualiser-1.4-gcc44.patch
new file mode 100644
index 0000000..fc78a6a
--- /dev/null
+++ b/sonic-visualiser-1.4-gcc44.patch
@@ -0,0 +1,65 @@
+--- sonic-visualiser-1.4/data/fft/FFTMemoryCache.cpp.gcc44	2008-12-11 07:50:35.000000000 -0500
++++ sonic-visualiser-1.4/data/fft/FFTMemoryCache.cpp	2009-02-08 08:26:33.162107339 -0500
+@@ -17,6 +17,7 @@
+ #include "system/System.h"
+ 
+ #include <iostream>
++#include <cstdio> // perror
+ 
+ //#define DEBUG_FFT_MEMORY_CACHE 1
+ 
+--- sonic-visualiser-1.4/data/fileio/FileReadThread.cpp.gcc44	2008-12-11 07:50:36.000000000 -0500
++++ sonic-visualiser-1.4/data/fileio/FileReadThread.cpp	2009-02-08 08:28:46.937858603 -0500
+@@ -20,6 +20,7 @@
+ 
+ #include <iostream>
+ #include <unistd.h>
++#include <cstdio> // perror
+ 
+ //#define DEBUG_FILE_READ_THREAD 1
+ 
+--- sonic-visualiser-1.4/base/Thread.cpp.gcc44	2008-12-11 07:50:36.000000000 -0500
++++ sonic-visualiser-1.4/base/Thread.cpp	2009-02-08 08:25:17.982856597 -0500
+@@ -22,6 +22,7 @@
+ //#define DEBUG_MUTEX_LOCKER 1
+ 
+ #include <iostream>
++#include <cstdio> // perror
+ 
+ Thread::Thread(Type type, QObject *parent) :
+     QThread(parent),
+--- sonic-visualiser-1.4/base/RingBuffer.h.gcc44	2008-12-11 07:50:36.000000000 -0500
++++ sonic-visualiser-1.4/base/RingBuffer.h	2009-02-08 08:23:29.851107944 -0500
+@@ -26,6 +26,7 @@
+ #include "system/System.h"
+ #include "Scavenger.h"
+ 
++#include <cstdio>  // perror
+ #include <cstring> // memcpy, memset &c
+ 
+ //#define DEBUG_RINGBUFFER 1
+--- sonic-visualiser-1.4/rdf/RDFFeatureWriter.h.gcc44	2008-12-11 07:50:36.000000000 -0500
++++ sonic-visualiser-1.4/rdf/RDFFeatureWriter.h	2009-02-08 08:45:37.977886435 -0500
+@@ -20,6 +20,12 @@
+ #ifndef _RDF_FEATURE_WRITER_H_
+ #define _RDF_FEATURE_WRITER_H_
+ 
++// GCC 4.4.x: cstdint provides uint64_t, but it is still experimental
++//#include <cstdint>
++// while <stdint.h> defines it as long long long, which the C++ compiler
++// does not like. ugh for C <-> C++ impedance mismatch!
++#define uint64_t unsigned long long
++// GCC 4.4x END
+ #include <string>
+ #include <map>
+ #include <set>
+--- sonic-visualiser-1.4/system/System.cpp.gcc44	2008-12-11 07:50:33.000000000 -0500
++++ sonic-visualiser-1.4/system/System.cpp	2009-02-08 08:43:57.250857161 -0500
+@@ -18,6 +18,7 @@
+ #include <QStringList>
+ #include <QString>
+ 
++#include <cstdio>
+ #include <stdint.h>
+ 
+ #ifndef _WIN32
diff --git a/sonic-visualiser.spec b/sonic-visualiser.spec
index 1751999..10b8b47 100644
--- a/sonic-visualiser.spec
+++ b/sonic-visualiser.spec
@@ -1,7 +1,7 @@
 # rebuild with --with libmad to enable support for MP3 files
 Name:           sonic-visualiser
 Version:        1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A program for viewing and exploring audio data
 
 Group:          Applications/Multimedia
@@ -10,6 +10,7 @@ URL:            http://www.sonicvisualiser.org/
 Source0:        http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Patch0:         %{name}-1.4-specfix.patch
+Patch1:         %{name}-1.4-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel vamp-plugin-sdk-devel
@@ -38,9 +39,8 @@ analysis plugin format – as well as applying standard audio effects.
 
 %prep
 %setup -q
-# SF tracker #2430266
-# s|linux-g++|linux-g++*
 %patch0 -p1 -b .specfix
+%patch1 -p1 -b .gcc44
 
 
 %build
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 # make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 install -m 755 -p sv/sonic-visualiser \
-	$RPM_BUILD_ROOT%{_bindir}/
+        $RPM_BUILD_ROOT%{_bindir}/
 # desktop file and icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -m 644 -p sv/icons/sv-48x48.png \
@@ -93,6 +93,9 @@ fi
 
 
 %changelog
+* Sun Feb  8 2009 Michel Salim <salimma@fedoraproject.org> - 1.4-3
+- Fix compilation problem with GCC 4.4
+
 * Sun Dec 14 2008 Michel Salim <salimma@fedoraproject.org> - 1.4-2
 - Fix qmake profiles to properly detect 64-bit Linux