- Removed patches not required thanks to patching wxGTK.

Changed files:
    audacity-wxGTK-2.3.2.patch -> 1.4

diff --git a/audacity-wxGTK-2.3.2.patch b/audacity-wxGTK-2.3.2.patch
index 39a4dc088f1d6be08cce8bc4b72bdddbade62867..8c99c4577cd15da892a11eaff2a896fbfc3acba0 100644 (file)
--- a/audacity-wxGTK-2.3.2.patch
+++ b/audacity-wxGTK-2.3.2.patch
@@ -1,6 +1,6 @@
-diff -ruN audacity-src-0.98.orig/Help.cpp audacity-src-0.98/Help.cpp
---- audacity-src-0.98.orig/Help.cpp    Tue Jan 22 06:14:15 2002
-+++ audacity-src-0.98/Help.cpp Sun May 12 07:38:51 2002
+diff -urN audacity-src-0.98.orig/Help.cpp audacity-src-0.98/Help.cpp
+--- audacity-src-0.98.orig/Help.cpp    Sun May 12 14:34:09 2002
++++ audacity-src-0.98/Help.cpp Sun May 12 14:34:31 2002
 @@ -48,6 +48,7 @@
  
  #else
@@ -9,20 +9,9 @@ diff -ruN audacity-src-0.98.orig/Help.cpp audacity-src-0.98/Help.cpp
  #include <wx/filedlg.h>
  #include <wx/msgdlg.h>
  #include <wx/textdlg.h>
-diff -ruN audacity-src-0.98.orig/Import.cpp audacity-src-0.98/Import.cpp
---- audacity-src-0.98.orig/Import.cpp  Tue Jan 22 06:14:15 2002
-+++ audacity-src-0.98/Import.cpp       Sat May 11 21:30:22 2002
-@@ -23,6 +23,7 @@
- #include "ImportMP3.h"
- #include "ImportOGG.h"
- #include "ImportRaw.h"
-+#include "Mess.h"
- 
- #include "Project.h"
- 
-diff -ruN audacity-src-0.98.orig/ImportRaw.cpp audacity-src-0.98/ImportRaw.cpp
---- audacity-src-0.98.orig/ImportRaw.cpp       Tue Jan 22 06:14:15 2002
-+++ audacity-src-0.98/ImportRaw.cpp    Sat May 11 21:46:43 2002
+diff -urN audacity-src-0.98.orig/ImportRaw.cpp audacity-src-0.98/ImportRaw.cpp
+--- audacity-src-0.98.orig/ImportRaw.cpp       Tue Jan 22 07:14:15 2002
++++ audacity-src-0.98/ImportRaw.cpp    Sun May 12 14:34:31 2002
 @@ -10,7 +10,7 @@
  
  #include <math.h>
@@ -32,33 +21,11 @@ diff -ruN audacity-src-0.98.orig/ImportRaw.cpp audacity-src-0.98/ImportRaw.cpp
  #include <wx/dc.h>
  #include <wx/dcmemory.h>
  #include <wx/file.h>
-diff -ruN audacity-src-0.98.orig/Mess.h audacity-src-0.98/Mess.h
---- audacity-src-0.98.orig/Mess.h      Thu Jan  1 00:00:00 1970
-+++ audacity-src-0.98/Mess.h   Sat May 11 21:29:29 2002
-@@ -0,0 +1,8 @@
-+#include <wx/generic/msgdlgg.h>
-+
-+int WXDLLEXPORT wxMessageBox(const wxString& message,
-+                          const wxString& caption = wxMessageBoxCaptionStr,
-+                          long style = wxOK | wxCENTRE,
-+                          wxWindow *parent = NULL,
-+                          int x = -1, int y = -1);
-+
-diff -ruN audacity-src-0.98.orig/Mix.cpp audacity-src-0.98/Mix.cpp
---- audacity-src-0.98.orig/Mix.cpp     Tue Jan 22 06:14:15 2002
-+++ audacity-src-0.98/Mix.cpp  Sat May 11 21:48:56 2002
-@@ -14,6 +14,7 @@
- #include <wx/timer.h>
- 
- #include "Mix.h"
-+#include "Mess.h"
- 
- #include "WaveTrack.h"
- #include "DirManager.h"
-diff -ruN audacity-src-0.98.orig/NoteTrack.h audacity-src-0.98/NoteTrack.h
---- audacity-src-0.98.orig/NoteTrack.h Tue Jan 22 06:14:15 2002
-+++ audacity-src-0.98/NoteTrack.h      Sat May 11 21:23:33 2002
-@@ -12,10 +12,12 @@
+diff -urN audacity-src-0.98.orig/NoteTrack.h audacity-src-0.98/NoteTrack.h
+--- audacity-src-0.98.orig/NoteTrack.h Tue Jan 22 07:14:15 2002
++++ audacity-src-0.98/NoteTrack.h      Sun May 12 14:37:18 2002
+@@ -11,7 +11,8 @@
+ #ifndef __AUDACITY_NOTETRACK__
  #define __AUDACITY_NOTETRACK__
  
  #include <wx/string.h>
