Patch for gcc-4.2

Package-Manager: portage-2.1.2.9

4 files changed, 41 insertions, 16 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index eb7407e74c74..3e2a5ca4fc75 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/clanlib
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.37 2006/09/23 12:19:54 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.38 2007/06/12 23:38:03 nyhm Exp $
+
+  12 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/clanlib-0.8.0-gcc42.patch, clanlib-0.8.0.ebuild:
+  Patch for gcc-4.2
 
 *clanlib-0.8.0 (23 Sep 2006)
 
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index d7f1abd42565..f2990982525e 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -45,6 +45,10 @@ AUX clanlib-0.7.8-refreshfix.patch 435 RMD160 e4562f30dea51c6b1f01014611f3a7ebf0
 MD5 0056626610eb4285f75e571aae2c6662 files/clanlib-0.7.8-refreshfix.patch 435
 RMD160 e4562f30dea51c6b1f01014611f3a7ebf0976ca5 files/clanlib-0.7.8-refreshfix.patch 435
 SHA256 1cb0bab20ef41f364d5bb4395a78213f4ad8fa187bc49cc5f85e80544f557ffa files/clanlib-0.7.8-refreshfix.patch 435
+AUX clanlib-0.8.0-gcc42.patch 744 RMD160 e902db2b7692afc386da0eacf3b8e37fe55aa780 SHA1 0ef10d301fa2974c11abf14e707a624529bea823 SHA256 1fd27babc3ca53e274a191bf30013be3290cdf222bef00aa543763b5376ec35a
+MD5 499765ae37f897a041ef814542f6b354 files/clanlib-0.8.0-gcc42.patch 744
+RMD160 e902db2b7692afc386da0eacf3b8e37fe55aa780 files/clanlib-0.8.0-gcc42.patch 744
+SHA256 1fd27babc3ca53e274a191bf30013be3290cdf222bef00aa543763b5376ec35a files/clanlib-0.8.0-gcc42.patch 744
 DIST ClanLib-0.6.5-1.tar.gz 2183097 RMD160 31f060f438925c9ec7dd2a9466ed6bb367549b3b SHA1 d3a8558c1f8b652742636e4712b5b9911f74e4d8 SHA256 62e16913423945475f3541fc97deaeb9b0f735b6c93c88725a6a771d5a882db5
 DIST ClanLib-0.7.8-1.tar.bz2 6567261 RMD160 b22dbb97010e7b514cbbe3da85a52a1aafe2c686 SHA1 1416b09d8aa3549b1adeef50ba00df59b20917e6 SHA256 742b027b75160d0f17b913f7b3089c901717081d12d3ed1d1c38c108939793b8
 DIST ClanLib-0.8.0.tgz 7527581 RMD160 b78a86b853c12295fcf7d755c59183965bd563ac SHA1 e8b30bbb16d07d1cfd90525d60d9d2d8f3e74282 SHA256 def9bdbb20ea740e005134a77def721e969e230740e67937cc3ac201033059e6
@@ -56,14 +60,14 @@ EBUILD clanlib-0.7.8-r2.ebuild 2369 RMD160 367e0228f1d72ab25fa68dd9a51d5769d1390
 MD5 ee9ea6af33bd9154656e1ee012234b5b clanlib-0.7.8-r2.ebuild 2369
 RMD160 367e0228f1d72ab25fa68dd9a51d5769d1390281 clanlib-0.7.8-r2.ebuild 2369
 SHA256 752a81a5fbffe92dc98c3d1f593e24f4a56819bc088d5fdf82f648f4ec190c9d clanlib-0.7.8-r2.ebuild 2369
