add gcc43 patch from Nikolay Orlyuk via bug #242576

Package-Manager: portage-2.1.4.5

4 files changed, 67 insertions, 5 deletions

diff --git a/games-puzzle/kiki/ChangeLog b/games-puzzle/kiki/ChangeLog
index 226c222f82ff..2e8af68609a6 100644
--- a/games-puzzle/kiki/ChangeLog
+++ b/games-puzzle/kiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/kiki
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.13 2008/05/13 16:07:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.14 2008/11/18 22:38:40 mr_bones_ Exp $
+
+  18 Nov 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/kiki-1.0.2-gcc43.patch, kiki-1.0.2-r2.ebuild:
+  add gcc43 patch from Nikolay Orlyuk via bug #242576
 
   13 May 2008; Michael Sterrett <mr_bones_@gentoo.org> kiki-1.0.2-r2.ebuild:
   fix deps (bug #221481)
diff --git a/games-puzzle/kiki/Manifest b/games-puzzle/kiki/Manifest
index 41e78c767850..65a14ef82881 100644
--- a/games-puzzle/kiki/Manifest
+++ b/games-puzzle/kiki/Manifest
@@ -1,6 +1,7 @@
 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
 DIST kiki-1.0.2-src.tgz 3366523 RMD160 78e71cae75f7d6957d06fb8c7323d607bc232499 SHA1 57f8583f7dfd3557524c98131e56e35251fdcc07 SHA256 7651f57543ce61c22bcc01daf6a68e0ab31ba353f9b2fbc067e323bbba6e1246
-EBUILD kiki-1.0.2-r2.ebuild 1957 RMD160 b875828c090ce2793db555171f8c5b0156b291da SHA1 0568d16cdce142a9239d20c17cc843f1308fa57c SHA256 6d5b03dccd44d9f8781e30866ab5882a16266dec7c7b34a1de6dfc682cb483a3
-MISC ChangeLog 1850 RMD160 a7d9120e49049ccce3cbba0b3662133f20b928d3 SHA1 d3311f29ed4657af423567dcb843293e54b7c6cd SHA256 4566cbdf51abe3af74e1567a47cc56875aad32ab418aabd0409aa89c9420f688
+EBUILD kiki-1.0.2-r2.ebuild 1992 RMD160 63ffe8e14f118848941998fd24b790e779022c30 SHA1 9907fea526832d3d79d1bb66c76fc553970337de SHA256 dfce5fc1c3a1d01aa0f3deafdf35471acc1e622c00764b5678af12634f3b173b
+MISC ChangeLog 2015 RMD160 09d238deb2f2c7d0e67d26b9211069d30de44293 SHA1 631df3f087a0cd20ef077449f2b7160d16976e99 SHA256 6d06a8241776a6091a414da8830043a4c88068196392bbf595bb88685a02132c
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch b/games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch
new file mode 100644
index 000000000000..baa04f2ff98e
--- /dev/null
+++ b/games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch
@@ -0,0 +1,56 @@
+--- kiki/kodilib/src/handler/KPickable.h.orig	2003-04-09 05:56:01.000000000 +0300
++++ kiki/kodilib/src/handler/KPickable.h	2008-10-18 17:23:42.000000000 +0300
+@@ -9,6 +9,8 @@
+ #include "KIntrospection.h"

+ #include <vector>

+ 

++#include <limits.h>

++

+ #define DEBUG_PICKING		false

+ 

+ class KPickable;

+--- kiki/kodilib/src/tools/KIntrospection.h.orig	2003-04-09 05:56:03.000000000 +0300
++++ kiki/kodilib/src/tools/KIntrospection.h	2008-10-18 17:22:03.000000000 +0300
+@@ -11,6 +11,7 @@
+ #endif

+ 

+ #include <string>

++#include <cstring>

+ 

+ // --------------------------------------------------------------------------------------------------------

+ class KClassInfo

+--- kiki/kodilib/src/tools/KStringTools.cpp.orig	2003-04-14 00:42:13.000000000 +0300
++++ kiki/kodilib/src/tools/KStringTools.cpp	2008-10-18 17:25:48.000000000 +0300
+@@ -6,9 +6,10 @@
+ #include "KStringTools.h"

+ #include "KVector.h"

+ 

+-#include <sys/types.h> 	// INT_MAX

+ #include <stdio.h>

+ 

++#include <limits.h> // INT_MAX

++

+ // --------------------------------------------------------------------------------------------------------

+ void kStringInsertStringBehindTags ( std::string & str, const std::string & insertString, 

+                                      const std::string & tag )

+--- kiki/kodilib/src/tools/KStringTools.h.orig	2003-04-09 05:56:04.000000000 +0300
++++ kiki/kodilib/src/tools/KStringTools.h	2008-10-18 17:22:49.000000000 +0300
+@@ -7,6 +7,7 @@
+ #define __KStringTools

+ 

+ #include <string>

++#include <cstring>

+ #include <vector>

+ #include <stdarg.h>

+ 

+--- kiki/kodilib/src/tools/KXMLTools.cpp.orig	2003-04-14 00:42:13.000000000 +0300
++++ kiki/kodilib/src/tools/KXMLTools.cpp	2008-10-18 17:26:42.000000000 +0300
+@@ -8,6 +8,8 @@
+ #include "KSeparatedMatrix.h"

+ #include <stdio.h>

+ 

++#include <cstdlib>

++

+ // --------------------------------------------------------------------------------------------------------

+ std::string kXMLTag ( const std::string & name, const std::string & attributes, int depth )

+ {

diff --git a/games-puzzle/kiki/kiki-1.0.2-r2.ebuild b/games-puzzle/kiki/kiki-1.0.2-r2.ebuild
index 8555cd0aba85..17f8c8adcb11 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-2008 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.2 2008/05/13 16:07:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild,v 1.3 2008/11/18 22:38:40 mr_bones_ Exp $
 
 inherit eutils python toolchain-funcs games
 
@@ -28,7 +28,8 @@ src_unpack() {
 	cd "${S}"
 	epatch \
 		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}/${P}"-freeglut.patch
+		"${FILESDIR}/${P}"-freeglut.patch \
+		"${FILESDIR}/${P}"-gcc43.patch
 	# There are CVS directories in the tgz file
 	rm -rf $(find -name CVS -type d)
 	rm -rf $(find -name .cvsignore)