gcc-3.4 patch #48853

5 files changed, 352 insertions, 21 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 731cd760b7b0..fd87c317e81d 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,12 +1,15 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.40 2004/04/13 00:29:28 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.41 2004/04/27 08:05:39 vapier Exp $
+
+*cdrdao-1.1.8-r1 (17 Mar 2004)
+
+  27 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc-3.4 patch #48853 by LordKow.
 
   12 Apr 2004; Guy Martin <gmsoft@gentoo.org> cdrdao-1.1.8.ebuild:
   Marked stable on hppa.
 
-*cdrdao-1.1.8-r1 (17 Mar 2004)
-
   17 Mar 2004; Lars Weiler <pylon@gentoo.org> cdrdao-1.1.8-r1.ebuild:
   Added patches for debug-mode as recommended in Bug 43003
 
diff --git a/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild b/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild
index 4f6f1d97a680..e4a4efca96d2 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild,v 1.8 2004/03/09 23:09:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild,v 1.9 2004/04/27 08:05:39 vapier Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa ~amd64 ia64"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 IUSE="gnome oggvorbis perl"
 
 RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
@@ -29,7 +28,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-
+	epatch ${FILESDIR}/1.1.8-gcc34.patch
 	epatch ${FILESDIR}/${P}-r2-mp32dao-gentoo.diff
 
 	if [ ! "`use oggvorbis`" ]; then
diff --git a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
index 9b922770127b..be2f0bf4faec 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
@@ -1,26 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild,v 1.2 2004/03/17 07:39:46 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild,v 1.3 2004/04/27 08:05:39 vapier Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cdrdao/${P}.tar.gz"
-#RESTRICT="nomirror"
-# Why is this here?
-
-RESTRICT="nostrip"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
 IUSE="gnome debug"
+RESTRICT="nostrip"
 
-RDEPEND="gnome? ( >=dev-cpp/gtkmm-2.0
-	              >=dev-cpp/libgnomeuimm-2.0 )
-	>=media-sound/lame-3.90"
-
+RDEPEND=">=media-sound/lame-3.90
+	gnome? ( >=dev-cpp/gtkmm-2.0
+		>=dev-cpp/libgnomeuimm-2.0 )"
 DEPEND=">=dev-util/pccts-1.33.24-r1
 	>=app-cdr/cdrtools-2.01_alpha20
 	${RDEPEND}"
@@ -29,16 +25,17 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc34.patch
+
 	# Add gentoo to version
 	sed -i -e "s:^PACKAGE_STRING='cdrdao 1.1.8':PACKAGE_STRING='cdrdao 1.1.8 gentoo':" configure
 	# Only way to disable gcdmaster currently ...
-	use gnome || \
-		sed -i -e 's:^en_xdao=yes:en_xdao=no:g' configure
+	use gnome || sed -i -e 's:^en_xdao=yes:en_xdao=no:g' configure
 
 	# Display better SCSI messages (advise from Bug 43003)
 	cd scsilib/include
