From 7bffd13c81ac2983f658029e27e4eb76f1519207 Mon Sep 17 00:00:00 2001
From: Jon Hood <squinky86@gentoo.org>
Date: Fri, 22 Oct 2004 11:40:23 +0000
Subject: gcc-3.4 fixin'

---
 media-sound/mhwaveedit/ChangeLog               |  6 +++++-
 media-sound/mhwaveedit/Manifest                | 15 +++++++++++++--
 media-sound/mhwaveedit/files/1.2.3-gcc34.patch | 11 +++++++++++
 media-sound/mhwaveedit/mhwaveedit-1.2.3.ebuild | 10 +++++++++-
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 media-sound/mhwaveedit/files/1.2.3-gcc34.patch

(limited to 'media-sound')

diff --git a/media-sound/mhwaveedit/ChangeLog b/media-sound/mhwaveedit/ChangeLog
index 73dd18e885a2..8a88f8a1d0e2 100644
--- a/media-sound/mhwaveedit/ChangeLog
+++ b/media-sound/mhwaveedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mhwaveedit
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/ChangeLog,v 1.4 2004/06/25 00:10:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/ChangeLog,v 1.5 2004/10/22 11:40:23 squinky86 Exp $
+
+  22 Oct 2004; Jon Hood <squinky86@gentoo.org> +files/1.2.3-gcc34.patch,
+  mhwaveedit-1.2.3.ebuild:
+  Added gcc-3.4 fix, #68158.
 
   03 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
   mhwaveedit-1.2.1.ebuild, mhwaveedit-1.2.3.ebuild:
diff --git a/media-sound/mhwaveedit/Manifest b/media-sound/mhwaveedit/Manifest
index b1260ce7c82c..87091107df0d 100644
--- a/media-sound/mhwaveedit/Manifest
+++ b/media-sound/mhwaveedit/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 cf1e25204a879d418f12dea5a1220141 mhwaveedit-1.2.1.ebuild 831
-MD5 33b6129569c936e1e88022a5707efd60 mhwaveedit-1.2.3.ebuild 831
-MD5 c3425ea3df8e938e688975fdc7c63a94 ChangeLog 739
+MD5 be4dbb4955caaeac2fd6cde1d3dbef3b mhwaveedit-1.2.3.ebuild 926
+MD5 69a468c4bec73fb5a44aec168af8fd43 ChangeLog 870
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 e242909f446a42fd2a8a9c08b6caa23e files/1.2.3-gcc34.patch 457
 MD5 807f0008db82800a528b2e7aec8cdc4c files/digest-mhwaveedit-1.2.1 68
 MD5 0c32a0602b16df244ca205efe956a4ed files/digest-mhwaveedit-1.2.3 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBePGycAgAdbxYsnERAjvkAJ4vtr6I8umRiAioINiG1cF914GxIwCgpsRx
+vEFdqk2Jmj5GM1/Qya00pEM=
+=b/iL
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mhwaveedit/files/1.2.3-gcc34.patch b/media-sound/mhwaveedit/files/1.2.3-gcc34.patch
new file mode 100644
index 000000000000..2bb9ddf3a033
--- /dev/null
+++ b/media-sound/mhwaveedit/files/1.2.3-gcc34.patch
@@ -0,0 +1,11 @@
+diff -Naur mhwaveedit-1.2.3.vanilla/src/filetypes.c mhwaveedit-1.2.3/src/filetypes.c
+--- mhwaveedit-1.2.3.vanilla/src/filetypes.c	2003-05-27 13:36:05.000000000 -0500
++++ mhwaveedit-1.2.3/src/filetypes.c	2004-10-21 21:33:10.755276896 -0500
+@@ -613,6 +613,7 @@
+ 	     info->samplerate,info->channels); */
+ 	  if (sf_format_check(info)) return FALSE;
+      outer:
++     {}
+      }
+      /* Try the left out suggestions finally... */
+      i = fmt->samplesize;
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.2.3.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.2.3.ebuild
index b2334dc0064a..79b63ce75600 100644
--- a/media-sound/mhwaveedit/mhwaveedit-1.2.3.ebuild
+++ b/media-sound/mhwaveedit/mhwaveedit-1.2.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/mhwaveedit-1.2.3.ebuild,v 1.4 2004/06/25 00:10:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/mhwaveedit-1.2.3.ebuild,v 1.5 2004/10/22 11:40:23 squinky86 Exp $
+
+inherit eutils
 
 IUSE="gtk2 oss sdl"
 
@@ -18,6 +20,12 @@ DEPEND="gtk2? ( >=x11-libs/gtk+-2.0.0 )
 	>=media-libs/libsndfile-1.0.1
 	>=media-libs/portaudio-18"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc34.patch
+}
+
 src_compile() {
 	econf `use_enable gtk2` `use_with oss` `use_with sdl` || die
 	emake || die
-- 
cgit v1.2.3-65-gdbad