Add patch for GCC 4.3, bug #213191.

Package-Manager: portage-2.2_pre5

4 files changed, 85 insertions, 5 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/Manifest b/app-cdr/cdrdao/Manifest
index 93368b6e4df2..ca3bb6a8ad72 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cdrdao-1.2.0-gcc4.patch 869 RMD160 4b8baf7677640ff035705eef04bc0df27e0c07eb SHA1 d70d532a6e958744f5b98efc8ba156e895c75f55 SHA256 2b87b7c9b971d2a253caa76ae89b061c35394aacd004e5c0199c1a16fd821215
 AUX cdrdao-1.2.1-gcc41.patch 421 RMD160 374d62319984001921f03d89ab22c736f874190e SHA1 702ba18a2d62c4166af051364ef46a933d3dec7d SHA256 bb546f4a8060a188afb346af0f34894d03afc29d4874f3b561a17211ffd4dbd5
+AUX cdrdao-1.2.2-gcc43.patch 2040 RMD160 1adaa7803d280051f079fbe3556076aa4d1f7333 SHA1 9026dc7196c205a20dc9afeee88c2b5e5102a56f SHA256 365af59c6d7736f243b283a58f05411fe96d035aa1af3e62812e98b044c6648d
 AUX cdrdao-1.2.2-nonlinux.patch 380 RMD160 d58247e7faeb12b3bf416845f41aa9a77aa6d1ef SHA1 955a6e56e3264e773241d89ac0fd603ba5bcff31 SHA256 e15d0d3302272e958d8d5df705cd4146653aff2a55b5b582f04e70814cab7cd3
 AUX cdrdao-1.2.2-use-new-sigc++-API.patch 481 RMD160 48f39ef4b6f9db81a00b6fbbe6b44c0f0cd49a5b SHA1 092bd7a492026d5dd47e9c2ff9e2b2acf3f8a3bc SHA256 3d0159dfa815c92f82d16407977fe875f005224d28ccc00238a73df2474bba63
 AUX gcdmaster.desktop 127 RMD160 565c477fb1e8b937b97ce4767c2343741e22a425 SHA1 9d8b154482860ca49686e47f850c64b0628633b2 SHA256 2cd560f369ae9b40e4c63c099c851290809493df8d8be50deec592dcecb5005d
@@ -7,7 +11,14 @@ DIST cdrdao-1.2.1.tar.gz 1728003 RMD160 4f6cabd016af69746db6d31d58ec0a7f49c38fde
 DIST cdrdao-1.2.2.tar.bz2 1408344 RMD160 c537c535a4106655f89f7cfa5895ffcb5b9464e2 SHA1 2699e56e00342c1fa2a3815ed02418fe964b276b SHA256 de180041e57f8e1c88c9b6f9b6c51b0abf0dc2744c4fa37a0248d48f40e58038
 EBUILD cdrdao-1.2.1-r1.ebuild 1673 RMD160 d7c17430f7230b2f5e12af913c82ad9d1a48a38c SHA1 0b48cac9d5907cec6f179cd82b953d4ffed718dc SHA256 d3452eb637cfcbb938819589ab5480e509d83877c7d14accc14e451b986107d6
 EBUILD cdrdao-1.2.1.ebuild 1551 RMD160 267398a684c3acfd13a90ee5a676c3d6fcc060a2 SHA1 836385c495296769e1475eff142aa2240e53cce2 SHA256 8c908639ea692c83fad34671ee7d13355561290a86c4b09f0bde33a041423ef3
-EBUILD cdrdao-1.2.2-r1.ebuild 1858 RMD160 5afa009321986af248541f7ce11886335196c7f2 SHA1 26c99fbcb5a6e5b7a48132992209a4a49618e30e SHA256 e3dddbde989333b00612cf40e65b6ed62b1935ae8ad6e983586b6988751f2791
+EBUILD cdrdao-1.2.2-r1.ebuild 1962 RMD160 223e5c82393b78ddcc1a5b9671ac80f099c5bd04 SHA1 026bfc4be97592abb3772b55f95e82324172ec2f SHA256 0cd9ddae5db6caa7af2eea6664b052fc51c7c33ab12d8a9c6c5b44568e21e341
 EBUILD cdrdao-1.2.2.ebuild 1768 RMD160 c09f8368a94aad488b1a99d27b01618f720e0c9d SHA1 1781d9936192c1f6a15e8cda2e9c9e387e2c5978 SHA256 a2c5d0972a78a72746f84010b8035ad1317c82c3a674e3af5011e9114126bb86
-MISC ChangeLog 14382 RMD160 13cbc919d55ab567cb47be3ae24ecbba0d75eef4 SHA1 0a87cd4fc3fc60b19d5d3a68b20e43921f136ba3 SHA256 11475bc8ff97bced684561a4ca7c836b78f2b9babae9e087dd44c706fddbc0c7
+MISC ChangeLog 14533 RMD160 941a1a6f315e71314e28614e7bed5e85563080a1 SHA1 02ec5445f52812dd76b6c4423d22115f43263eef SHA256 fd140391b4716bb61f215e5d0dd2449aa8870f5aea6b670c2e7ec6c06038501e
 MISC metadata.xml 319 RMD160 54559b717de30245b4e3369d398d0d4b8786cb94 SHA1 37ad6871b8179ee4180b374c9a4693253aa0bdc0 SHA256 449cdb691234e9d248959657370e866690fa998b7652124e8af2065447b042ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgL15QACgkQiqiDRvmkBmJXDQCfe153pdBMAqcmlqevxFhR6BZb
+5gsAoJw7Fh0cWULPU9I9hDjNRK4ES1FM
+=qT6n
+-----END PGP SIGNATURE-----
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()
+ {