-		sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' xmconfig.h
-		sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' mconfig.h
+	sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' xmconfig.h
+	sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' mconfig.h
 }
 
 src_compile() {
diff --git a/app-cdr/cdrdao/cdrdao-1.1.8.ebuild b/app-cdr/cdrdao/cdrdao-1.1.8.ebuild
index 1ef5820c2962..eaff6edf3a8d 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.8.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8.ebuild,v 1.6 2004/04/13 00:29:28 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8.ebuild,v 1.7 2004/04/27 08:05:39 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc34.patch
 	# Only way to disable gcdmaster currently ...
 	use gnome || \
 		sed -i -e 's:^en_xdao=yes:en_xdao=no:g' configure
diff --git a/app-cdr/cdrdao/files/1.1.8-gcc34.patch b/app-cdr/cdrdao/files/1.1.8-gcc34.patch
new file mode 100644
index 000000000000..709756f10eb7
--- /dev/null
+++ b/app-cdr/cdrdao/files/1.1.8-gcc34.patch
@@ -0,0 +1,331 @@
+diff -ur cdrdao-1.1.7.old/dao/CDD2600.cc cdrdao-1.1.7/dao/CDD2600.cc
+--- cdrdao-1.1.7.old/dao/CDD2600.cc	2002-10-06 13:53:56.000000000 -0500
++++ cdrdao-1.1.7/dao/CDD2600.cc	2004-04-24 01:25:29.971745400 -0500
+@@ -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 -ur cdrdao-1.1.7.old/dao/CDD2600Base.cc cdrdao-1.1.7/dao/CDD2600Base.cc
+--- cdrdao-1.1.7.old/dao/CDD2600Base.cc	2002-10-06 13:53:56.000000000 -0500
++++ cdrdao-1.1.7/dao/CDD2600Base.cc	2004-04-24 01:21:13.184782952 -0500
+@@ -190,7 +190,7 @@
+ 	  indexCount, dataLen);
+   */
+ 
+-  data = new (unsigned char)[dataLen];
++  data = new unsigned char[dataLen];
+   memset(data, 0, dataLen);
+   tp = data;
+ 
+diff -ur cdrdao-1.1.7.old/dao/CdTextEncoder.cc cdrdao-1.1.7/dao/CdTextEncoder.cc
+--- cdrdao-1.1.7.old/dao/CdTextEncoder.cc	2002-10-06 13:53:56.000000000 -0500
++++ cdrdao-1.1.7/dao/CdTextEncoder.cc	2004-04-24 01:35:24.232404048 -0500
+@@ -439,7 +439,7 @@
+     return;
+   }
+ 
+-  subChannels_ = new (PWSubChannel96*)[subChannelCount_];
++  subChannels_ = new PWSubChannel96*[subChannelCount_];
+   
+   prun = packs_;
+ 
+diff -ur cdrdao-1.1.7.old/dao/CdrDriver.cc cdrdao-1.1.7/dao/CdrDriver.cc
+--- cdrdao-1.1.7.old/dao/CdrDriver.cc	2002-10-06 13:53:56.000000000 -0500
++++ cdrdao-1.1.7/dao/CdrDriver.cc	2004-04-24 01:23:52.249601424 -0500
+@@ -872,10 +872,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;
+@@ -1337,7 +1337,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);
+@@ -1401,7 +1401,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);
+@@ -1460,7 +1460,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);
+@@ -1523,7 +1523,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);
+@@ -1596,7 +1596,7 @@
+     dataLen = (100 * 8) + 4;
+   }
+ 
+-  data = new (unsigned char)[dataLen];
++  data = new unsigned char[dataLen];
+   memset(data, 0, dataLen);
+ 
+   // read disk toc
+@@ -2934,7 +2934,7 @@
+     return NULL;
+   }
+ 
+-  data = new (unsigned char)[len];
++  data = new unsigned char[len];
+ 
+   cmd[7] = len >> 8;
+   cmd[8] = len;
+@@ -3670,7 +3670,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 -ur cdrdao-1.1.7.old/dao/GenericMMC.cc cdrdao-1.1.7/dao/GenericMMC.cc
+--- cdrdao-1.1.7.old/dao/GenericMMC.cc	2002-10-06 13:53:56.000000000 -0500
++++ cdrdao-1.1.7/dao/GenericMMC.cc	2004-04-24 01:28:36.695359096 -0500
+@@ -736,7 +736,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) {
+@@ -1860,7 +1860,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);
+@@ -2000,7 +2000,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 -ur cdrdao-1.1.7.old/dao/GenericMMCraw.cc cdrdao-1.1.7/dao/GenericMMCraw.cc
+--- cdrdao-1.1.7.old/dao/GenericMMCraw.cc	2002-10-06 13:53:56.000000000 -0500
++++ cdrdao-1.1.7/dao/GenericMMCraw.cc	2004-04-24 01:29:20.802653768 -0500
+@@ -493,10 +493,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 -ur cdrdao-1.1.7.old/dao/PQChannelEncoder.cc cdrdao-1.1.7/dao/PQChannelEncoder.cc
+--- cdrdao-1.1.7.old/dao/PQChannelEncoder.cc	2002-10-06 13:53:56.000000000 -0500
++++ cdrdao-1.1.7/dao/PQChannelEncoder.cc	2004-04-24 01:31:49.631028416 -0500
+@@ -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 -ur cdrdao-1.1.7.old/dao/PlextorReader.cc cdrdao-1.1.7/dao/PlextorReader.cc
+--- cdrdao-1.1.7.old/dao/PlextorReader.cc	2002-10-06 13:53:56.000000000 -0500
++++ cdrdao-1.1.7/dao/PlextorReader.cc	2004-04-24 01:29:57.563065336 -0500
+@@ -331,7 +331,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;
+@@ -563,7 +563,7 @@
+ 
+   int overspeed,cai=-1;
+ 
+-  data = new (unsigned char)[blocksPerRead * blockLength];  
++  data = new unsigned char[blocksPerRead * blockLength];  
+ 
+   fat = startTrack;
+   lat = endTrack;
+diff -ur cdrdao-1.1.7.old/dao/SonyCDU920.cc cdrdao-1.1.7/dao/SonyCDU920.cc
+--- cdrdao-1.1.7.old/dao/SonyCDU920.cc	2002-10-06 13:53:56.000000000 -0500
++++ cdrdao-1.1.7/dao/SonyCDU920.cc	2004-04-24 01:33:49.993730504 -0500
+@@ -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 -ur cdrdao-1.1.7.old/dao/TeacCdr55.cc cdrdao-1.1.7/dao/TeacCdr55.cc
+--- cdrdao-1.1.7.old/dao/TeacCdr55.cc	2002-10-06 13:53:56.000000000 -0500
++++ cdrdao-1.1.7/dao/TeacCdr55.cc	2004-04-24 01:33:18.925453600 -0500
+@@ -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 -ur cdrdao-1.1.7.old/dao/YamahaCDR10x.cc cdrdao-1.1.7/dao/YamahaCDR10x.cc
+--- cdrdao-1.1.7.old/dao/YamahaCDR10x.cc	2002-10-06 13:53:56.000000000 -0500
++++ cdrdao-1.1.7/dao/YamahaCDR10x.cc	2004-04-24 01:34:34.550956776 -0500
+@@ -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 -ur cdrdao-1.1.7.old/trackdb/CdTextItem.cc cdrdao-1.1.7/trackdb/CdTextItem.cc
+--- cdrdao-1.1.7.old/trackdb/CdTextItem.cc	2002-10-06 13:53:55.000000000 -0500
++++ cdrdao-1.1.7/trackdb/CdTextItem.cc	2004-04-24 01:16:22.430984248 -0500
+@@ -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 -ur cdrdao-1.1.7.old/trackdb/Cddb.cc cdrdao-1.1.7/trackdb/Cddb.cc
+--- cdrdao-1.1.7.old/trackdb/Cddb.cc	2002-10-06 13:53:55.000000000 -0500
++++ cdrdao-1.1.7/trackdb/Cddb.cc	2004-04-24 01:19:45.890053768 -0500
+@@ -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 -ur cdrdao-1.1.7.old/trackdb/Track.cc cdrdao-1.1.7/trackdb/Track.cc
+--- cdrdao-1.1.7.old/trackdb/Track.cc	2002-10-06 13:53:55.000000000 -0500
++++ cdrdao-1.1.7/trackdb/Track.cc	2004-04-24 01:15:33.208467208 -0500
+@@ -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];
+   }