rpms/audacity/devel audacity-1.3.5-flac-import.patch, NONE, 1.1 audacity.spec, 1.60, 1.61

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28016/devel

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.5-flac-import.patch 
Log Message:
* Tue Nov  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.8.beta
- insert a guard in ImportFLAC next to the import assertion


audacity-1.3.5-flac-import.patch:

--- NEW FILE audacity-1.3.5-flac-import.patch ---
diff -Nur audacity-src-1.3.5-beta-orig/src/import/ImportFLAC.cpp audacity-src-1.3.5-beta/src/import/ImportFLAC.cpp
--- audacity-src-1.3.5-beta-orig/src/import/ImportFLAC.cpp	2008-05-07 23:19:50.000000000 +0200
+++ audacity-src-1.3.5-beta/src/import/ImportFLAC.cpp	2008-11-07 13:48:58.000000000 +0100
@@ -370,6 +370,8 @@
               Tags *tags)
 {
    wxASSERT(mStreamInfoDone);
+   if (!mStreamInfoDone)
+      return false;
    
    mChannels = new WaveTrack *[mNumChannels];
 


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- audacity.spec	4 Nov 2008 13:24:41 -0000	1.60
+++ audacity.spec	7 Nov 2008 12:59:46 -0000	1.61
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.5
-Release: 0.7.beta%{?dist}
+Release: 0.8.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -18,6 +18,7 @@
 Patch1: audacity-1.3.4-libmp3lame-default.patch
 Patch2: audacity-1.3.5-libdir.patch
 Patch3: audacity-1.3.5-fr.patch
+Patch4: audacity-1.3.5-flac-import.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -62,6 +63,7 @@
 grep -q -s __RPM_LIB * -R && exit 1
 
 %patch3 -p1 -b .fr
+%patch4 -p1 -b .dumb-flac-import
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -132,6 +134,9 @@
 
 
 %changelog
+* Tue Nov  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.8.beta
+- insert a guard in ImportFLAC next to the import assertion
+
 * Tue Nov  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.7.beta
 - BR vamp-plugin-sdk-devel
 - no longer build with included Vamp API, also drop Vamp multilib patch