rpms/hydrogen/devel hydrogen-0.9.3-gcc43.patch, NONE, 1.1 hydrogen.spec, 1.2, 1.3

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/hydrogen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27474/devel

Modified Files:
	hydrogen.spec 
Added Files:
	hydrogen-0.9.3-gcc43.patch 
Log Message:
Adding missing includes to fix build with gcc-4.3


hydrogen-0.9.3-gcc43.patch:

--- NEW FILE hydrogen-0.9.3-gcc43.patch ---
diff -rup hydrogen-0.9.3.orig/src/gui/DrumkitManager.h hydrogen-0.9.3/src/gui/DrumkitManager.h
--- hydrogen-0.9.3.orig/src/gui/DrumkitManager.h	2005-10-18 00:32:04.000000000 +0200
+++ hydrogen-0.9.3/src/gui/DrumkitManager.h	2008-01-03 21:45:23.000000000 +0100
@@ -43,6 +43,7 @@
 #include <qwidget.h>
 
 #include <vector>
+#include <cstdlib>
 
 #include "UI/DrumkitManager_UI.h"
 #include "lib/Object.h"
diff -rup hydrogen-0.9.3.orig/src/gui/main.cpp hydrogen-0.9.3/src/gui/main.cpp
--- hydrogen-0.9.3.orig/src/gui/main.cpp	2005-11-08 15:52:51.000000000 +0100
+++ hydrogen-0.9.3/src/gui/main.cpp	2008-01-03 21:51:21.000000000 +0100
@@ -43,6 +43,7 @@
 #include "lib/Exception.h"
 
 #include <iostream>
+#include <cstdlib>
 using namespace std;
 
 void showInfo();
diff -rup hydrogen-0.9.3.orig/src/lib/FLACFile.cpp hydrogen-0.9.3/src/lib/FLACFile.cpp
--- hydrogen-0.9.3.orig/src/lib/FLACFile.cpp	2008-01-03 21:06:25.000000000 +0100
+++ hydrogen-0.9.3/src/lib/FLACFile.cpp	2008-01-03 21:39:52.000000000 +0100
@@ -27,6 +27,7 @@
 
 #include <vector>
 #include <fstream>
+#include <cstring>
 
 #ifdef FLAC_SUPPORT
 
diff -rup hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp
--- hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp	2005-10-18 00:32:04.000000000 +0200
+++ hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp	2008-01-03 21:36:58.000000000 +0100
@@ -25,6 +25,7 @@
 
 #include <qapplication.h>
 
+#include <cstdlib>
 #include <iostream>
 #include <stdio.h>
 #include <string>


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/hydrogen.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hydrogen.spec	14 Oct 2007 19:51:22 -0000	1.2
+++ hydrogen.spec	3 Jan 2008 21:00:49 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.3
-Release:      10%{?dist}
+Release:      11%{?dist}
 URL:          http://www.hydrogen-music.org/
 Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:       hydrogen-0.9.3-g++4.patch
@@ -9,13 +9,14 @@
 Patch3:       hydrogen-0.9.3-wasp.patch
 Patch4:       hydrogen-0.9.3-libdir.patch
 Patch5:       hydrogen-0.9.3-null-sample.patch
+Patch6:       hydrogen-0.9.3-gcc43.patch
 License:      GPLv2+
 Group:        Applications/Multimedia
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: flac-devel jack-audio-connection-kit-devel liblrdf-devel
 BuildRequires: qt-devel libsndfile-devel alsa-lib-devel
-BuildRequires: libxml2-devel
+BuildRequires: libxml2-devel desktop-file-utils
 
 %description
 Hydrogen is an advanced drum machine for GNU/Linux. It's main goal is
@@ -29,6 +30,7 @@
 %patch3 -p1 -b .wasp
 %patch4 -p1 -b .libdir
 %patch5 -p0 -b .null-sample
+%patch6 -p1 -b .gcc43
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -77,6 +79,10 @@
 %{_datadir}/applications/fedora-hydrogen.desktop
 
 %changelog
+* Thu Jan 03 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.9.3-11
+- Previous change was not a good idea
+- Adding missing includes to fix build with gcc-4.3
+
 * Sun Oct 14 2007 Lubomir Kundrak <lkundrak at redhat.com> 0.9.3-10
 - Remove unneeded dependencies on desktop-file-utils