From 6320ec45f93eb7fbd2c5f8c9e4c85e9166f9eaf3 Mon Sep 17 00:00:00 2001
From: Karol Krenski <charles@pld-linux.org>
Date: Sat, 26 Nov 2005 02:04:53 +0000
Subject: [PATCH] - updated for 1.2.1

Changed files:
    cdrdao-gcc4.patch -> 1.2
    cdrdao-pccts-antlr.patch -> 1.3
---
 cdrdao-gcc4.patch        | 11 +++++------
 cdrdao-pccts-antlr.patch |  9 ---------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/cdrdao-gcc4.patch b/cdrdao-gcc4.patch
index d2676dd..29e7884 100644
--- a/cdrdao-gcc4.patch
+++ b/cdrdao-gcc4.patch
@@ -1,13 +1,12 @@
-diff -Nur cdrdao-1.2.0.org/trackdb/CueParser.cc cdrdao-1.2.0/trackdb/CueParser.cc
---- cdrdao-1.2.0.org/trackdb/CueParser.cc	2005-05-09 21:21:28.000000000 +0200
-+++ cdrdao-1.2.0/trackdb/CueParser.cc	2005-09-17 15:46:15.638476312 +0200
-@@ -23,6 +23,8 @@
- 
+--- cdrdao-1.2.1/trackdb/CueParser.cc.orig	2005-09-24 20:41:49.000000000 +0200
++++ cdrdao-1.2.1/trackdb/CueParser.cc	2005-11-26 02:35:15.000000000 +0100
+@@ -24,6 +24,8 @@
  #include "Cue2Toc.h"
+ #include "Toc.h"
  
 +class Toc;
 +
- extern Toc *parseToc(const char* tocBuffer, const char *filename);
+ extern Toc *parseToc(const char* , const char *);
  
  Toc *parseCue(FILE *fp, const char *filename)
 diff -Nur cdrdao-1.2.0.org/trackdb/FormatConverter.h cdrdao-1.2.0/trackdb/FormatConverter.h
diff --git a/cdrdao-pccts-antlr.patch b/cdrdao-pccts-antlr.patch
index 3205f33..65e4cd0 100644
--- a/cdrdao-pccts-antlr.patch
+++ b/cdrdao-pccts-antlr.patch
@@ -1,14 +1,5 @@
 --- 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
-@@ -156,7 +156,7 @@
- 
- dnl Checks for pccts parser generator
- if test "$pcctsbin" = default; then
--  antlr_path='$(srcdir)/../pccts/bin/antlr'
-+  antlr_path='$(srcdir)/../pccts/bin/pccts-antlr'
-   dlg_path='$(srcdir)/../pccts/bin/dlg'
- 
-   AC_SUBST(antlr_path)
 @@ -165,7 +165,7 @@
    pccts_target="pccts"
  
-- 
2.43.0