049e0e596059bd88a5779b3306467aa2 audacity-dynamic_id3lib.patch

debe9b8ed7af65ae4f6c49d8e5764f80  audacity-helpfile_location.patch
fe8d4009c34f11a8beec33d76098f56c  audacity-src-0.98.tgz

Changed files:
    audacity-dynamic_id3lib.patch -> 1.1
    audacity-helpfile_location.patch -> 1.1

diff --git a/audacity-dynamic_id3lib.patch b/audacity-dynamic_id3lib.patch
new file mode 100644 (file)
index 0000000..64a7d3f
--- /dev/null
+++ b/audacity-dynamic_id3lib.patch
@@ -0,0 +1,34 @@
+diff -urN audacity-src-0.98.orig/configure.in audacity-src-0.98/configure.in
+--- audacity-src-0.98.orig/configure.in        Tue Jan 22 07:14:15 2002
++++ audacity-src-0.98/configure.in     Sat Feb  2 15:08:27 2002
+@@ -54,11 +54,12 @@
+               [enable ogg vorbis support (libraries must be installed) [default=no]])],
+       use_vorbis=$withval,
+       use_vorbis="no")
+-AC_ARG_WITH(id3,
+-      [AC_HELP_STRING([--with-id3],
+-              [compile with id3lib (the source is included here) [default=yes]])],
+-      use_id3lib=$withval,
+-      use_id3lib="yes")
++dnl AC_ARG_WITH(id3,
++dnl   [AC_HELP_STRING([--with-id3],
++dnl           [compile with id3lib (the source is included here) [default=yes]])],
++dnl   use_id3lib=$withval,
++dnl   use_id3lib="yes")
++use_id3lib="yes"
+ AC_ARG_WITH(help,
+       [AC_HELP_STRING([--with-help],
+               [Make the help file "audacity-help.htb" [default=yes]])],
+@@ -161,9 +162,9 @@
+ fi
+ 
+ if [[ $use_id3lib = "yes" ]] ; then
+-      EXTRAOBJS="$EXTRAOBJS id3lib/src/.libs/libid3.a"
+-      MAKEALL="$MAKEALL id3lib/src/.libs/libid3.a"
+-      CFLAGS="$CFLAGS -Iid3lib/include"
++      dnl EXTRAOBJS="$EXTRAOBJS id3lib/src/.libs/libid3.a"
++      dnl MAKEALL="$MAKEALL id3lib/src/.libs/libid3.a"
++      LIBS="$LIBS -lid3"
+               
+       AC_DEFINE(USE_ID3LIB, 1,
+       [Define if id3lib is present])

diff --git a/audacity-helpfile_location.patch b/audacity-helpfile_location.patch
new file mode 100644 (file)
index 0000000..5e7170a
--- /dev/null
+++ b/audacity-helpfile_location.patch
@@ -0,0 +1,14 @@
+diff -urN audacity-src-0.98.orig/Help.cpp audacity-src-0.98/Help.cpp
+--- audacity-src-0.98.orig/Help.cpp    Tue Jan 22 07:14:15 2002
++++ audacity-src-0.98/Help.cpp Sat Feb  2 15:27:05 2002
+@@ -106,9 +106,7 @@
+       paths.Add(wxGetCwd() + wxFILE_SEP_PATH + "audacity-help.htb");
+ 
+       #ifdef __WXGTK__
+-      paths.Add("/usr/local/share/doc/audacity/audacity-help.htb");
+-      paths.Add("/usr/share/doc/audacity/audacity-help.htb");
+-      paths.Add("/usr/share/audacity/audacity-help.htb"); // for debian
++      paths.Add("/usr/X11R6/share/audacity/audacity-help.htb");
+       #endif
+ 
+       #ifdef __WXMSW__