[hydrogen] gcc-4.7 compile fixes

[Orcan Ogetbil]

commit 686a174ba0f2241624e50d99f8ab8503f5df9551
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Mon Jan 16 17:30:00 2012 -0500

    gcc-4.7 compile fixes

 hydrogen-gcc47.patch |   34 ++++++++++++++++++++++++++++++++++
 hydrogen.spec        |   21 ++++++++++++---------
 2 files changed, 46 insertions(+), 9 deletions(-)
---
diff --git a/hydrogen-gcc47.patch b/hydrogen-gcc47.patch
new file mode 100644
index 0000000..e9c9f59
--- /dev/null
+++ b/hydrogen-gcc47.patch
@@ -0,0 +1,34 @@
+diff -rupN hydrogen-0.9.5.old/gui/src/MainForm.cpp hydrogen-0.9.5/gui/src/MainForm.cpp
+--- hydrogen-0.9.5.old/gui/src/MainForm.cpp	2011-02-08 04:15:04.000000000 -0500
++++ hydrogen-0.9.5/gui/src/MainForm.cpp	2012-01-16 15:44:14.137527313 -0500
+@@ -70,6 +70,7 @@ using namespace H2Core;
+ 
+ #include <memory>
+ #include <cassert>
++#include <unistd.h>
+ 
+ using namespace std;
+ using namespace H2Core;
+diff -rupN hydrogen-0.9.5.old/gui/src/SongEditor/SongEditor.cpp hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp
+--- hydrogen-0.9.5.old/gui/src/SongEditor/SongEditor.cpp	2010-03-28 06:06:05.000000000 -0400
++++ hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp	2012-01-16 15:26:17.172588849 -0500
+@@ -23,6 +23,7 @@
+ #include <assert.h>
+ #include <algorithm>
+ #include <memory>
++#include <unistd.h>
+ 
+ #include <hydrogen/Song.h>
+ #include <hydrogen/hydrogen.h>
+diff -rupN hydrogen-0.9.5.old/libs/hydrogen/src/IO/portmidi_driver.cpp hydrogen-0.9.5/libs/hydrogen/src/IO/portmidi_driver.cpp
+--- hydrogen-0.9.5.old/libs/hydrogen/src/IO/portmidi_driver.cpp	2010-02-01 16:06:17.000000000 -0500
++++ hydrogen-0.9.5/libs/hydrogen/src/IO/portmidi_driver.cpp	2012-01-16 15:58:07.592740458 -0500
+@@ -30,6 +30,8 @@
+ 
+ #ifdef WIN32
+ #include <windows.h>
++#else
++#include <unistd.h>
+ #endif
+ 
+ #ifdef PORTMIDI_SUPPORT
diff --git a/hydrogen.spec b/hydrogen.spec
index 3e44fde..23d65f6 100644
--- a/hydrogen.spec
+++ b/hydrogen.spec
@@ -1,16 +1,17 @@
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.5
-Release:      2%{?dist}
+Release:      3%{?dist}
 URL:          http://www.hydrogen-music.org/
 Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Compile fix. Sent upstream via email
+Patch0:       hydrogen-gcc47.patch
 # Remove the "you are using the development version" warning
 # http://sourceforge.net/mailarchive/forum.php?forum_name=hydrogen-devel
 # See the "0.9.5 si out" thread
 Patch1:       hydrogen-devel-warning.patch
 License:      GPLv2+
-Group:        Applications/Multimedia
-BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
@@ -57,8 +58,13 @@ patch -p0 < patches/portaudio.patch
 # portmidi build fix. Looks like other distros did not obey upstream decisions
 sed -i '/porttime/d' Sconstruct
 %endif
+%patch0 -p1 -b .gcc47
 %patch1 -p1 -b .nodevver
 
+# Workaround due to change in scons behavior. Just a temporary fix since upstream
+# switched to cmake in trunk
+sed -i '/path.walk/d' Sconstruct
+
 
 %build
 export QTDIR=%{_qt4_prefix}
@@ -71,7 +77,6 @@ pushd plugins
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export QTDIR=%{_qt4_prefix}
 scons install DESTDIR=$RPM_BUILD_ROOT
 
@@ -100,9 +105,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README}* \
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/ladspa
 cp -a plugins/libwasp*.so $RPM_BUILD_ROOT%{_libdir}/ladspa/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -118,7 +120,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING* README.txt
 %{_bindir}/hydrogen
 %{_datadir}/hydrogen/
@@ -126,12 +127,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %files -n ladspa-wasp-plugins
-%defattr(-,root,root,-)
 %doc plugins/wasp/AUTHORS plugins/wasp/ChangeLog plugins/wasp/LICENSE
 %{_libdir}/ladspa/libwasp*.so
 
 
 %changelog
+* Mon Jan 16 2012 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.5-3
+- gcc-4.7 compile fixes
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild