- gcc 3.4 fixes.

Changed files:
    cdrdao-gcc34.patch -> 1.1
    cdrdao.spec -> 1.53

diff --git a/cdrdao-gcc34.patch b/cdrdao-gcc34.patch
new file mode 100644 (file)
index 0000000..49ab801
--- /dev/null
+++ b/cdrdao-gcc34.patch
@@ -0,0 +1,331 @@
+diff -uNr cdrdao-1.1.8.orig/dao/CDD2600Base.cc cdrdao-1.1.8/dao/CDD2600Base.cc
+--- cdrdao-1.1.8.orig/dao/CDD2600Base.cc       2001-01-28 11:37:15.000000000 +0100
++++ cdrdao-1.1.8/dao/CDD2600Base.cc    2004-04-01 15:07:19.941993720 +0200
+@@ -190,7 +190,7 @@
+         indexCount, dataLen);
+   */
+ 
+-  data = new (unsigned char)[dataLen];
++  data = new unsigned char[dataLen];
+   memset(data, 0, dataLen);
+   tp = data;
+ 
+diff -uNr cdrdao-1.1.8.orig/dao/CDD2600.cc cdrdao-1.1.8/dao/CDD2600.cc
+--- cdrdao-1.1.8.orig/dao/CDD2600.cc   2002-01-20 21:43:36.000000000 +0100
++++ cdrdao-1.1.8/dao/CDD2600.cc        2004-04-01 15:07:19.942993568 +0200
+@@ -446,7 +446,7 @@
+ {
+   unsigned char cmd[10];
+   unsigned long dataLen = 2 * blockLength_;
+-  unsigned char *data = new (unsigned char)[dataLen];
++  unsigned char *data = new unsigned char[dataLen];
+ 
+ 
+   // read sub channel information
+@@ -666,7 +666,7 @@
+ 
+   message(5, "Raw toc data len: %d", dataLen);
+ 
+-  data = new (unsigned char)[dataLen];
++  data = new unsigned char[dataLen];
+   
+   // read disk toc
+   cmd[7] = dataLen >> 8;
+diff -uNr cdrdao-1.1.8.orig/dao/CdrDriver.cc cdrdao-1.1.8/dao/CdrDriver.cc
+--- cdrdao-1.1.8.orig/dao/CdrDriver.cc 2004-02-12 02:13:30.000000000 +0100
++++ cdrdao-1.1.8/dao/CdrDriver.cc      2004-04-01 15:07:19.953991896 +0200
+@@ -878,10 +878,10 @@
+ 
+   scsiMaxDataLen_ = scsiIf_->maxDataLen();
+ 
+-  transferBuffer_ = new (unsigned char)[scsiMaxDataLen_];
++  transferBuffer_ = new unsigned char[scsiMaxDataLen_];
+ 
+   maxScannedSubChannels_ = scsiMaxDataLen_ / (AUDIO_BLOCK_LEN + PW_SUBCHANNEL_LEN);
+-  scannedSubChannels_ = new (SubChannel*)[maxScannedSubChannels_];
++  scannedSubChannels_ = new SubChannel *[maxScannedSubChannels_];
+ 
+   paranoia_ = NULL;
+   paranoiaDrive_ = NULL;
+@@ -1343,7 +1343,7 @@
+   unsigned char cmd[10];
+   long dataLen = bufLen + 8/*mode parameter header*/ + 
+                           100/*spare for block descriptors*/;
+-  unsigned char *data = new (unsigned char)[dataLen];
++  unsigned char *data = new unsigned char[dataLen];
+ 
+   memset(cmd, 0, 10);
+   memset(data, 0, dataLen);
+@@ -1407,7 +1407,7 @@
+   if (blockDesc != NULL)
+     dataLen += 8;
+ 
+-  unsigned char *data = new (unsigned char)[dataLen];
++  unsigned char *data = new unsigned char[dataLen];
+ 
+   memset(cmd, 0, 10);
+   memset(data, 0, dataLen);
+@@ -1466,7 +1466,7 @@
+   unsigned char cmd[6];
+   long dataLen = bufLen + 4/*mode parameter header*/ + 
+                           100/*spare for block descriptors*/;
+-  unsigned char *data = new (unsigned char)[dataLen];
++  unsigned char *data = new unsigned char[dataLen];
+ 
+   memset(cmd, 0, 6);
+   memset(data, 0, dataLen);
+@@ -1529,7 +1529,7 @@
+   if (blockDesc != NULL)
+     dataLen += 8;
+ 
+-  unsigned char *data = new (unsigned char)[dataLen];
++  unsigned char *data = new unsigned char[dataLen];
+ 
+   memset(cmd, 0, 6);
+   memset(data, 0, dataLen);
+@@ -1602,7 +1602,7 @@
+     dataLen = (100 * 8) + 4;
+   }
+ 
+-  data = new (unsigned char)[dataLen];
++  data = new unsigned char[dataLen];
+   memset(data, 0, dataLen);
+ 
+   // read disk toc
+@@ -2940,7 +2940,7 @@
+     return NULL;
+   }
+ 
+-  data = new (unsigned char)[len];
++  data = new unsigned char[len];
+ 
+   cmd[7] = len >> 8;
+   cmd[8] = len;
+@@ -3677,7 +3677,7 @@
+   blocking = scsiMaxDataLen_ / (AUDIO_BLOCK_LEN + PW_SUBCHANNEL_LEN);
+   assert(blocking > 0);
+ 
+-  buf = new (unsigned char)[blocking * blockLen];
++  buf = new unsigned char[blocking * blockLen];
+ 
+   lba = lastLba = start;
+   burst = blocking;
+diff -uNr cdrdao-1.1.8.orig/dao/CdTextEncoder.cc cdrdao-1.1.8/dao/CdTextEncoder.cc
+--- cdrdao-1.1.8.orig/dao/CdTextEncoder.cc     2001-01-28 11:37:15.000000000 +0100
++++ cdrdao-1.1.8/dao/CdTextEncoder.cc  2004-04-01 15:07:19.955991592 +0200
+@@ -439,7 +439,7 @@
+     return;
+   }
+ 
+-  subChannels_ = new (PWSubChannel96*)[subChannelCount_];
++  subChannels_ = new PWSubChannel96 *[subChannelCount_];
+   
+   prun = packs_;
+ 
+diff -uNr cdrdao-1.1.8.orig/dao/GenericMMC.cc cdrdao-1.1.8/dao/GenericMMC.cc
+--- cdrdao-1.1.8.orig/dao/GenericMMC.cc        2004-02-12 02:13:30.000000000 +0100
++++ cdrdao-1.1.8/dao/GenericMMC.cc     2004-04-01 15:07:19.959990984 +0200
+@@ -747,7 +747,7 @@
+     len += t->nofIndices(); // entry for each index increment
+   }
+ 
+-  cueSheet = new (unsigned char)[len * 8];
++  cueSheet = new unsigned char[len * 8];
+   n = 0;
+ 
+   if (toc_->leadInMode() == TrackData::AUDIO) {
+@@ -1872,7 +1872,7 @@
+   if (len > bufLen)
+     len = bufLen;
+ 
+-  data = new (unsigned char)[len + 8];
++  data = new unsigned char[len + 8];
+ 
+   cmd[7] = (len + 8) >> 8;
+   cmd[8] = (len + 8);
+@@ -2014,7 +2014,7 @@
+   
+   message(4, "Raw toc data len: %d", dataLen);
+ 
+-  data = new (unsigned char)[dataLen];
++  data = new unsigned char[dataLen];
+   
+   // read disk toc
+   cmd[7] = dataLen >> 8;
+diff -uNr cdrdao-1.1.8.orig/dao/GenericMMCraw.cc cdrdao-1.1.8/dao/GenericMMCraw.cc
+--- cdrdao-1.1.8.orig/dao/GenericMMCraw.cc     2002-11-24 18:25:16.000000000 +0100
++++ cdrdao-1.1.8/dao/GenericMMCraw.cc  2004-04-01 15:07:19.960990832 +0200
+@@ -498,10 +498,10 @@
+   // allocate buffer for sub-channel encoding
+   n = blocksPerWrite_ * blockLength_;
+   delete[] encodeBuffer_;
+-  encodeBuffer_ = new (unsigned char)[n];
++  encodeBuffer_ = new unsigned char[n];
+ 
+   delete[] encSubChannel_;
+-  encSubChannel_ = new (unsigned char)[blocksPerWrite_ * subChannel_->dataLength()];
++  encSubChannel_ = new unsigned char[blocksPerWrite_ * subChannel_->dataLength()];
+ 
+   /*
+   SessionInfo sessInfo;
+diff -uNr cdrdao-1.1.8.orig/dao/PlextorReader.cc cdrdao-1.1.8/dao/PlextorReader.cc
+--- cdrdao-1.1.8.orig/dao/PlextorReader.cc     2002-12-03 22:35:36.000000000 +0100
++++ cdrdao-1.1.8/dao/PlextorReader.cc  2004-04-01 15:07:19.962990528 +0200
+@@ -453,7 +453,7 @@
+ 
+   message(4, "Raw toc data len: %d", dataLen);
+ 
+-  data = new (unsigned char)[dataLen];
++  data = new unsigned char[dataLen];
+   
+   // read disk toc
+   cmd[7] = dataLen >> 8;
+@@ -685,7 +685,7 @@
+ 
+   int overspeed,cai=-1;
+ 
+-  data = new (unsigned char)[blocksPerRead * blockLength];  
++  data = new unsigned char[blocksPerRead * blockLength];  
+ 
+   fat = startTrack;
+   lat = endTrack;
+diff -uNr cdrdao-1.1.8.orig/dao/PQChannelEncoder.cc cdrdao-1.1.8/dao/PQChannelEncoder.cc
+--- cdrdao-1.1.8.orig/dao/PQChannelEncoder.cc  2001-09-03 19:37:42.000000000 +0200
++++ cdrdao-1.1.8/dao/PQChannelEncoder.cc       2004-04-01 15:07:19.963990376 +0200
+@@ -106,7 +106,7 @@
+ 
+   // create PQ sub channels for toc in lead-in
+   tocLen_ = lastTrackNr_ - firstTrackNr_ + 1 + 3/*A0, A1, A2*/;
+-  toc_ = new (SubChannel*)[tocLen_];
++  toc_ = new SubChannel *[tocLen_];
+ 
+   for (i = 0; i < tocLen_; i++) {
+     toc_[i] = subChannel_->makeSubChannel(SubChannel::QMODE1TOC);
+diff -uNr cdrdao-1.1.8.orig/dao/SonyCDU920.cc cdrdao-1.1.8/dao/SonyCDU920.cc
+--- cdrdao-1.1.8.orig/dao/SonyCDU920.cc        2002-01-20 21:43:36.000000000 +0100
++++ cdrdao-1.1.8/dao/SonyCDU920.cc     2004-04-01 15:07:19.964990224 +0200
+@@ -250,7 +250,7 @@
+     len += t->nofIndices(); // entry for each index increment
+   }
+ 
+-  cueSheet = new (unsigned char)[len * 8];
++  cueSheet = new unsigned char[len * 8];
+   n = 0;
+ 
+   // entry for lead-in
+@@ -803,7 +803,7 @@
+   
+   message(4, "Raw toc data len: %d", dataLen);
+ 
+-  data = new (unsigned char)[dataLen];
++  data = new unsigned char[dataLen];
+   
+   // read disk toc
+   cmd[7] = dataLen >> 8;
+diff -uNr cdrdao-1.1.8.orig/dao/TeacCdr55.cc cdrdao-1.1.8/dao/TeacCdr55.cc
+--- cdrdao-1.1.8.orig/dao/TeacCdr55.cc 2002-01-20 21:43:36.000000000 +0100
++++ cdrdao-1.1.8/dao/TeacCdr55.cc      2004-04-01 15:07:19.966989920 +0200
+@@ -1291,7 +1291,7 @@
+   if (dataLen == 4)
+     return NULL;
+ 
+-  data = new (unsigned char)[dataLen];
++  data = new unsigned char[dataLen];
+   
+   // read disk toc
+   cmd[7] = dataLen >> 8;
+diff -uNr cdrdao-1.1.8.orig/dao/YamahaCDR10x.cc cdrdao-1.1.8/dao/YamahaCDR10x.cc
+--- cdrdao-1.1.8.orig/dao/YamahaCDR10x.cc      2002-01-20 21:43:36.000000000 +0100
++++ cdrdao-1.1.8/dao/YamahaCDR10x.cc   2004-04-01 15:07:19.968989616 +0200
+@@ -291,7 +291,7 @@
+     len += t->nofIndices(); // entry for each index increment
+   }
+ 
+-  cueSheet = new (unsigned char)[len * 8];
++  cueSheet = new unsigned char[len * 8];
+   n = 0;
+ 
+   if (toc_->leadInMode() == TrackData::AUDIO)
+diff -uNr cdrdao-1.1.8.orig/trackdb/Cddb.cc cdrdao-1.1.8/trackdb/Cddb.cc
+--- cdrdao-1.1.8.orig/trackdb/Cddb.cc  2001-09-03 19:37:42.000000000 +0200
++++ cdrdao-1.1.8/trackdb/Cddb.cc       2004-04-01 15:07:19.970989312 +0200
+@@ -590,7 +590,7 @@
+ 
+   nargs = ntracks + 5;
+ 
+-  args = new (const char*)[nargs];
++  args = new const char *[nargs];
+   arg = 0;
+ 
+   args[arg++] = "cddb";
+@@ -1244,8 +1244,8 @@
+   cddbEntry_->diskArtist = NULL;
+   cddbEntry_->diskExt = NULL;
+   cddbEntry_->ntracks = ntracks;
+-  cddbEntry_->trackTitles = new (char*)[ntracks];
+-  cddbEntry_->trackExt = new (char*)[ntracks];
++  cddbEntry_->trackTitles = new char *[ntracks];
++  cddbEntry_->trackExt = new char *[ntracks];
+ 
+   for (i = 0; i < ntracks; i++) {
+     cddbEntry_->trackTitles[i] = NULL;
+diff -uNr cdrdao-1.1.8.orig/trackdb/CdTextItem.cc cdrdao-1.1.8/trackdb/CdTextItem.cc
+--- cdrdao-1.1.8.orig/trackdb/CdTextItem.cc    2002-01-20 21:43:36.000000000 +0100
++++ cdrdao-1.1.8/trackdb/CdTextItem.cc 2004-04-01 15:07:19.971989160 +0200
+@@ -36,7 +36,7 @@
+ 
+   dataLen_ = strlen(data) + 1;
+ 
+-  data_ = new (unsigned char)[dataLen_];
++  data_ = new unsigned char[dataLen_];
+ 
+   strcpy((char *)data_, data);
+ }
+@@ -56,7 +56,7 @@
+   dataLen_ = len;
+ 
+   if (len > 0) {
+-    data_ = new (unsigned char)[len];
++    data_ = new unsigned char[len];
+     memcpy(data_, data, len);
+   }
+   else {
+@@ -80,7 +80,7 @@
+   if (description != NULL)
+     dataLen_ += strlen(description) + 1;
+ 
+-  data_ = new (unsigned char)[dataLen_];
++  data_ = new unsigned char[dataLen_];
+   data_[0] = genreCode1;
+   data_[1] = genreCode2;
+ 
+@@ -99,7 +99,7 @@
+   dataLen_ = obj.dataLen_;
+ 
+   if (dataLen_ > 0) {
+-    data_ = new (unsigned char)[dataLen_];
++    data_ = new unsigned char[dataLen_];
+     memcpy(data_, obj.data_, dataLen_);
+   }
+   else {
+diff -uNr cdrdao-1.1.8.orig/trackdb/Track.cc cdrdao-1.1.8/trackdb/Track.cc
+--- cdrdao-1.1.8.orig/trackdb/Track.cc 2002-10-13 13:03:08.000000000 +0200
++++ cdrdao-1.1.8/trackdb/Track.cc      2004-04-01 15:06:50.000000000 +0200
+@@ -41,7 +41,7 @@
+   subTracks_ = lastSubTrack_ = NULL;
+ 
+   nofIndices_ = 0;
+-  index_ = new Msf[98](0);
++  index_ = new Msf[98];
+ 
+   isrcValid_ = 0;
+ 
+@@ -75,7 +75,7 @@
+   }
+ 
+   nofIndices_ = obj.nofIndices_;
+-  index_ = new Msf[98](0);
++  index_ = new Msf[98];
+   for (i = 0; i < nofIndices_; i++) {
+     index_[i] = obj.index_[i];
+   }

diff --git a/cdrdao.spec b/cdrdao.spec
index f5e12f8d9bc07aa36ad379f426647e9c133b417a..f1c9549b7d3ddaf429857e03f44533ad0f0de642 100644 (file)
--- a/cdrdao.spec
+++ b/cdrdao.spec
@@ -17,6 +17,7 @@ Source1:      %{name}.desktop
 Source2:       %{name}.drivers
 Patch0:                %{name}-nolibs.patch
 Patch1:                %{name}-pccts-antlr.patch
+Patch2:                %{name}-gcc34.patch
 URL:           http://cdrdao.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -69,6 +70,7 @@ niedestruktywne ci
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 sed -i -e 's#/usr/src/linux/include##g' scsilib/DEFAULT*/Defaults.linux
 %if %{without gnome}