Gcc 4 fix wrt to bug #147793

Package-Manager: portage-2.1.2_rc1-r3

5 files changed, 78 insertions, 15 deletions

diff --git a/media-sound/smurf/ChangeLog b/media-sound/smurf/ChangeLog
index d4cdbab6d069..ad14cfc0c492 100644
--- a/media-sound/smurf/ChangeLog
+++ b/media-sound/smurf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/smurf
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/smurf/ChangeLog,v 1.10 2006/02/15 13:35:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/smurf/ChangeLog,v 1.11 2006/11/05 20:54:26 aballier Exp $
+
+  05 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/smurf-0.52.6-gcc4.patch, smurf-0.52.6.ebuild:
+  Gcc 4 patch wrt to bug #147793
 
   15 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> smurf-0.52.6.ebuild:
   Fix gettext/libintl dependencies.
diff --git a/media-sound/smurf/Manifest b/media-sound/smurf/Manifest
index 417a7d1eeeab..0d4495789235 100644
--- a/media-sound/smurf/Manifest
+++ b/media-sound/smurf/Manifest
@@ -1,22 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e7bca42c6895bf454696ecad3d79f46f ChangeLog 1083
-RMD160 6d6eaca25868111b98d9e61469d1593eb29a9a0a ChangeLog 1083
-SHA256 c5c64eb84fe52e075193bf658889424cef6efd568211dec24bcbc9a699760e54 ChangeLog 1083
-MD5 6527f6c7c5c59ff229c6b263702a136a files/digest-smurf-0.52.6 64
-RMD160 e16fb459542d2a1aba9e3562970ff4a255a2df05 files/digest-smurf-0.52.6 64
-SHA256 8754f9f31a69f1dd48c5b5dc4a65bdde08a446a0d52d9b958338d5a30fcbcd1e files/digest-smurf-0.52.6 64
+AUX smurf-0.52.6-gcc4.patch 1608 RMD160 b35bd98dbe9359ccfaf856a7aab4c126e632d5bb SHA1 891cb046635d524185e6ad6c8fb2238791238318 SHA256 48570ae9c28249840c9b82ab2e86cbc17a318f8f1b8976343350542c51423e8d
+MD5 15536910e3e6b212574ab67b3bda0aac files/smurf-0.52.6-gcc4.patch 1608
+RMD160 b35bd98dbe9359ccfaf856a7aab4c126e632d5bb files/smurf-0.52.6-gcc4.patch 1608
+SHA256 48570ae9c28249840c9b82ab2e86cbc17a318f8f1b8976343350542c51423e8d files/smurf-0.52.6-gcc4.patch 1608
+DIST smurf-0.52.6.tar.gz 481593 RMD160 277f44dba24f66aa9234fc92a3a5ef4883b333a0 SHA1 7607f6c04261c6fce0f2b16cd4824c85a842dbbd SHA256 a9f79f7f6de7537f45f817676c41061975790c0f9dfeb9772b8e45bc28f0ff3a
+EBUILD smurf-0.52.6.ebuild 1192 RMD160 097eb6a9acaf42da55b8bed375a782334d9819c1 SHA1 f7c1bafb3f975a10bdfd2478f80a5640811ff4aa SHA256 defc47901d6ceaed18eb623fb70a80aefae31fb2c9eb854e3459021a3e8541d8
+MD5 129477c2a54f29a3bd418965c76db8f2 smurf-0.52.6.ebuild 1192
+RMD160 097eb6a9acaf42da55b8bed375a782334d9819c1 smurf-0.52.6.ebuild 1192
+SHA256 defc47901d6ceaed18eb623fb70a80aefae31fb2c9eb854e3459021a3e8541d8 smurf-0.52.6.ebuild 1192
+MISC ChangeLog 1223 RMD160 1291637241408b251229fd39f960f720a42992b7 SHA1 8bc040486dde2ce55a9e263f8051901fc1223f5a SHA256 d30a80828668a0f4195b7e3a1f9b322e1c7d5f91c0e438b636067141828bdd40
+MD5 8b2a6c8d06336c0a27545a8fef526517 ChangeLog 1223
+RMD160 1291637241408b251229fd39f960f720a42992b7 ChangeLog 1223
+SHA256 d30a80828668a0f4195b7e3a1f9b322e1c7d5f91c0e438b636067141828bdd40 ChangeLog 1223
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 47a7472765620a886b3168f0a589268e smurf-0.52.6.ebuild 1139
-RMD160 25207493c02e3a0b85b6afaac725385eaf0df78c smurf-0.52.6.ebuild 1139
-SHA256 e83b367b329bdde3e55d8f80642cdd7ade24321f8efd9854818b3ff851c5d49a smurf-0.52.6.ebuild 1139
+MD5 af7ca2097e3ac729900334dbd5c9d031 files/digest-smurf-0.52.6 238
+RMD160 9d1348cfb4c087dbb47ba5d1153e8cb24ebe09bd files/digest-smurf-0.52.6 238
+SHA256 ae1b80e890488de88d59846ebb14cf3d999eaeab3a4a795a06f9e1041d1d264f files/digest-smurf-0.52.6 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFD8y5IAiZjviIA2XgRAnCjAJwInJYshhRgwGndlZU/XJy+vhGb0wCgwcd8
-/pzlRmmuZRK56Mqq0KNxik4=
-=TlF8
+iD8DBQFFTk93vFcC4BYPU0oRAr9sAJ91fOoTbZZvgjCajUxZzeWCre3EjgCfUZkC
+fBi7V5VogqtqaQxC0bXKcso=
+=X4ta
 -----END PGP SIGNATURE-----
diff --git a/media-sound/smurf/files/digest-smurf-0.52.6 b/media-sound/smurf/files/digest-smurf-0.52.6
index 72ea90e341de..6268f40bcaed 100644
--- a/media-sound/smurf/files/digest-smurf-0.52.6
+++ b/media-sound/smurf/files/digest-smurf-0.52.6
@@ -1 +1,3 @@
 MD5 5fafbd7557112f8d3d794a8101075d84 smurf-0.52.6.tar.gz 481593
+RMD160 277f44dba24f66aa9234fc92a3a5ef4883b333a0 smurf-0.52.6.tar.gz 481593
+SHA256 a9f79f7f6de7537f45f817676c41061975790c0f9dfeb9772b8e45bc28f0ff3a smurf-0.52.6.tar.gz 481593
diff --git a/media-sound/smurf/files/smurf-0.52.6-gcc4.patch b/media-sound/smurf/files/smurf-0.52.6-gcc4.patch
new file mode 100644
index 000000000000..820a7efe016a
--- /dev/null
+++ b/media-sound/smurf/files/smurf-0.52.6-gcc4.patch
@@ -0,0 +1,46 @@
+--- smurf-0.52.6/src/sfload.c.old	2006-11-05 21:42:20.000000000 +0100
++++ smurf-0.52.6/src/sfload.c	2006-11-05 21:42:36.000000000 +0100
+@@ -705,7 +705,7 @@
+ 		{		/* inst is last gen */
+ 		  level = 3;
+ 		  READW (genval.uword, fd);
+-		  GPOINTER_TO_INT (((SFZone *) (p2->data))->instsamp) =
++		  (((SFZone *) (p2->data))->instsamp) =
+ 		    genval.uword + 1;
+ 		  break;	/* break out of generator loop */
+ 		}
+@@ -1055,7 +1055,7 @@
+ 		{		/* sample is last gen */
+ 		  level = 3;
+ 		  READW (genval.uword, fd);
+-		  GPOINTER_TO_INT (((SFZone *) (p2->data))->instsamp) =
++		  (((SFZone *) (p2->data))->instsamp) =
+ 		    genval.uword + 1;
+ 		  break;	/* break out of generator loop */
+ 		}
+--- smurf-0.52.6/src/sfsave.c.old	2006-11-05 21:43:15.000000000 +0100
++++ smurf-0.52.6/src/sfsave.c	2006-11-05 21:44:51.000000000 +0100
+@@ -620,9 +620,9 @@
+ 	  z = (SFZone *) (p2->data);
+ 	  if (z->instsamp)
+ 	    {
+-	      (guint16) dummy = Gen_Instrument;
++	      dummy = Gen_Instrument;
+ 	      WRITEW ((guint16) dummy, fd);
+-	      (guint16) dummy = g_slist_position (sf->inst, z->instsamp);
++	      dummy = g_slist_position (sf->inst, z->instsamp);
+ 	      WRITEW ((guint16) dummy, fd);
+ 	      *size += SFGENSIZE;
+ 	    }
+@@ -780,9 +780,9 @@
+ 	  z = (SFZone *) (p2->data);
+ 	  if (z->instsamp)
+ 	    {
+-	      (guint16) dummy = Gen_SampleId;
++	      dummy = Gen_SampleId;
+ 	      WRITEW ((guint16) dummy, fd);
+-	      (guint16) dummy = g_slist_position (sf->sample, z->instsamp);
++	      dummy = g_slist_position (sf->sample, z->instsamp);
+ 	      WRITEW ((guint16) dummy, fd);
+ 	      *size += SFGENSIZE;
+ 	    }
diff --git a/media-sound/smurf/smurf-0.52.6.ebuild b/media-sound/smurf/smurf-0.52.6.ebuild
index 26d4802e487a..8dc9a29e71af 100644
--- a/media-sound/smurf/smurf-0.52.6.ebuild
+++ b/media-sound/smurf/smurf-0.52.6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/smurf/smurf-0.52.6.ebuild,v 1.10 2006/02/15 13:35:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/smurf/smurf-0.52.6.ebuild,v 1.11 2006/11/05 20:54:26 aballier Exp $
+
+inherit eutils
 
 DESCRIPTION="The Smurf Sound Font Editor"
 HOMEPAGE="http://smurf.sourceforge.net/"
@@ -21,6 +23,7 @@ DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.11.5-r1 )"
 
 src_compile() {
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 	local myconf="--with-audiofile"
 	use nls || myconf="${myconf} --disable-nls"
 	use debug || myconf="${myconf} --disable-debug"