From e4ae85c3302f7197de5709fc97d75a46ea7eb5f8 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sat, 6 Apr 2002 21:33:53 +0000 Subject: gcc3 fixes --- app-cdr/cdrdao/ChangeLog | 6 ++- app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild | 6 ++- app-cdr/cdrdao/files/cdrdao-1.1.5-c++.patch | 70 +++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 app-cdr/cdrdao/files/cdrdao-1.1.5-c++.patch (limited to 'app-cdr') diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog index 4b8d5df6d8ec..8aed727d0a54 100644 --- a/app-cdr/cdrdao/ChangeLog +++ b/app-cdr/cdrdao/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for app-cdr/cdrdao # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.1 2002/02/01 21:53:00 gbevin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.2 2002/04/06 21:33:53 gbevin Exp $ + 06 Apr 2002; G.Bevin files/cdrdao-1.1.5-c++.patch : + + C++ related fixes for gcc 3. + *cdrdao-1.1.5-r1 (1 Feb 2002) 1 Feb 2002; G.Bevin ChangeLog : diff --git a/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild index 38c4abdffc2f..cfdb76c1a686 100644 --- a/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild +++ b/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999 - 2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 # Author: Peter Kadau -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild,v 1.4 2002/02/12 01:23:18 verwilst Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild,v 1.5 2002/04/06 21:33:53 gbevin Exp $ S=${WORKDIR}/cdrdao-1.1.5 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend" @@ -20,8 +20,10 @@ src_unpack() { unpack ${A} + patch -p0 <${FILESDIR}/${P}-c++.patch || die + if [ ! "`use gnome`" ] ; then - patch -p0 <${FILESDIR}/${PF}-gentoo.diff + patch -p0 <${FILESDIR}/${P}-gentoo.diff || die fi } diff --git a/app-cdr/cdrdao/files/cdrdao-1.1.5-c++.patch b/app-cdr/cdrdao/files/cdrdao-1.1.5-c++.patch new file mode 100644 index 000000000000..9577a9562c76 --- /dev/null +++ b/app-cdr/cdrdao/files/cdrdao-1.1.5-c++.patch @@ -0,0 +1,70 @@ +--- cdrdao-1.1.5/trackdb/CdTextItem.cc.foo Fri Dec 21 11:50:23 2001 ++++ cdrdao-1.1.5/trackdb/CdTextItem.cc Fri Dec 21 12:09:16 2001 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #include "CdTextItem.h" + +@@ -128,8 +129,19 @@ + out << "\\\""; + else if (isprint(data_[i])) + out << data_[i]; +- else +- out.form("\\%03o", (unsigned int)data_[i]); ++ else { ++ char s[4]; ++ char s1[4]; ++ std::strstream ss(s, 4); ++ ss << std::oct << data_[i] << std::ends; ++ strcpy(s1, s); ++ int i=1; ++ while(strlen(s1)<3) { ++ strcpy(s1+(i++), s); ++ *s1='0'; ++ } ++ out << "\\" << s1; ++ } + } + + out << "\""; +@@ -140,7 +152,10 @@ + out << " {"; + for (i = 0; i < dataLen_; i++) { + if (i == 0) { +- out.form("%2d", (unsigned int)data_[i]); ++ if(data_[i]<10) ++ out << "0" << std::dec << data_[i]; ++ else ++ out << std::dec << data_[i]; + } + else { + if (i % 12 == 0) +@@ -148,7 +163,10 @@ + else + out << ", "; + +- out.form("%2d", (unsigned int)data_[i]); ++ if(data_[i]<10) ++ out << "0" << std::dec << (unsigned int)data_[i]; ++ else ++ out << std::dec << (unsigned int)data_[i]; + } + } + +--- cdrdao-1.1.5/utils/toc2cue.cc.foo Fri Dec 21 12:11:50 2001 ++++ cdrdao-1.1.5/utils/toc2cue.cc Fri Dec 21 12:14:21 2001 +@@ -291,7 +291,10 @@ + trun != NULL; + trun = titr.next(start, end), trackNr++) { + out << " TRACK "; +- out.form("%02d ", trackNr); ++ if(trackNr < 10) ++ out << "0" << trackNr << " "; ++ else ++ out << trackNr << " "; + + switch (trun->type()) { + case TrackData::AUDIO: -- cgit v1.2.3-65-gdbad