Add a patch for GCC 4.2 compatibility. Fixes bug #131856.

Package-Manager: portage-2.1.1_pre4

4 files changed, 34 insertions, 10 deletions

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index 89f8bf8e33dd..2a97ada26cbc 100644
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/freeglut
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.36 2006/07/11 20:03:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.37 2006/07/29 18:04:10 joshuabaergen Exp $
+
+  29 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/freeglut-gcc42.patch, freeglut-2.4.0.ebuild:
+  Add a patch for GCC 4.2 compatibility.  Fixes bug #131856.
 
   11 Jul 2006; Aron Griffis <agriffis@gentoo.org> freeglut-2.4.0.ebuild:
   Mark 2.4.0 stable on ia64
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 4fcaf4ef3dca..248ca06cf4c1 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -2,20 +2,24 @@ AUX freeglut-2.4.0-macos.patch 384 RMD160 f44ed965ac534697fa5dc4bbc17b1f464795ed
 MD5 b65ddf67b98d56c32985623701fc850a files/freeglut-2.4.0-macos.patch 384
 RMD160 f44ed965ac534697fa5dc4bbc17b1f464795edfd files/freeglut-2.4.0-macos.patch 384
 SHA256 6de982efac5a62b317e4cc73570da45c4ded0f42295b5dfeae090948d37eabf6 files/freeglut-2.4.0-macos.patch 384
+AUX freeglut-gcc42.patch 283 RMD160 d0fa7fa4828d2ab8e554ce30f72b5af4a92b9e14 SHA1 34cfdaa4f6422af3d5bca097468cb60168581f42 SHA256 e718dc2c6465654c3f87872f459b008109bbacc4c9bcf2a475880ded1b18b436
+MD5 0401dbc54ca75e0dcfe49757b2271ec4 files/freeglut-gcc42.patch 283
+RMD160 d0fa7fa4828d2ab8e554ce30f72b5af4a92b9e14 files/freeglut-gcc42.patch 283
+SHA256 e718dc2c6465654c3f87872f459b008109bbacc4c9bcf2a475880ded1b18b436 files/freeglut-gcc42.patch 283
 DIST freeglut-2.2.0.tar.gz 384055 RMD160 854de841d634074aac0df1cd62c8ca236570419a SHA1 87c762bd9653fe844f67e1944f1397061b590dc8 SHA256 2d8e7329463bcc20a8a14693f1ef3d794a7621dcae37120081b5b0e60149b3ff
 DIST freeglut-2.4.0.tar.gz 469557 RMD160 77465647f3d65fbb5cf253eb93ac7409e0c37b14 SHA1 91a528aa72758b7288a0d69a964b1b7e3f322a12 SHA256 269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052
 EBUILD freeglut-2.2.0.ebuild 770 RMD160 cd05bb8ad3148e25336969bd7d40f4a484cf73f2 SHA1 87b48dcb93f6a59ed1bcea7b20397128e786a9c8 SHA256 82903db73200a21af7f7566c1b4c805ecc1005aa8203b638bff1ea091c07331e
 MD5 94ffa4c9aa4297ec3c4051da550c78f5 freeglut-2.2.0.ebuild 770
 RMD160 cd05bb8ad3148e25336969bd7d40f4a484cf73f2 freeglut-2.2.0.ebuild 770
 SHA256 82903db73200a21af7f7566c1b4c805ecc1005aa8203b638bff1ea091c07331e freeglut-2.2.0.ebuild 770
