From fc6d746dce35a1b6678ff48c737a004688034ea1e3bb05a6150d69bd8af6b2e1 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 5 Jun 2009 22:56:20 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=19

---
 audacity-1.3.7-startup_fix.patch | 20 ++++++++++++++++++++
 audacity.changes                 |  5 +++++
 audacity.spec                    |  9 +++++++--
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 audacity-1.3.7-startup_fix.patch

diff --git a/audacity-1.3.7-startup_fix.patch b/audacity-1.3.7-startup_fix.patch
new file mode 100644
index 0000000..720c61f
--- /dev/null
+++ b/audacity-1.3.7-startup_fix.patch
@@ -0,0 +1,20 @@
+--- src/AudacityApp.cpp
++++ src/AudacityApp.cpp
+@@ -1022,7 +1020,7 @@
+    wxString presets = wxT("");
+ 
+    #ifdef __WXGTK__
+-   if (presetsFromPrefs.GetChar(0) != wxT('/'))
++   if (presetsFromPrefs.Length() > 0 && presetsFromPrefs[0] != wxT('/'))
+       presetsFromPrefs = wxT("");
+    #endif //__WXGTK__
+ 
+@@ -1074,7 +1072,7 @@
+    wxString temp = wxT("");
+ 
+    #ifdef __WXGTK__
+-   if (tempFromPrefs.GetChar(0) != wxT('/'))
++   if (tempFromPrefs.Length() > 0 && tempFromPrefs[0] != wxT('/'))
+       tempFromPrefs = wxT("");
+    #endif
+ 
diff --git a/audacity.changes b/audacity.changes
index 4f9cb87..70bc6d7 100644
--- a/audacity.changes
+++ b/audacity.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 29 11:05:40 CEST 2009 - mseben@suse.cz
+
+- fix startup crash (startup_fix.patch)
+
 -------------------------------------------------------------------
 Thu May 21 23:00:52 CEST 2009 - cmorve69@yahoo.es
 
diff --git a/audacity.spec b/audacity.spec
index 5e1870b..deb2e69 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -38,14 +38,14 @@ BuildRequires:  libtwolame-devel
 %endif
 Summary:        A Free, Cross-Platform Digital Audio Editor
 Version:        1.3.7
-Release:        5
+Release:        6
 License:        GPL v2 or later
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://audacity.sourceforge.net/
 Source:         %{name}-minsrc-%{version}.tar.bz2
 Source2:        %{name}.png
-#PATCH-FIX-OPENSUSE return_non_void.patch fixed non-void return value (bnc#477654)
+#PATCH-FIX-UPSTREAM return_non_void.patch fixed non-void return value (bnc#477654)
 Patch1:         %{name}-%{version}-return_non_void.patch
 Patch2:         %{name}-%{version}-endian-fix.patch
 Patch3:         %{name}-%{version}-font-fix.patch
@@ -57,6 +57,8 @@ Patch9:         %{name}-%{version}-modal-help-dialog.patch
 Patch10:        %{name}-%{version}-desktop_file.patch
 Patch11:        %{name}-%{version}-portaudio-non-mmap-alsa.patch
 Patch12:        %{name}-%{version}-audiodevdefaults.patch
+#PATCH-FIX-UPSTREAM fix startup crash (already in upstream cvs)
+Patch13:        %{name}-%{version}-startup_fix.patch
 
 %description
 Audacity is a program that manipulates digital audio wave forms. In
@@ -95,6 +97,7 @@ Authors:
 %patch10
 %patch11 -p1
 %patch12 -p1
+%patch13
 
 %build
 %{?suse_update_config:%{suse_update_config -f . lib-src/*/.}}
@@ -147,6 +150,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mime/packages/audacity.xml
 
 %changelog
+* Fri May 29 2009 mseben@suse.cz
+- fix startup crash (startup_fix.patch)
 * Thu May 21 2009 cmorve69@yahoo.es
 - Got portaudio-non-mmap-alsa.patch and audiodevdefaults.patch from
   Fedora to allow it to work with PulseAudio