- adjusted for 1.2.3

Changed files:
    cdrdao-gcc4.patch -> 1.4

diff --git a/cdrdao-gcc4.patch b/cdrdao-gcc4.patch
index 2bc929b74b4621f42a4ca41066d586543b6b67ab..8e25be8f856022e6e240e0079d89859bbb581c87 100644 (file)
--- a/cdrdao-gcc4.patch
+++ b/cdrdao-gcc4.patch
@@ -28,28 +28,6 @@ diff -Nur cdrdao-1.2.0.org/trackdb/FormatConverter.h cdrdao-1.2.0/trackdb/Format
 
 @DPATCH@
 
-diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatConverter.cc cdrdao-1.2.2/trackdb/FormatConverter.cc
---- cdrdao-1.2.2.orig/trackdb/FormatConverter.cc       2005-05-10 00:55:28.000000000 +0000
-+++ cdrdao-1.2.2/trackdb/FormatConverter.cc    2008-03-07 11:14:07.000000000 +0000
-@@ -22,6 +22,7 @@
- #include <ao/ao.h>
- #endif
- #include <fstream>
-+#include <cstring>
- 
- #include "config.h"
- #include "util.h"
-diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatOgg.cc cdrdao-1.2.2/trackdb/FormatOgg.cc
---- cdrdao-1.2.2.orig/trackdb/FormatOgg.cc     2005-04-22 02:01:46.000000000 +0000
-+++ cdrdao-1.2.2/trackdb/FormatOgg.cc  2008-03-07 11:14:07.000000000 +0000
-@@ -18,6 +18,7 @@
-  */
- 
- #include <stdio.h>
-+#include <cstring>
- 
- #include "util.h"
- #include "FormatOgg.h"
 diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatMp3.cc cdrdao-1.2.2/trackdb/FormatMp3.cc
 --- cdrdao-1.2.2.orig/trackdb/FormatMp3.cc     2005-09-24 20:28:43.000000000 +0000
 +++ cdrdao-1.2.2/trackdb/FormatMp3.cc          2008-03-07 11.14.07.000000000 +0000
@@ -61,17 +39,6 @@ diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatMp3.cc cdrdao-1.2.2/trackdb/FormatMp
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/mman.h>
-diff -Naurp cdrdao-1.2.2.orig/trackdb/TempFileManager.cc cdrdao-1.2.2/trackdb/TempFileManager.cc
---- cdrdao-1.2.2.orig/trackdb/TempFileManager.cc       2005-04-22 02:01:46.000000000 +0000
-+++ cdrdao-1.2.2/trackdb/TempFileManager.cc    2008-03-07 11:14:07.000000000 +0000
-@@ -24,6 +24,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <cstring>
- 
- #define DEFAULT_TEMP_PATH "/tmp/"
- 
 diff -Naurp cdrdao-1.2.2.orig/xdao/AudioCDProject.cc cdrdao-1.2.2/xdao/AudioCDProject.cc
 --- cdrdao-1.2.2.orig/xdao/AudioCDProject.cc   2006-09-18 10:42:26.000000000 +0000
 +++ cdrdao-1.2.2/xdao/AudioCDProject.cc        2008-03-07 11:15:26.000000000 +0000
@@ -83,14 +50,3 @@ diff -Naurp cdrdao-1.2.2.orig/xdao/AudioCDProject.cc cdrdao-1.2.2/xdao/AudioCDPr
  #include <gtkmm.h>
  #include <libgnome/gnome-i18n.h>
  
-diff -Naurp cdrdao-1.2.2.orig/xdao/TextEdit.cc cdrdao-1.2.2/xdao/TextEdit.cc
---- cdrdao-1.2.2.orig/xdao/TextEdit.cc 2004-02-12 01:13:32.000000000 +0000
-+++ cdrdao-1.2.2/xdao/TextEdit.cc      2008-03-07 11:14:07.000000000 +0000
-@@ -21,6 +21,7 @@
- 
- #include <stddef.h>
- #include <ctype.h>
-+#include <cstring>
- 
- TextEdit::TextEdit(const char *sample) : Gtk::Entry()
- {