-EBUILD freeglut-2.4.0.ebuild 923 RMD160 01bc4a835acc1a17b0c92dcde417cc42b5221a2c SHA1 a7f6ca8fe2dc5311105f7a4c79c7c39861d9802c SHA256 0f23a118f098ac010da5b73dbd597859a3ec995a1f477ebd3ca41c58e8856e7e
-MD5 87a1cb985ce228752e046b3ce701ed22 freeglut-2.4.0.ebuild 923
-RMD160 01bc4a835acc1a17b0c92dcde417cc42b5221a2c freeglut-2.4.0.ebuild 923
-SHA256 0f23a118f098ac010da5b73dbd597859a3ec995a1f477ebd3ca41c58e8856e7e freeglut-2.4.0.ebuild 923
-MISC ChangeLog 4238 RMD160 649858d9731ad99bf622e8166340e67bd2b3308b SHA1 a6bea3a4c07b1a81925d348202f1b911e21f7934 SHA256 f9f0b84f6ecff0ec1abb342185f1ce79dc986d61387af860a0230476cf80aa73
-MD5 d56a945fac206841256a9fcd5628f3b8 ChangeLog 4238
-RMD160 649858d9731ad99bf622e8166340e67bd2b3308b ChangeLog 4238
-SHA256 f9f0b84f6ecff0ec1abb342185f1ce79dc986d61387af860a0230476cf80aa73 ChangeLog 4238
+EBUILD freeglut-2.4.0.ebuild 987 RMD160 4da0a47dd4ffd58531f46317bb8861b194625b2d SHA1 d1e8c2218a24c5f390e76c23c21b59af492a8453 SHA256 cf7458095d543cdc6b11515a3f594cf6f2af2e3d5cd0c9fa6adc472e24880b22
+MD5 ae65b0721ee6e0717dbdb04891cb0338 freeglut-2.4.0.ebuild 987
+RMD160 4da0a47dd4ffd58531f46317bb8861b194625b2d freeglut-2.4.0.ebuild 987
+SHA256 cf7458095d543cdc6b11515a3f594cf6f2af2e3d5cd0c9fa6adc472e24880b22 freeglut-2.4.0.ebuild 987
+MISC ChangeLog 4416 RMD160 93f2417987d03648ab3a2840906db76a588a244d SHA1 e3fb11ad5174022bd320d386af51906280d836f2 SHA256 4a759b39372530d6c98632c662e555836fe57e31085b0df06075197b4aa437b1
+MD5 d127758fbdc099c04d22c30719514f33 ChangeLog 4416
+RMD160 93f2417987d03648ab3a2840906db76a588a244d ChangeLog 4416
+SHA256 4a759b39372530d6c98632c662e555836fe57e31085b0df06075197b4aa437b1 ChangeLog 4416
 MISC metadata.xml 425 RMD160 dd9c8c1b8a8b5a868c876969bb2645210feb1d5d SHA1 0f759bb1bfa730a503a7fa4dcc0f0824180fa0b2 SHA256 c4f9263d41b15768007178907f7a24bb71eca67f881415d5bf8ccb0f24361948
 MD5 3c716e18e124f4626bc1170328f70b07 metadata.xml 425
 RMD160 dd9c8c1b8a8b5a868c876969bb2645210feb1d5d metadata.xml 425
diff --git a/media-libs/freeglut/files/freeglut-gcc42.patch b/media-libs/freeglut/files/freeglut-gcc42.patch
new file mode 100644
index 000000000000..27404eaea847
--- /dev/null
+++ b/media-libs/freeglut/files/freeglut-gcc42.patch
@@ -0,0 +1,12 @@
+--- src/freeglut_joystick.c.old	2006-07-25 21:15:14.000000000 -0600
++++ src/freeglut_joystick.c	2006-07-25 21:21:54.000000000 -0600
+@@ -1684,9 +1684,6 @@
+ 
+   fgInitialiseJoysticks ();
+ 
+-  if ( !fgJoystick )
+-    return 0;
+-
+   if ( !fgState.JoysticksInitialised )
+     return 0;
+ 
diff --git a/media-libs/freeglut/freeglut-2.4.0.ebuild b/media-libs/freeglut/freeglut-2.4.0.ebuild
index 0a8a97f15794..314c1e51c86f 100644
--- a/media-libs/freeglut/freeglut-2.4.0.ebuild
+++ b/media-libs/freeglut/freeglut-2.4.0.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-libs/freeglut/freeglut-2.4.0.ebuild,v 1.15 2006/07/11 20:03:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.4.0.ebuild,v 1.16 2006/07/29 18:04:10 joshuabaergen Exp $
 
 inherit eutils flag-o-matic
 
@@ -20,10 +20,14 @@ DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 
 	# fixes bug #97390
 	epatch ${FILESDIR}/${P}-macos.patch
 
+	# #131856
+	epatch ${FILESDIR}/${PN}-gcc42.patch
+
 	# bug #134586
 	replace-flags -O3 -O2
 }