patch for building with gcc-4.3 submitted by Jabari R. Roberts via bug #233447

Package-Manager: portage-2.1.4.4

4 files changed, 123 insertions, 4 deletions

diff --git a/games-puzzle/krystaldrop/ChangeLog b/games-puzzle/krystaldrop/ChangeLog
index 8a3e67f6d9b1..8619730319ab 100644
--- a/games-puzzle/krystaldrop/ChangeLog
+++ b/games-puzzle/krystaldrop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/krystaldrop
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.7 2008/01/28 21:17:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.8 2008/07/31 04:21:55 mr_bones_ Exp $
+
+  31 Jul 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/krystaldrop-0.7.2-gcc43.patch, krystaldrop-0.7.2.ebuild:
+  patch for building with gcc-4.3 submitted by Jabari R. Roberts via bug #233447
 
   28 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org>
   krystaldrop-0.7.2.ebuild:
diff --git a/games-puzzle/krystaldrop/Manifest b/games-puzzle/krystaldrop/Manifest
index 4e1add7c7790..a531e91b8cf4 100644
--- a/games-puzzle/krystaldrop/Manifest
+++ b/games-puzzle/krystaldrop/Manifest
@@ -1,8 +1,9 @@
 AUX krystaldrop-0.7.2-deps.patch 1152 RMD160 48eac8807d977daddbc40a57eeec407950d10d13 SHA1 72d0ce25b1c1bfdca0ba7170f7a274a2162334cd SHA256 bc8121c186af89aa1116d0eed5b5743c91a691434965f4128b2e9ac4ade2ea84
 AUX krystaldrop-0.7.2-gcc41.patch 2677 RMD160 552e9d91f6b78dd35c4f849261f8d31f9cf4ea25 SHA1 269b03d4504d96b0da604f355668e328b75b3463 SHA256 413d56f90d196ecfdc7ec3210b78ee54cd7348cf451e23c519ffcd2e3913a70a
+AUX krystaldrop-0.7.2-gcc43.patch 3396 RMD160 2f145173a2dd5d26dbb5d00c30529a048f21943f SHA1 b53a317e072f607c8cb3110189aee18f6f22df3b SHA256 37e14f887e34628d6675f060423c46cd54855f5623a4de0c8c9458fc841104cf
 AUX krystaldrop-assert.patch 417 RMD160 3d1b1461baad3c9c0597fe967791a9e170d3e618 SHA1 4d4688eb5622c6d3d2c973dc98640ab49c18d5aa SHA256 ac4a526be3335f7aab6fd00f0af5a79556aedc66704277704a9bb41030983df2
 DIST art_0.7.2.tgz 17079147 RMD160 3a01c1375946f6d0b764ed3482ebb346ffe6480c SHA1 80d6ba755bb98f914fbc85ebdaa59b482e332e44 SHA256 7cd9dbd1ad12eb7e26e57e2a52b59e7137e20979d4fc8cb21a48faff983f6e27
 DIST src_0.7.2.tgz 162856 RMD160 d53bcfb904bf32948ccf47838df011f67435e45b SHA1 c87ba2773f2ef5fe97fa4bc2eb89d2324a27e2c6 SHA256 d0e42cf05f241e409649de6a48045c026c42417cdabd233c8fef8783096946e5
