Build with gcc-4.6 Bug #362591

Package-Manager: portage-2.1.9.46/cvs/Linux i686

4 files changed, 44 insertions, 6 deletions

diff --git a/games-puzzle/kiki/ChangeLog b/games-puzzle/kiki/ChangeLog
index fd163ffdf367..6b806159ea24 100644
--- a/games-puzzle/kiki/ChangeLog
+++ b/games-puzzle/kiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/kiki
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.17 2010/09/16 16:56:17 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.18 2011/04/20 13:33:42 tupone Exp $
+
+  20 Apr 2011; Tupone Alfredo <tupone@gentoo.org> kiki-1.0.2-r2.ebuild,
+  +files/kiki-1.0.2-gcc46.patch:
+  Build with gcc-4.6 Bug #362591 by Diego Elio Pettenò
 
   16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> kiki-1.0.2-r2.ebuild:
   virtual/glut -> media-libs/glut
diff --git a/games-puzzle/kiki/Manifest b/games-puzzle/kiki/Manifest
index fc0fe9fcbe4c..9cc2d6bd3ebe 100644
--- a/games-puzzle/kiki/Manifest
+++ b/games-puzzle/kiki/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kiki-1.0.2-build.patch 1374 RMD160 cc74d64c5ca953e80667fb95890b385583d422b3 SHA1 966b54721f6c16d89e028eb0f1536dcb12c50b7f SHA256 e4c347944b41a10790cc9e994a08d00493fa3549e746cd0137dac75d13189cec
 AUX kiki-1.0.2-freeglut.patch 551 RMD160 b6883f4d68f66aca98d42a3a9eeca61e568f7294 SHA1 4ca546c618246f83a1d6cf37d53f8a3aa5719ad1 SHA256 163e6662d38043b537724ded5822580afecb7304b46d83f00e1dae315ebdbf7f
 AUX kiki-1.0.2-gcc41.patch 308 RMD160 ed9831a808a75da349f91830212d1a4a4295cbd3 SHA1 e7d1915e98fd539fab4f777e2d0a08eae779104d SHA256 bfa2934dd6849c552f90c5dfa2420dcfce96c493b87e988ae62306f6177c9636
 AUX kiki-1.0.2-gcc43.patch 2029 RMD160 003a9634db96e2081d683e3db1ffcbf0b6a6ec51 SHA1 77e8acaa2fcaceb9c125e1415676f375fd92de16 SHA256 4770fa15885dc7906c231039b9749a7d19502a9e23a2390e084e41164eb3721b
+AUX kiki-1.0.2-gcc46.patch 938 RMD160 13fe528c70271620f0981f75289cb00509fbc609 SHA1 8655c77bbd4af78792d7b6df2759fd093f761fdb SHA256 4a9780173b3dc3151a36e33730b77aa8b5d6991e062965805a69bfc11b33f571
 DIST kiki-1.0.2-src.tgz 3366523 RMD160 78e71cae75f7d6957d06fb8c7323d607bc232499 SHA1 57f8583f7dfd3557524c98131e56e35251fdcc07 SHA256 7651f57543ce61c22bcc01daf6a68e0ab31ba353f9b2fbc067e323bbba6e1246
-EBUILD kiki-1.0.2-r2.ebuild 1818 RMD160 059bd7f6d210ef6e9097f7551cda61d94ec2ddda SHA1 b9fb51047b8addc9804c76ff61571d480f9b08c9 SHA256 f07d3f1e356875228a42756501009cb34ecacc1b154de8eca33c376a846933b5
-MISC ChangeLog 2416 RMD160 c914dcb89421ef9dd397bc105fd5e76424c2167a SHA1 094b6df4e3767f058f6e9672c0416dbef3a9a208 SHA256 ce1f4ce529c0531bcd55789db73e07646459b8b1b49b13f905f0876d5fd1a58e
+EBUILD kiki-1.0.2-r2.ebuild 1854 RMD160 b34f41bda0d0cd57ca07994b194a8a1954d36f8d SHA1 4cd7be7302540134c87248b546f7aee1a7178c97 SHA256 71c53a46e912e01761fd85233d6a29cfc3b8dfe68d803f3ddc927d558a7cf927
+MISC ChangeLog 2575 RMD160 2e408cc9131a4cd96f3d1f782709cf78dabab22b SHA1 e284b1fe6c1def4593a5609c43993803a7c9b266 SHA256 8af72f60d1a5f9eb516a4fbe11e2e6b0e43db285bdedd385bc2b502794c90f75
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2u4MAACgkQIY77eQFFFC2XhQCdFooQTYtP+hooLADryB5ZdTFC
+1esAoI35vXL7uCLKglGbA1l0IQ3+3kG4
+=/p2c
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/kiki/files/kiki-1.0.2-gcc46.patch b/games-puzzle/kiki/files/kiki-1.0.2-gcc46.patch
new file mode 100644
index 000000000000..457c6d68ae02
--- /dev/null
+++ b/games-puzzle/kiki/files/kiki-1.0.2-gcc46.patch
@@ -0,0 +1,22 @@
+--- SWIG/KikiPy_wrap.cpp.old	2011-04-20 14:48:38.000000000 +0200
++++ SWIG/KikiPy_wrap.cpp	2011-04-20 15:15:08.000000000 +0200
+@@ -12968,7 +12968,7 @@
+   void *argp1 = 0 ;
+   int res1 = 0 ;
+   PyObject * obj0 = 0 ;
+-  std::string *result = 0 ;
++  std::string result ;
+   
+   if (!PyArg_ParseTuple(args,(char *)"O:KikiText_getText",&obj0)) SWIG_fail;
+   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_KikiText, 0 |  0 );
+@@ -12976,8 +12976,8 @@
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "KikiText_getText" "', argument " "1"" of type '" "KikiText const *""'"); 
+   }
+   arg1 = reinterpret_cast< KikiText * >(argp1);
+-  result = (std::string *) &((KikiText const *)arg1)->getText();
+-  resultobj = SWIG_From_std_string(static_cast< std::string >(*result));
++  result = ((KikiText const *)arg1)->getText();
++  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+   return resultobj;
+ fail:
+   return NULL;
diff --git a/games-puzzle/kiki/kiki-1.0.2-r2.ebuild b/games-puzzle/kiki/kiki-1.0.2-r2.ebuild
index 426713403270..8a1be696d595 100644
--- a/games-puzzle/kiki/kiki-1.0.2-r2.ebuild
+++ b/games-puzzle/kiki/kiki-1.0.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild,v 1.6 2010/09/16 16:56:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild,v 1.7 2011/04/20 13:33:42 tupone Exp $
 PYTHON_DEPEND="2"
 EAPI=2
 inherit eutils python toolchain-funcs games
@@ -46,6 +46,7 @@ src_prepare() {
 	cd SWIG
 	swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i || die
 	cp -f kiki.py ../py
+	epatch "${FILESDIR}"/${P}-gcc46.patch
 }
 
 src_compile() {