- outdated

Changed files:
    audacity-gcc4.patch -> 1.2
    audacity-opt.patch -> 1.6
    audacity-system-expat.patch -> 1.4
    audacity-types.patch -> 1.2

diff --git a/audacity-gcc4.patch b/audacity-gcc4.patch
deleted file mode 100644 (file)
index 55f2c19..0000000
--- a/audacity-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- audacity-src-1.2.4b.orig/lib-src/soundtouch/include/SoundTouch.h   2005-11-27 03:33:39.000000000 +0100
-+++ audacity-src-1.2.4b/lib-src/soundtouch/include/SoundTouch.h        2006-08-30 18:29:27.075245750 +0200
-@@ -146,7 +146,7 @@
-     static const char *getVersionString();
- 
-     /// Get SoundTouch library version Id
--    static uint SoundTouch::getVersionId();
-+    static uint getVersionId();
- 
-     /// Sets new rate control value. Normal rate = 1.0, smaller values
-     /// represent slower rate, larger faster rates.

diff --git a/audacity-opt.patch b/audacity-opt.patch
deleted file mode 100644 (file)
index 61a68c2..0000000
--- a/audacity-opt.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aurN audacity-src-1.2.3.orig/lib-src/allegro/Makefile.in audacity-src-1.2.3/lib-src/allegro/Makefile.in
---- audacity-src-1.2.3.orig/lib-src/allegro/Makefile.in        2004-11-18 07:17:30.000000000 +0100
-+++ audacity-src-1.2.3/lib-src/allegro/Makefile.in     2004-12-05 19:50:14.926174384 +0100
-@@ -3,7 +3,7 @@
- CC = @CC@
- CCC = @CXX@
- 
--CFLAGS = -g -O
-+CFLAGS = @CFLAGS@
- OBJ = \
-       allegro.cpp.o \
-       allegrord.cpp.o \
-diff -aurN audacity-src-1.2.3.orig/lib-src/libnyquist/Makefile.in audacity-src-1.2.3/lib-src/libnyquist/Makefile.in
---- audacity-src-1.2.3.orig/lib-src/libnyquist/Makefile.in     2004-11-18 07:17:32.000000000 +0100
-+++ audacity-src-1.2.3/lib-src/libnyquist/Makefile.in  2004-12-05 19:51:30.418697776 +0100
-@@ -6,7 +6,7 @@
- INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft
- 
- CC = @CC@
--override CFLAGS += -g -DCMTSTUFF -O2 -DEXT $(INCL)
-+override CFLAGS += $(OPTFLAGS) -DCMTSTUFF -DEXT $(INCL)
- LN = $(CC)
- LFLAGS = -lm
- 
-diff -aurN audacity-src-1.2.3.orig/lib-src/portaudio/pa_unix_oss/Makefile audacity-src-1.2.3/lib-src/portaudio/pa_unix_oss/Makefile
---- audacity-src-1.2.3.orig/lib-src/portaudio/pa_unix_oss/Makefile     2004-11-18 07:17:34.000000000 +0100
-+++ audacity-src-1.2.3/lib-src/portaudio/pa_unix_oss/Makefile  2004-12-05 19:52:26.867116312 +0100
-@@ -2,7 +2,7 @@
- 
- CC = gcc
- 
--override CFLAGS += -g -O -I../pa_common
-+override CFLAGS += $(OPTFLAGS) -I../pa_common
- PASRC = ../pa_common/pa_lib.c pa_unix_oss.c pa_unix.c
- PAINC = ../pa_common/portaudio.h
- PAOBJ = ../pa_common/pa_lib.o pa_unix_oss.o pa_unix.o
-diff -aurN audacity-src-1.2.3.orig/lib-src/portaudio-v19/Makefile.linux audacity-src-1.2.3/lib-src/portaudio-v19/Makefile.linux
---- audacity-src-1.2.3.orig/lib-src/portaudio-v19/Makefile.linux       2004-11-18 07:17:34.000000000 +0100
-+++ audacity-src-1.2.3/lib-src/portaudio-v19/Makefile.linux    2004-12-05 19:53:38.559217456 +0100
-@@ -17,7 +17,7 @@
- LIBS =  -lm -lpthread
- 
- CDEFINES = -I../pa_common
--CFLAGS = -g
-+CFLAGS = $(OPTFLAGS)
- LIBINST = /usr/local/lib
- 
- TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-diff -aurN audacity-src-1.2.3.orig/lib-src/soundtouch/configure.ac audacity-src-1.2.3/lib-src/soundtouch/configure.ac
---- audacity-src-1.2.3.orig/lib-src/soundtouch/configure.ac    2004-11-18 07:17:35.000000000 +0100
-+++ audacity-src-1.2.3/lib-src/soundtouch/configure.ac 2004-12-05 20:01:48.171785032 +0100
-@@ -35,7 +35,7 @@
- dnl ############################################################################
- dnl # Checks for programs                                                      #
- dnl ############################################################################
--CXXFLAGS= dnl AC_PROG_CXX automatically sets CXXFLAGS to -g -O2 if g++ is the C++ compiler and CXXFLAGS hasn't been set, so by setting CXXFLAGS, we can avoid this.
-+CXXFLAGS=$(OPTFLAGS)
- AC_PROG_CXX
- #AC_PROG_AWK
- AC_PROG_CC