-EBUILD krystaldrop-0.7.2.ebuild 1597 RMD160 4c371c6c9c5b50481d7d17731478de900f4f4401 SHA1 b4d9516471e128322a4a11736bfb5edf79811838 SHA256 9cbd9ef7e5b540cf79c624e8c45203a07b6699c09136ce19add9f94441033b26
-MISC ChangeLog 1140 RMD160 a4800ba6e7e40d3c65e167d625c3752dd730b4a8 SHA1 f493a8a4a5b8977e4f2cda82ff1a7c912df1049f SHA256 b1769fea90cce0e39d6442e50b2c6456d99257392040be35ced32f149f3c7be6
+EBUILD krystaldrop-0.7.2.ebuild 1632 RMD160 ad8784cc7d8b0971cf1b4914b5e10d1408e285fd SHA1 f809dcff2cdf90d221e302c984850e5fc572c114 SHA256 ffe14120fb35266c4877e85c3108c69bca7247f712cdf5bdb135b17aaefcdb9f
+MISC ChangeLog 1343 RMD160 d664fd34048a56fc778cce3be79db5e86397cbf2 SHA1 5907f39fb4d2c1697723e2101d933019ad587a0d SHA256 e79495f15242daf74fd44c5dbc4d3296fe844396e3149415c7f9746bbfbf4569
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc43.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc43.patch
new file mode 100644
index 000000000000..a4130ac31afd
--- /dev/null
+++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc43.patch
@@ -0,0 +1,113 @@
+--- krystaldrop/Sources/KDpp/Resources/ArchiveReader.h.old	2008-07-30 22:05:18.000000000 -0500
++++ krystaldrop/Sources/KDpp/Resources/ArchiveReader.h	2008-07-30 22:27:20.000000000 -0500
+@@ -2,7 +2,26 @@
+ #define ArchiveReader_H
+ 
+ #include <map>
+-#include <string>
++#include <cstring>
++#include <locale>
++
++/* 
++ * structs needed for std::transform() 
++ * See: http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html#7 
++ */ 
++struct ToUpper { 
++	ToUpper(std::locale const& l) : loc(l) {;} 
++	char operator() (char c) const  { return std::toupper(c,loc); } 
++private: 
++	std::locale const& loc; 
++}; 
++	 
++struct ToLower { 
++	ToLower(std::locale const& l) : loc(l) {;} 
++	char operator() (char c) const  { return std::tolower(c,loc); } 
++private: 
++	std::locale const& loc; 
++}; 
+ 
+ /** \c KD_ArchiveReader is a generic abstract class which reads a specific kind of archive
+     (`.zip' for instance)
+--- krystaldrop/Sources/KDpp/Resources/ArchiveManager.cpp.old	2008-07-30 20:53:19.000000000 -0500
++++ krystaldrop/Sources/KDpp/Resources/ArchiveManager.cpp	2008-07-30 22:35:54.000000000 -0500
+@@ -1,10 +1,11 @@
+-#include <assert.h>
++#include <cassert>
++#include <algorithm>
+ 
+ #include "ArchiveManager.h"
+ #include "../Tools/Logfile.h"
+ 
+ #ifndef _WIN32
+-#include <ctype.h>
++#include <cctype>
+ #endif
+ 
+ std::map<std::string,KD_ArchiveReader*> KD_ArchiveManager::opened_archives;
+@@ -25,7 +26,6 @@
+   opened_archives.clear();
+ }
+ 
+-
+ void KD_ArchiveManager::RegisterArchiveFormat (std::string suffix, T_ArchiveReaderFactory reader_factory)
+ {
+   NormalizeSuffix (suffix);
+@@ -36,9 +36,10 @@
+ 
+ 
+ void KD_ArchiveManager::NormalizeSuffix (std::string& suffix)
+-{
++{  
++  ToLower __tolower(std::locale::classic());
+   // stores the suffix lower-case
+-  transform (suffix.begin(), suffix.end(), suffix.begin(), tolower);
++  transform (suffix.begin(), suffix.end(), suffix.begin(), __tolower);
+ 
+    // add the dot character `.' if it is missing
+   if (suffix[0]!= '.') suffix= '.'+ suffix;
+--- krystaldrop/Sources/KDpp/Tools/FilePath.cpp.old	2008-07-30 20:55:13.000000000 -0500
++++ krystaldrop/Sources/KDpp/Tools/FilePath.cpp	2008-07-30 22:37:05.000000000 -0500
+@@ -1,12 +1,12 @@
+ #include "FilePath.h"
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <algorithm>
+ 
+ #ifndef _WIN32
+-#include <ctype.h>
++#include <cctype>
+ #endif
+ 
+-
+ KD_FilePath::KD_FilePath() : fileName("") , filePath(""), archiveName(""), archiveSuffix("")
+ {
+ }
+@@ -165,8 +165,9 @@
+ 	// (*not* the first one found scanning from left to right)
+ 
+ 	// the search is case-insensitive -> lower-casificator in action
++	ToLower __tolower(std::locale::classic());
+ 	string copy_directory = directory;
+-	transform (copy_directory.begin(), copy_directory.end(), copy_directory.begin(), tolower);
++	transform (copy_directory.begin(), copy_directory.end(), copy_directory.begin(), __tolower);
+ 
+ 	map<string,T_ArchiveReaderFactory>::iterator suffix_iter=
+ 		KD_ArchiveManager::known_suffixes.begin();
+@@ -271,6 +272,7 @@
+ 
+ string KD_FilePath::GetFileExtension() const
+ {
++	ToLower __tolower(std::locale::classic());
+ 	size_t pos = fileName.rfind('.');
+ 	if (pos == fileName.npos)
+ 		return "";
+@@ -280,7 +282,7 @@
+ 	for (unsigned int i=0; i<ext.size(); i++)
+ 		ext[i] = tolower(ext[i]);
+ */
+-	transform (ext.begin(), ext.end(), ext.begin(), tolower);
++	transform (ext.begin(), ext.end(), ext.begin(), __tolower);
+ 	return ext;
+ }
+ 
diff --git a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
index 2bc109fee088..163ee93eb609 100644
--- a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
+++ b/games-puzzle/krystaldrop/krystaldrop-0.7.2.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/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.8 2008/01/28 21:17:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.9 2008/07/31 04:21:55 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -28,6 +28,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/krystaldrop-assert.patch" \
 		"${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}/${P}"-gcc43.patch \
 		"${FILESDIR}/${P}"-deps.patch
 
 	unpack art_${PV}.tgz