-EBUILD clanlib-0.8.0.ebuild 1934 RMD160 0e098bce14d04a7de8b2e4200c269232e8a93703 SHA1 86d285d19752fb52b418638cbb009832abf591ee SHA256 876c9ddafd04dc3907e7fb75966eaf7500b4bd7f8d2009f5fe8a806165a76f23
-MD5 be09daa0daf23636c0aff62959e5b16d clanlib-0.8.0.ebuild 1934
-RMD160 0e098bce14d04a7de8b2e4200c269232e8a93703 clanlib-0.8.0.ebuild 1934
-SHA256 876c9ddafd04dc3907e7fb75966eaf7500b4bd7f8d2009f5fe8a806165a76f23 clanlib-0.8.0.ebuild 1934
-MISC ChangeLog 8024 RMD160 7b9477171de5a4dfe39c5a27a7cff98bf24556ea SHA1 b7562cbf5c3d0e638a1ac395734c155a9947d646 SHA256 0f5fb462dd87481463e0f203c0941235d50b4701d3fa92667813d784108a04c3
-MD5 5815e24b3e8485e9c71a33ff26f2275d ChangeLog 8024
-RMD160 7b9477171de5a4dfe39c5a27a7cff98bf24556ea ChangeLog 8024
-SHA256 0f5fb462dd87481463e0f203c0941235d50b4701d3fa92667813d784108a04c3 ChangeLog 8024
+EBUILD clanlib-0.8.0.ebuild 2013 RMD160 fa22146058f257c94e73ec113c7f0b340405f3ab SHA1 aba6000044b00d946fef8e92a2589857a94fbf62 SHA256 f6b1babb2566662b87331b756e7b4c32ac65fb04d3451a616319876be7b6cabb
+MD5 0b24f617511e6ffc5fa4f9ef92b46e10 clanlib-0.8.0.ebuild 2013
+RMD160 fa22146058f257c94e73ec113c7f0b340405f3ab clanlib-0.8.0.ebuild 2013
+SHA256 f6b1babb2566662b87331b756e7b4c32ac65fb04d3451a616319876be7b6cabb clanlib-0.8.0.ebuild 2013
+MISC ChangeLog 8149 RMD160 0228c6015f21ed616d747d9108cc37f56805b714 SHA1 5f9300ee1085238efd150a3825de0dc7e999f6bb SHA256 639bdecc045b92010385fedabbfd4bb8d6a2e2d5de37eec2bd6e914b9e3b6916
+MD5 4cb8b651030e6e2e097a90ec948eda22 ChangeLog 8149
+RMD160 0228c6015f21ed616d747d9108cc37f56805b714 ChangeLog 8149
+SHA256 639bdecc045b92010385fedabbfd4bb8d6a2e2d5de37eec2bd6e914b9e3b6916 ChangeLog 8149
 MISC metadata.xml 2920 RMD160 725718878c95be29849b2c3c4f47be9e21e4ea41 SHA1 7b05a6cdc831e23c0679217a14e739acdea504b9 SHA256 390505368337501a27b0d5eb795582bd656627c828d4bb982375fecdfbea8dec
 MD5 96409b7c5de1f5e26ce0e18530f490ad metadata.xml 2920
 RMD160 725718878c95be29849b2c3c4f47be9e21e4ea41 metadata.xml 2920
@@ -78,9 +82,9 @@ MD5 0d2c8255e6001b08ca2161fbed8d018d files/digest-clanlib-0.8.0 235
 RMD160 ad332b34e7918ebf079498f27262125c1ff90c25 files/digest-clanlib-0.8.0 235
 SHA256 b6a387247617a6053ff9678569c1c64ac1caf46791a035010dc40e201bc42658 files/digest-clanlib-0.8.0 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFRCZ5amhnQswr0vIRAqikAJ4lNNAybZjaMdta7JdsC18RCFOLEACfSpsC
-AlToA8BUr79Sx+0kfgyLSVA=
-=6tAU
+iD8DBQFGby5hdz7hIScOURERAuxKAKCgOit1qGQ/0cxRQkqGzRgJkkSADACg2SZG
+Xq2mxF07dxs8zEs2BxDcKXc=
+=lJLK
 -----END PGP SIGNATURE-----
diff --git a/dev-games/clanlib/clanlib-0.8.0.ebuild b/dev-games/clanlib/clanlib-0.8.0.ebuild
index 9c2ffdca4171..9f3f73cde9d2 100644
--- a/dev-games/clanlib/clanlib-0.8.0.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.8.0.ebuild,v 1.1 2006/09/23 12:19:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.8.0.ebuild,v 1.2 2007/06/12 23:38:03 nyhm Exp $
 
 inherit flag-o-matic eutils
 
@@ -33,6 +33,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/ClanLib-${PV}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc42.patch
+}
+
 src_compile() {
 	#clanSound only controls mikmod/vorbis so there's
 	# no need to pass --{en,dis}able-clanSound ...
diff --git a/dev-games/clanlib/files/clanlib-0.8.0-gcc42.patch b/dev-games/clanlib/files/clanlib-0.8.0-gcc42.patch
new file mode 100644
index 000000000000..bd5274ab4098
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.0-gcc42.patch
@@ -0,0 +1,11 @@
+--- Sources/API/GL/opengl_wrap.h
++++ Sources/API/GL/opengl_wrap.h
+@@ -2530,7 +2530,7 @@
+ 	typedef CLuint (CL_GLFUNC *ptr_glCreateShaderObjectARB )(CLenum shaderType);
+ 	typedef CLvoid (CL_GLFUNC *ptr_glShaderSourceARB)(CLuint shaderObj, CLsizei count, const CLchar* *string, const CLint *length);
+ 	typedef CLvoid (CL_GLFUNC *ptr_glCompileShaderARB)(CLuint shaderObj);
+-	typedef CLuint (CL_GLFUNC *ptr_glCreateProgramObjectARB)(CLvoid);
++	typedef CLuint (CL_GLFUNC *ptr_glCreateProgramObjectARB)(void);
+ 	typedef CLvoid (CL_GLFUNC *ptr_glAttachObjectARB)(CLuint containerObj, CLuint attachedObj);
+ 	typedef CLvoid (CL_GLFUNC *ptr_glLinkProgramARB)(CLuint programObj);
+ 	typedef CLvoid (CL_GLFUNC *ptr_glUseProgramObjectARB)(CLuint programObj);