Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at Wed Sep 7 17:45:02 CEST 2011.
-------- --- audacity/audacity.changes 2011-08-19 21:48:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/audacity/audacity.changes 2011-09-07 09:38:31.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 7 07:36:18 UTC 2011 - mse...@gmail.com + +- added audacity-1.3.13-div_by_zero_fix.patch to fix audacity crash + while opening invalid wav file (bnc#711737) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- audacity-1.3.13-div_by_zero_fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.CILm70/_old 2011-09-07 17:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.CILm70/_new 2011-09-07 17:44:56.000000000 +0200 @@ -54,7 +54,7 @@ BuildRequires: libtwolame-devel %endif Version: 1.3.13 -Release: 2 +Release: 4 License: GPLv2+ Summary: A Free, Cross-Platform Digital Audio Editor Url: http://audacity.sourceforge.net/ @@ -64,6 +64,8 @@ Source2: %{name}-license-nyquist # PATCH-FIX-OPENSUSE %{name}-no_buildstamp.patch reddw...@opensuse.org -- this patch removes the buildstamp Patch0: %{name}-no_buildstamp.patch +# PATCH-FIX-UPSTREAM %{name}-1.3.13-div_by_zero_fix.patch mse...@gmail.com -- fix crash (bnc#711737), fix already in upstream svn +Patch1: %{name}-1.3.13-div_by_zero_fix.patch Patch16: %{name}-implicit.patch # PATCH-FIX-UPSTREAM %{name}-1.3.13-ffmpeg.patch reddw...@opensuse.org -- make it compile against latest ffmpeg Patch17: %{name}-1.3.13-ffmpeg.patch @@ -83,6 +85,7 @@ %prep %setup -q -n %{name}-src-%{version}-beta %patch0 +%patch1 %patch16 %if %{with ffmpeg} %patch17 -p1 ++++++ audacity-1.3.13-div_by_zero_fix.patch ++++++ --- src/widgets/ProgressDialog.cpp 2011-04-07 01:35:50.000000000 +0200 +++ src/widgets/ProgressDialog.cpp 2011-09-04 21:49:20.956000014 +0200 @@ -1338,7 +1338,14 @@ int ProgressDialog::Update(wxULongLong_t current, wxULongLong_t total, const wxString & message) { - return Update((int)(current * 1000 / total), message); + if (total != 0) + { + return Update((int)(current * 1000 / total), message); + } + else + { + return Update(1000, message); + } } // @@ -1347,7 +1354,14 @@ int ProgressDialog::Update(wxLongLong current, wxLongLong total, const wxString & message) { - return Update((int)(current.GetValue() * 1000ll / total.GetValue()), message); + if (total.GetValue() != 0) + { + return Update((int)(current.GetValue() * 1000ll / total.GetValue()), message); + } + else + { + return Update(1000, message); + } } // @@ -1356,7 +1370,14 @@ int ProgressDialog::Update(wxLongLong_t current, wxLongLong_t total, const wxString & message) { - return Update((int)(current * 1000ll / total), message); + if (total != 0) + { + return Update((int)(current * 1000ll / total), message); + } + else + { + return Update(1000, message); + } } // @@ -1365,7 +1386,14 @@ int ProgressDialog::Update(int current, int total, const wxString & message) { - return Update((int)(current * ((double)(1000.0 / total))), message); + if (total != 0) + { + return Update((int)(current * ((double)(1000.0 / total))), message); + } + else + { + return Update(1000, message); + } } // @@ -1374,7 +1402,14 @@ int ProgressDialog::Update(double current, double total, const wxString & message) { - return Update((int)(current * 1000.0 / total), message); + if (total != 0) + { + return Update((int)(current * 1000.0 / total), message); + } + else + { + return Update(1000, message); + } } // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
