Add patch for GCC 4.3, bug #213191.

(Portage version: 2.2_pre5)

3 files changed, 72 insertions, 3 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 1e9ea263d049..569df1e22e6e 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.106 2008/03/15 09:45:48 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.107 2008/04/20 23:54:20 dirtyepic Exp $
+
+  20 Apr 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/cdrdao-1.2.2-gcc43.patch, cdrdao-1.2.2-r1.ebuild:
+  Add patch for GCC 4.3, bug #213191.
 
 *cdrdao-1.2.2-r1 (15 Mar 2008)
 
diff --git a/app-cdr/cdrdao/cdrdao-1.2.2-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.2.2-r1.ebuild
index 9b3ba8cc417c..c71e5907b911 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.2-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.2-r1.ebuild,v 1.1 2008/03/15 09:45:48 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.2-r1.ebuild,v 1.2 2008/04/20 23:54:20 dirtyepic Exp $
 
-inherit flag-o-matic eutils
+inherit eutils flag-o-matic eutils
 
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
@@ -38,6 +38,9 @@ src_unpack() {
 	# Upstream bug #1596097
 	epatch "${FILESDIR}/${P}"-nonlinux.patch
 
+	# GCC 4.3 patch.  Should be fixed in next version.
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+
 	# Display better SCSI messages (advise from Bug 43003)
 	cd scsilib/include
 	sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' xmconfig.h
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-gcc43.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-gcc43.patch
new file mode 100644
index 000000000000..9f626ae58385
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.2-gcc43.patch
@@ -0,0 +1,62 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 09-gcc-3.4.dpatch by Matthias Klose <doko@debian.org>
+##
+## DP: Fix build failures with g++-4.3 (Closes: #455309).
+
+@DPATCH@
+
+diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatConverter.cc cdrdao-1.2.2/trackdb/FormatConverter.cc
+--- cdrdao-1.2.2.orig/trackdb/FormatConverter.cc	2005-05-10 00:55:28.000000000 +0000
++++ cdrdao-1.2.2/trackdb/FormatConverter.cc	2008-03-07 11:14:07.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <ao/ao.h>
+ #endif
+ #include <fstream>
++#include <cstring>
+ 
+ #include "config.h"
+ #include "util.h"
+diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatOgg.cc cdrdao-1.2.2/trackdb/FormatOgg.cc
+--- cdrdao-1.2.2.orig/trackdb/FormatOgg.cc	2005-04-22 02:01:46.000000000 +0000
++++ cdrdao-1.2.2/trackdb/FormatOgg.cc	2008-03-07 11:14:07.000000000 +0000
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <cstring>
+ 
+ #include "util.h"
+ #include "FormatOgg.h"
+diff -Naurp cdrdao-1.2.2.orig/trackdb/TempFileManager.cc cdrdao-1.2.2/trackdb/TempFileManager.cc
+--- cdrdao-1.2.2.orig/trackdb/TempFileManager.cc	2005-04-22 02:01:46.000000000 +0000
++++ cdrdao-1.2.2/trackdb/TempFileManager.cc	2008-03-07 11:14:07.000000000 +0000
+@@ -24,6 +24,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <cstring>
+ 
+ #define DEFAULT_TEMP_PATH "/tmp/"
+ 
+diff -Naurp cdrdao-1.2.2.orig/xdao/AudioCDProject.cc cdrdao-1.2.2/xdao/AudioCDProject.cc
+--- cdrdao-1.2.2.orig/xdao/AudioCDProject.cc	2006-09-18 10:42:26.000000000 +0000
++++ cdrdao-1.2.2/xdao/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>
+ 
+diff -Naurp cdrdao-1.2.2.orig/xdao/TextEdit.cc cdrdao-1.2.2/xdao/TextEdit.cc
+--- cdrdao-1.2.2.orig/xdao/TextEdit.cc	2004-02-12 01:13:32.000000000 +0000
++++ cdrdao-1.2.2/xdao/TextEdit.cc	2008-03-07 11:14:07.000000000 +0000
+@@ -21,6 +21,7 @@
+ 
+ #include <stddef.h>
+ #include <ctype.h>
++#include <cstring>
+ 
+ TextEdit::TextEdit(const char *sample) : Gtk::Entry()
+ {