Gcc 4 compile fix

(Portage version: 2.1.2_rc1-r3)

6 files changed, 26 insertions, 4 deletions

diff --git a/media-sound/mpfc/ChangeLog b/media-sound/mpfc/ChangeLog
index a1d830ef02f6..38b21b6e3ead 100644
--- a/media-sound/mpfc/ChangeLog
+++ b/media-sound/mpfc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpfc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/ChangeLog,v 1.11 2006/03/04 07:15:04 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/ChangeLog,v 1.12 2006/11/05 20:37:11 aballier Exp $
+
+  05 Nov 2006; Alexis Ballier <aballier@gentoo.org> +files/mpfc-gcc4.patch,
+  mpfc-1.3.7.ebuild:
+  Gcc 4 compile fix
 
 *mpfc-1.3.7 (04 Mar 2006)
 
diff --git a/media-sound/mpfc/files/digest-mpfc-1.3.5 b/media-sound/mpfc/files/digest-mpfc-1.3.5
index 7b4e56f763a7..7c1f3e17c189 100644
--- a/media-sound/mpfc/files/digest-mpfc-1.3.5
+++ b/media-sound/mpfc/files/digest-mpfc-1.3.5
@@ -1 +1,3 @@
 MD5 34a67089e2af8f2323a70beeaa20fc76 mpfc-1.3.5.tar.gz 698826
+RMD160 7d0227b2bfc2222eb67799657d9d12260f9561cb mpfc-1.3.5.tar.gz 698826
+SHA256 f97ed06e7ad16392f3ca83e72f2a1efb036beacfa90b0b4779b1d67e8fb774b6 mpfc-1.3.5.tar.gz 698826
diff --git a/media-sound/mpfc/files/digest-mpfc-1.3.7 b/media-sound/mpfc/files/digest-mpfc-1.3.7
index cace61c3d487..dd6e86231524 100644
--- a/media-sound/mpfc/files/digest-mpfc-1.3.7
+++ b/media-sound/mpfc/files/digest-mpfc-1.3.7
@@ -1 +1,3 @@
 MD5 6d0bddc0ff00938e275b3783f8dd3716 mpfc-1.3.7.tar.gz 869364
+RMD160 30ea18d7903dc98cb76a0fb462d94574d185d0a7 mpfc-1.3.7.tar.gz 869364
+SHA256 256ec3a9ebe3296e614b937d3e9044ba11d27c863f723fc939beb82daf54ec8d mpfc-1.3.7.tar.gz 869364
diff --git a/media-sound/mpfc/files/mpfc-gcc4.patch b/media-sound/mpfc/files/mpfc-gcc4.patch
new file mode 100644
index 000000000000..5cb1efb6834b
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-gcc4.patch
@@ -0,0 +1,13 @@
+--- mpfc-1.3.7/plugins/input/audiocd/audiocd.c.old	2006-11-05 21:13:25.000000000 +0100
++++ mpfc-1.3.7/plugins/input/audiocd/audiocd.c	2006-11-05 21:13:35.000000000 +0100
+@@ -60,8 +60,8 @@
+ /* Tracks information array */
+ struct acd_trk_info_t acd_tracks_info[ACD_MAX_TRACKS];
+ int acd_num_tracks = 0;
+-static int acd_cur_track = -1;
+-static bool_t acd_info_read = FALSE;
++int acd_cur_track = -1;
++bool_t acd_info_read = FALSE;
+ 
+ /* Current time */
+ static int acd_time = 0;
diff --git a/media-sound/mpfc/mpfc-1.3.5.ebuild b/media-sound/mpfc/mpfc-1.3.5.ebuild
index 39ae5df42912..67576f8a0b82 100644
--- a/media-sound/mpfc/mpfc-1.3.5.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.5.ebuild,v 1.4 2005/08/07 13:37:28 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.5.ebuild,v 1.5 2006/11/05 20:37:11 aballier Exp $
 
 inherit eutils
 
diff --git a/media-sound/mpfc/mpfc-1.3.7.ebuild b/media-sound/mpfc/mpfc-1.3.7.ebuild
index 3f648000316f..6e9618f8d381 100644
--- a/media-sound/mpfc/mpfc-1.3.7.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.7.ebuild,v 1.1 2006/03/04 07:15:04 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.7.ebuild,v 1.2 2006/11/05 20:37:11 aballier Exp $
 
 inherit eutils multilib
 
@@ -27,6 +27,7 @@ src_unpack() {
 		xargs grep ^libdir |
 		cut -f1 -d: |
 		xargs sed -i "s:^\(libdir.*\)/lib/\(.*\)$:\1/$(get_libdir)/\2:" || die
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
 }
 
 src_compile() {