rpms/audacity/devel audacity-1.3.6-flac-import.patch, NONE, 1.1.2.1 audacity.spec, 1.58.2.7, 1.58.2.8

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
      Tag: audacity-1_3_6-test
	audacity.spec 
Added Files:
      Tag: audacity-1_3_6-test
	audacity-1.3.6-flac-import.patch 
Log Message:
apply work-around for crash

audacity-1.3.6-flac-import.patch:

--- NEW FILE audacity-1.3.6-flac-import.patch ---
diff -Nur audacity-src-1.3.6-orig/src/import/ImportFLAC.cpp audacity-src-1.3.6/src/import/ImportFLAC.cpp
--- audacity-src-1.3.6-orig/src/import/ImportFLAC.cpp	2008-10-25 14:14:27.000000000 +0200
+++ audacity-src-1.3.6/src/import/ImportFLAC.cpp	2008-11-05 00:15:33.000000000 +0100
@@ -361,6 +361,8 @@
               Tags *tags)
 {
    wxASSERT(mStreamInfoDone);
+   if (!mStreamInfoDone)
+      return eImportFailed;
 
    CreateProgress();
 


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.58.2.7
retrieving revision 1.58.2.8
diff -u -r1.58.2.7 -r1.58.2.8
--- audacity.spec	4 Nov 2008 13:55:32 -0000	1.58.2.7
+++ audacity.spec	4 Nov 2008 23:20:41 -0000	1.58.2.8
@@ -17,6 +17,7 @@
 
 Patch1: audacity-1.3.4-libmp3lame-default.patch
 Patch2: audacity-1.3.6-libdir.patch
+Patch3: audacity-1.3.6-flac-import.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -67,6 +68,8 @@
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
+%patch3 -p1 -b .dumb-flac-import
+
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
 do
@@ -138,6 +141,8 @@
 
 %changelog
 * Tue Nov  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.6-0.2.beta
+- apply brute-force work-around for ImportFLAC to prevent crashes
+  as a result of accepting non-FLAC files
 - build --without-ffmpeg because it doesn't work at all
   (and even if disabled, importing MP3 files crashes Audacity instead
   of warning about lack of MP3 files support as in <= 1.3.5-beta)