rpms/hydrogen/devel hydrogen-qt47.patch, NONE, 1.1 hydrogen.spec, 1.18, 1.19

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/hydrogen/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27591

Modified Files:
	hydrogen.spec 
Added Files:
	hydrogen-qt47.patch 
Log Message:
Fix build against qt-4.7


hydrogen-qt47.patch:
 song.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hydrogen-qt47.patch ---
--- 0.9.4.1.old/libs/hydrogen/src/song.cpp	2009-07-14 21:10:17.000000000 -0400
+++ 0.9.4.1/libs/hydrogen/src/song.cpp	2010-04-10 08:14:54.000000000 -0400
@@ -141,7 +141,7 @@ Song* Song::get_default_song(){
 		song->set_swing_factor( 0.0 );
 
 		InstrumentList* pList = new InstrumentList();
-		Instrument *pNewInstr = new Instrument(QString( 0 ), "New instrument", new ADSR());
+		Instrument *pNewInstr = new Instrument(QString( "" ), "New instrument", new ADSR());
 		pList->add( pNewInstr );
 		song->set_instrument_list( pList );
 		


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/hydrogen.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- hydrogen.spec	10 Apr 2010 11:54:26 -0000	1.18
+++ hydrogen.spec	10 Apr 2010 21:56:58 -0000	1.19
@@ -14,6 +14,8 @@ Patch1:       hydrogen-linking.patch
 Patch2:       hydrogen-lib64.patch
 # Fix wasp ladspa plugin linking
 Patch3:       wasp-linking.patch
+# Fix qt-4.7 build issue
+Patch4:       hydrogen-qt47.patch
 License:      GPLv2+
 Group:        Applications/Multimedia
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +69,7 @@ patch -p0 < patches/portmidi.patch
 %patch1 -p1 -b .linking
 %patch2 -p1 -b .lib64
 %patch3 -p1 -b .wasp.linking
+%patch4 -p1 -b .qt47
 
 %build
 export QTDIR=%{_qt4_prefix}
@@ -143,7 +146,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 * Sat Apr 10 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4.1-1
 - Update to 0.9.4.1
 - Build the wasp plugins
-- Fix ladspa plugin path on 64bit systems
+- Fixes ladspa plugin path on 64bit systems
+- Fixes crash RHBZ#570348
 
 * Sat Feb 13 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-3
 - Fix DSO linking RHBZ#564719