rediffed patches

diff --git a/cdrdao-gcc4.patch b/cdrdao-gcc4.patch
index 432abddf1d85fde417856796365385c2b36aeac5..0419dcee7673b637e79cd646aec64c28d24ca308 100644 (file)
--- a/cdrdao-gcc4.patch
+++ b/cdrdao-gcc4.patch
@@ -32,24 +32,13 @@ diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatMp3.cc cdrdao-1.2.2/trackdb/FormatMp
 --- 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
 @@ -25,6 +25,7 @@
- #include <stdlib.h>
  #include <unistd.h>
+ #include <string.h>
  #include <fcntl.h>
 +#include <cstring> 
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/mman.h>
-diff -Naurp cdrdao-1.2.2.orig/xdao/AudioCDProject.cc cdrdao-1.2.2/xdao/AudioCDProject.cc
---- cdrdao-1.2.2.orig/gcdmaster/AudioCDProject.cc      2006-09-18 10:42:26.000000000 +0000
-+++ cdrdao-1.2.2/gcdmaster/AudioCDProject.cc   2008-03-07 11:15:26.000000000 +0000
-@@ -18,6 +18,7 @@
-  */
- 
- #include <assert.h>
-+#include <cstring>
- #include <gtkmm.h>
- #include <libgnome/gnome-i18n.h>
- 
 --- cdrdao-1.2.3/dao/ScsiIf-linux.cc.orig      2009-09-28 12:12:03.000000000 +0200
 +++ cdrdao-1.2.3/dao/ScsiIf-linux.cc   2010-06-03 17:47:13.502076082 +0200
 @@ -26,6 +26,8 @@

diff --git a/cdrdao-nolibs.patch b/cdrdao-nolibs.patch
index 6e8fbbc282f0eafb4ab3750d6eda04f12707e3e3..aecc0fa848c491c0f2fbd46c66a479f1c429f76d 100644 (file)
--- a/cdrdao-nolibs.patch
+++ b/cdrdao-nolibs.patch
@@ -1,8 +1,8 @@
 --- cdrdao-1.2.3/configure.ac.orig     2010-02-16 13:13:42.000000000 +0100
 +++ cdrdao-1.2.3/configure.ac  2010-02-16 13:14:14.000000000 +0100
 @@ -85,8 +85,8 @@
- AC_CHECK_FUNC(sched_setscheduler,AC_DEFINE(HAVE_SCHED_SETSCHEDULER,1,""),
-   AC_CHECK_LIB(posix4,sched_setscheduler,[use_libposix4=yes;AC_DEFINE(HAVE_SCHED_SETSCHEDULER,1,"")]))
+ AC_CHECK_FUNC([sched_setscheduler],[AC_DEFINE(HAVE_SCHED_SETSCHEDULER,1,"")],
+   [AC_CHECK_LIB(posix4,sched_setscheduler,[use_libposix4=yes;AC_DEFINE(HAVE_SCHED_SETSCHEDULER,1,"")])])
  
 -AC_CHECK_LIB([socket],[socket],[use_libsocket=yes])
 -AC_CHECK_LIB([socket],[connect],[use_libsocket=yes])

diff --git a/cdrdao-pccts-antlr.patch b/cdrdao-pccts-antlr.patch
index 65e4cd0ad96488ddc253f282ca7ec386dd54667c..176a07bb50744aa2ac832035181297a042695f82 100644 (file)
--- a/cdrdao-pccts-antlr.patch
+++ b/cdrdao-pccts-antlr.patch
@@ -1,11 +1,11 @@
 --- cdrdao-1.1.7/configure.ac~ 2003-12-18 04:04:26.000000000 +0100
 +++ cdrdao-1.1.7/configure.ac  2003-12-18 04:05:44.000000000 +0100
 @@ -165,7 +165,7 @@
-   pccts_target="pccts"
  
+   en_pccts="yes"
  else
 -  AC_PATH_PROG(antlr_path,antlr,no,$pcctsbin)
 +  AC_PATH_PROG(antlr_path,pccts-antlr,no,$pcctsbin)
    AC_PATH_PROG(dlg_path,dlg,no,$pcctsbin)
  
-   if test $antlr_path = "no"; then
+   if test $antlr_path = "no" || test $dlg_path = "no"; then