@@ -66,14 +33,9 @@ diff -ruN audacity-src-0.98.orig/NoteTrack.h audacity-src-0.98/NoteTrack.h
  
  #include "Track.h"
  
- #include "allegro/allegro.h"
-+#include "Mess.h"
- 
- class DirManager;
- 
-diff -ruN audacity-src-0.98.orig/effects/Amplify.h audacity-src-0.98/effects/Amplify.h
---- audacity-src-0.98.orig/effects/Amplify.h   Tue Jan 22 06:14:15 2002
-+++ audacity-src-0.98/effects/Amplify.h        Sat May 11 22:02:03 2002
+diff -urN audacity-src-0.98.orig/effects/Amplify.h audacity-src-0.98/effects/Amplify.h
+--- audacity-src-0.98.orig/effects/Amplify.h   Tue Jan 22 07:14:15 2002
++++ audacity-src-0.98/effects/Amplify.h        Sun May 12 14:34:31 2002
 @@ -15,14 +15,15 @@
  #ifndef __AUDACITY_EFFECT_AMPLIFY__
  #define __AUDACITY_EFFECT_AMPLIFY__
@@ -92,9 +54,9 @@ diff -ruN audacity-src-0.98.orig/effects/Amplify.h audacity-src-0.98/effects/Amp
  // Declare window functions
  
  #define ID_TEXT 10000
-diff -ruN audacity-src-0.98.orig/effects/BassBoost.h audacity-src-0.98/effects/BassBoost.h
---- audacity-src-0.98.orig/effects/BassBoost.h Tue Jan 22 06:14:15 2002
-+++ audacity-src-0.98/effects/BassBoost.h      Sat May 11 22:02:42 2002
+diff -urN audacity-src-0.98.orig/effects/BassBoost.h audacity-src-0.98/effects/BassBoost.h
+--- audacity-src-0.98.orig/effects/BassBoost.h Tue Jan 22 07:14:15 2002
++++ audacity-src-0.98/effects/BassBoost.h      Sun May 12 14:34:31 2002
 @@ -15,7 +15,7 @@
  #ifndef __AUDACITY_EFFECT_BASS_BOOST__
  #define __AUDACITY_EFFECT_BASS_BOOST__
@@ -104,9 +66,9 @@ diff -ruN audacity-src-0.98.orig/effects/BassBoost.h audacity-src-0.98/effects/B
  #include <wx/dialog.h>
  #include <wx/stattext.h>
  #include <wx/slider.h>
-diff -ruN audacity-src-0.98.orig/effects/Phaser.h audacity-src-0.98/effects/Phaser.h
---- audacity-src-0.98.orig/effects/Phaser.h    Tue Jan 22 06:14:15 2002
-+++ audacity-src-0.98/effects/Phaser.h Sat May 11 22:03:16 2002
+diff -urN audacity-src-0.98.orig/effects/Phaser.h audacity-src-0.98/effects/Phaser.h
+--- audacity-src-0.98.orig/effects/Phaser.h    Tue Jan 22 07:14:15 2002
++++ audacity-src-0.98/effects/Phaser.h Sun May 12 14:34:31 2002
 @@ -15,7 +15,7 @@
  #ifndef __AUDACITY_EFFECT_PHASER__
  #define __AUDACITY_EFFECT_PHASER__
@@ -116,9 +78,9 @@ diff -ruN audacity-src-0.98.orig/effects/Phaser.h audacity-src-0.98/effects/Phas
  #include <wx/dialog.h>
  #include <wx/stattext.h>
  #include <wx/slider.h>
-diff -ruN audacity-src-0.98.orig/effects/Wahwah.h audacity-src-0.98/effects/Wahwah.h
---- audacity-src-0.98.orig/effects/Wahwah.h    Tue Jan 22 06:14:15 2002
-+++ audacity-src-0.98/effects/Wahwah.h Sat May 11 22:12:55 2002
+diff -urN audacity-src-0.98.orig/effects/Wahwah.h audacity-src-0.98/effects/Wahwah.h
+--- audacity-src-0.98.orig/effects/Wahwah.h    Tue Jan 22 07:14:15 2002
++++ audacity-src-0.98/effects/Wahwah.h Sun May 12 14:34:31 2002
 @@ -15,7 +15,7 @@
  #ifndef __AUDACITY_EFFECT_WAHWAH__
  #define __AUDACITY_EFFECT_WAHWAH__