Add patch to fix compilation with gcc-4 by Samuli Suominen <sasuomin AT uusikaupunki DOT fi>; bug #125619

(Portage version: 2.1_pre5-r4)

4 files changed, 47 insertions, 5 deletions

diff --git a/app-emulation/fuse/ChangeLog b/app-emulation/fuse/ChangeLog
index fadde886da1e..2ee2acd7f945 100644
--- a/app-emulation/fuse/ChangeLog
+++ b/app-emulation/fuse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/fuse
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/ChangeLog,v 1.16 2005/10/02 16:48:50 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/ChangeLog,v 1.17 2006/03/10 06:02:40 halcy0n Exp $
+
+  10 Mar 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/fuse-0.7.0-gcc4.patch, fuse-0.7.0.ebuild:
+  Add patch to fix compilation with gcc-4 by Samuli Suominen <sasuomin AT
+  uusikaupunki DOT fi>; bug #125619
 
   02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> fuse-0.7.0.ebuild:
   Stable on ppc.
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index c8e498699b00..320232fab289 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,6 +1,21 @@
 MD5 ea528d4f05103f769e2270b2dcd0282d ChangeLog 2098
+RMD160 7ffc71999c96204d90b3709c95a6859261d24657 ChangeLog 2098
+SHA256 fae7ef50e5b122d2308e76e27777ade469e5fc7bad479e8c37119c3e586611fd ChangeLog 2098
 MD5 5f2dadd0c93925bbe9f614df56f9bf1e files/digest-fuse-0.6.2.1 64
+RMD160 7ecf4fa7545b7070d31edbd8ffa91ca4607f777e files/digest-fuse-0.6.2.1 64
+SHA256 0751a9a8d46ed7be69d5ad80279c6bfced7e00d1a6d771087525f4d79033a687 files/digest-fuse-0.6.2.1 64
 MD5 630351171dc1040370d0d75ae0e6617d files/digest-fuse-0.7.0 62
+RMD160 2461319dfaed53ba689afe7b740427128a053fea files/digest-fuse-0.7.0 62
+SHA256 19da228e006b6104ab8da7c0d15c8b942cdf4271c3cc1dd247ea17ad5f433dd3 files/digest-fuse-0.7.0 62
+MD5 35c61d2acc6135850881b6a8487cb2fc files/fuse-0.7.0-gcc4.patch 725
+RMD160 5d89b4e67c19a7d4c087f6e13f71ce2f87957bb2 files/fuse-0.7.0-gcc4.patch 725
+SHA256 b891245b9c66d3be267a18e704bcbadc1bbead821c541744a4301c00c2815e99 files/fuse-0.7.0-gcc4.patch 725
 MD5 d3875981a76876cb483a8053da9b8772 fuse-0.6.2.1.ebuild 1621
-MD5 31a11377116e8b5a62c31bd94ff4b4f5 fuse-0.7.0.ebuild 1635
+RMD160 6099207f244c8d761be130bc512f40ecc331bb8e fuse-0.6.2.1.ebuild 1621
+SHA256 fc4793cefd0d3a58547ff82cff5d60db6445518887abceef186e4a8acb72d3e1 fuse-0.6.2.1.ebuild 1621
+MD5 7f19fb7d64bc4dee6a2c271ef9ff9fbf fuse-0.7.0.ebuild 1721
+RMD160 bcddd1868cae81fda5101e74ae6f8e49fdf37f64 fuse-0.7.0.ebuild 1721
+SHA256 9edd2764052ddaa77c9b18cf40790e31ff406aaedd4748517dbdf1e8c5e27e6a fuse-0.7.0.ebuild 1721
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+RMD160 5b59fc85d3bafae0872cf691e5f032bac39ba539 metadata.xml 310
+SHA256 39e1273dd60bd3ceb460e9366a648c8fa21db1c292df4573e69f41cf6c84f6fc metadata.xml 310
diff --git a/app-emulation/fuse/files/fuse-0.7.0-gcc4.patch b/app-emulation/fuse/files/fuse-0.7.0-gcc4.patch
new file mode 100644
index 000000000000..e29706fe351f
--- /dev/null
+++ b/app-emulation/fuse/files/fuse-0.7.0-gcc4.patch
@@ -0,0 +1,14 @@
+diff -ur fuse-0.7.0.orig/sound.c fuse-0.7.0/sound.c
+--- fuse-0.7.0.orig/sound.c	2004-07-04 21:52:15.000000000 +0300
++++ fuse-0.7.0/sound.c	2006-03-09 19:26:17.000000000 +0200
+@@ -58,8 +58,8 @@
+ int sound_stereo_ay_abc=0;	/* (AY stereo) true for ABC stereo, else ACB */
+ int sound_stereo_ay_narrow=0;	/* (AY stereo) true for narrow AY st. sep. */
+ 
+-static int sound_stereo_ay=0;	/* local copy of settings_current.stereo_ay */
+-static int sound_stereo_beeper=0;   /* and settings_current.stereo_beeper */
++int sound_stereo_ay=0;	/* local copy of settings_current.stereo_ay */
++int sound_stereo_beeper=0;   /* and settings_current.stereo_beeper */
+ 
+ 
+ /* assume all three tone channels together match the beeper volume (ish).
diff --git a/app-emulation/fuse/fuse-0.7.0.ebuild b/app-emulation/fuse/fuse-0.7.0.ebuild
index 1bd12b113361..242043ec529c 100644
--- a/app-emulation/fuse/fuse-0.7.0.ebuild
+++ b/app-emulation/fuse/fuse-0.7.0.ebuild
@@ -1,6 +1,8 @@
-# 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/app-emulation/fuse/fuse-0.7.0.ebuild,v 1.4 2005/10/02 16:48:50 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/fuse-0.7.0.ebuild,v 1.5 2006/03/10 06:02:40 halcy0n Exp $
+
+inherit eutils
 
 DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
 HOMEPAGE="http://fuse-emulator.sourceforge.net/"
@@ -37,6 +39,12 @@ DEPEND="dev-lang/perl
 	libdsk? ( >=app-emulation/libdsk-1.1.5
 		app-emulation/lib765 )"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+}
+
 src_compile() {
 	local guiflag
 	if use X ; then