From 9085de4d9c0d812a7d785ce44979bb6391306d72 Mon Sep 17 00:00:00 2001
From: Michael Sterrett <mr_bones_@gentoo.org>
Date: Tue, 18 Nov 2008 22:38:40 +0000
Subject: add gcc43 patch from Nikolay Orlyuk via bug #242576 (Portage version:
 2.1.4.5)

---
 games-puzzle/kiki/ChangeLog                    |  6 ++-
 games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch | 56 ++++++++++++++++++++++++++
 games-puzzle/kiki/kiki-1.0.2-r2.ebuild         |  5 ++-
 3 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch

(limited to 'games-puzzle/kiki')

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/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)
-- 
cgit v1.2.3-65-gdbad