diff --git a/audacity-system-expat.patch b/audacity-system-expat.patch
deleted file mode 100644 (file)
index 6fc333c..0000000
--- a/audacity-system-expat.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -aurN audacity-src-1.2.0-pre2.orig/configure.in audacity-src-1.2.0-pre2/configure.in
---- audacity-src-1.2.0-pre2.orig/configure.in  2003-09-29 08:51:27.000000000 +0200
-+++ audacity-src-1.2.0-pre2/configure.in       2003-10-16 20:27:11.645349856 +0200
-@@ -88,9 +88,7 @@
- dnl Required sublibraries
- dnl
- 
--BUILDLIBS="$BUILDLIBS expat/expat.a"
--EXTRAOBJS="$EXTRAOBJS ../lib-src/expat/expat.a"
--CXXFLAGS="$CXXFLAGS -I../lib-src/expat"
-+LIBS="$LIBS -lexpat"
- 
- dnl TODO enable/disable allegro
- BUILDLIBS="$BUILDLIBS allegro/allegro.a"
-@@ -656,7 +654,7 @@
- esac
- 
- AC_CONFIG_FILES([Makefile src/Makefile lib-src/Makefile \
--                                        lib-src/allegro/Makefile lib-src/expat/Makefile \
-+                                        lib-src/allegro/Makefile \
-                                         lib-src/libnyquist/Makefile \
-                                         locale/Makefile tests/Makefile])
- 
-diff -aurN audacity-src-1.2.0-pre2.orig/src/commands/CommandManager.h audacity-src-1.2.0-pre2/src/commands/CommandManager.h
---- audacity-src-1.2.0-pre2.orig/src/commands/CommandManager.h 2003-09-29 08:51:27.000000000 +0200
-+++ audacity-src-1.2.0-pre2/src/commands/CommandManager.h      2003-10-16 20:27:11.650349096 +0200
-@@ -43,6 +43,7 @@
- #include <wx/hashmap.h>
- 
- #include "../xml/XMLTagHandler.h"
-+#include <expat.h>
- 
- class CommandFunctor
- {
-diff -aurN audacity-src-1.2.0-pre2.orig/src/xml/XMLFileReader.h audacity-src-1.2.0-pre2/src/xml/XMLFileReader.h
---- audacity-src-1.2.0-pre2.orig/src/xml/XMLFileReader.h       2003-09-29 08:51:27.000000000 +0200
-+++ audacity-src-1.2.0-pre2/src/xml/XMLFileReader.h    2003-10-16 20:27:52.144193096 +0200
-@@ -8,7 +8,8 @@
- 
- **********************************************************************/
- 
--#include "xmlparse/xmlparse.h"
-+/*#include "xmlparse/xmlparse.h"*/
-+#include <expat.h>
- 
- #include "XMLTagHandler.h"
- 

diff --git a/audacity-types.patch b/audacity-types.patch
deleted file mode 100644 (file)
index e91e540..0000000
--- a/audacity-types.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- audacity-src-1.2.3/src/effects/ToneGen.cpp.orig    2004-11-18 07:17:30.000000000 +0100
-+++ audacity-src-1.2.3/src/effects/ToneGen.cpp 2005-05-03 16:39:11.000000000 +0200
-@@ -280,7 +280,7 @@
-    item2->Add(item3, 0, wxALIGN_CENTRE | wxALL, 5);
- 
-    wxChoice *item4 = new wxChoice(parent, ID_WAVEFORM, wxDefaultPosition,
--                                  wxSize(80, -1), 0, NULL);
-+                                  wxSize(80, -1), 0, NULL, 0);
-    item2->Add(item4, 0, wxALIGN_CENTRE | wxALL, 5);
- 
-    item0->Add(item2, 1, wxALIGN_CENTRE | wxALL, 5);