Add additional patching from Ivan Boldyrev for cross-platform building with dev-libs/xerces-c-3 (bug #242916)

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27.8 i686

4 files changed, 49 insertions, 8 deletions

diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog
index e0ba6b648339..3803bb6310c1 100644
--- a/games-puzzle/enigma/ChangeLog
+++ b/games-puzzle/enigma/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/enigma
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.41 2008/11/18 21:14:32 mr_bones_ Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.42 2009/01/01 15:58:09 mr_bones_ Exp $
+
+  01 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  files/enigma-1.01-xerces-c.patch, enigma-1.01.ebuild:
+  Add additional patching from Ivan Boldyrev for cross-platform building with
+  dev-libs/xerces-c-3 (bug #242916)
 
   18 Nov 2008; Michael Sterrett <mr_bones_@gentoo.org>
   +files/enigma-1.01-xerces-c.patch, enigma-1.01.ebuild:
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index 2f78f6adb48d..da44acfcb126 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,7 +1,7 @@
 AUX enigma-1.01-autotools.patch 2865 RMD160 a8415815e2f73be9f89066e58e712ffc8cc784c8 SHA1 4b9dd11660428438a32d5a5cee8304e8a5045279 SHA256 141ea4b51ee272c2842983cab09e5631755f8738e367408de37fb435b84131e1
 AUX enigma-1.01-gcc43.patch 813 RMD160 27998358a70579aabbd476358ce6e262494a2ce5 SHA1 fabc6422e5bf9372179d23bc2da3fe9e280172b7 SHA256 24f5f4f4b4235622d84bc5fd4c954aeffa7c3f2fccd1daa78ad458e44afca897
-AUX enigma-1.01-xerces-c.patch 2183 RMD160 e8bca91e593a461f44daf052054e85e3b701c921 SHA1 f3ec5ac197ec89c7149817df1ed6a230341dbcdb SHA256 5abecf8ac791bf773084b68e682fbce40d2ee36ee46d96ebe9c4d20d6590fea8
+AUX enigma-1.01-xerces-c.patch 3824 RMD160 f58690c41dbf2d47b25523de8bd7a86de5f6627c SHA1 f64878363fedf54f1f6e186555f789a25e13f9cd SHA256 9868afa6bbb4f430bc708f6c5ce2c7c9b434ea044e9ccf239d706d56071c710f
 DIST enigma-1.01-64bit.tar.gz 10891095 RMD160 671971415e8d96bc84e2a823d66359025e158128 SHA1 2f9f5aaf3d233c248d818c3a2fd5ea873d34135f SHA256 ae87ecf635bd89bec143a8011e30a4a3b546edb3fe2ed2fca243d366bb599736
-EBUILD enigma-1.01.ebuild 1199 RMD160 1d68c1023ea0e4307ad48be392e778b8a880d2e0 SHA1 dc9428075d36a47f3c220e1430e937cfac311f2c SHA256 97a8c4fe26a08aba32d8071893301e38674648b82a71b442bdca7b2130185b80
-MISC ChangeLog 6446 RMD160 2dc5dd21507ee720b873a747d832408522fbbb3a SHA1 8e403c094bb2844a224b950c01a75d7d18ca2c51 SHA256 67a72ea85ce964c76b2ad151776b0aee0bca54fe51ea957f39b39269fa9966f4
+EBUILD enigma-1.01.ebuild 1203 RMD160 225158516e1a1a8cbd5e570a428a97b7b259feb9 SHA1 4bb60d6eb8755b3917345c583f9c641fb24c05ea SHA256 fbfb829db29cf4aa5fadb0325ea68b4b73f8436747d8458ed34ac9007a07bfb4
+MISC ChangeLog 6672 RMD160 c7f8f2161de79976df68132dcd7e1537462df3f8 SHA1 ad0739fda850a519aa9f33f0b9d8a9ed36a44e2c SHA256 67382ceb7d23a578cb601b48471bc1691a3f3927fc0f8eea7d25d193b984981a
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/enigma/enigma-1.01.ebuild b/games-puzzle/enigma/enigma-1.01.ebuild
index 034dc37941af..d986d63869a7 100644
--- a/games-puzzle/enigma/enigma-1.01.ebuild
+++ b/games-puzzle/enigma/enigma-1.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.01.ebuild,v 1.8 2008/11/18 21:14:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.01.ebuild,v 1.9 2009/01/01 15:58:09 mr_bones_ Exp $
 
 inherit autotools eutils games
 
@@ -18,7 +18,7 @@ RDEPEND="media-libs/sdl-ttf
 	media-libs/sdl-mixer
 	media-libs/sdl-image
 	media-libs/libpng
-	dev-libs/xerces-c
+	>=dev-libs/xerces-c-3
 	net-libs/enet
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
diff --git a/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch b/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch
index b17ad8e76e4f..2f7e0c0523a3 100644
--- a/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch
+++ b/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch
@@ -47,3 +47,39 @@
                   std::string(XMLtoUtf8(node->getNodeName()).c_str()) == "level") {
              const DOMElement *e = dynamic_cast<const DOMElement *>(node);
              std::string id = XMLtoUtf8(e->getAttribute(Utf8ToXML("id").x_str())).c_str();
+--- src/Utf8ToXML.cc~	2008-12-29 00:12:26.000000000 +0600
++++ src/Utf8ToXML.cc	2008-12-29 00:15:19.000000000 +0600
+@@ -40,11 +40,11 @@
+     }
+ 
+     void Utf8ToXML::init(const char * const toTranscode) {
+-        unsigned int srcLength = std::strlen(toTranscode) + 1;
++        XMLSize_t srcLength = std::strlen(toTranscode) + 1;
+         // make safe assumptions on utf-16 size
+-        unsigned int maxDestLength = srcLength;
+-        unsigned int charsEaten;
+-        unsigned int destLength;
++        XMLSize_t maxDestLength = srcLength;
++        XMLSize_t charsEaten;
++        XMLSize_t destLength;
+         unsigned char *charSizes = new unsigned char[maxDestLength]; // just junk
+         // make a buffer - size does not matter - the object is temporary 
+         xmlString = new XMLCh[maxDestLength];
+--- src/XMLtoUtf8.cc~	2008-12-29 00:12:12.000000000 +0600
++++ src/XMLtoUtf8.cc	2008-12-29 00:14:47.000000000 +0600
+@@ -27,11 +27,11 @@
+ namespace enigma
+ {
+     XMLtoUtf8::XMLtoUtf8(const XMLCh* const toTranscode) {
+-        unsigned int srcLength = XMLString::stringLen(toTranscode) + 1;
++        XMLSize_t srcLength = XMLString::stringLen(toTranscode) + 1;
+         // make safe assumptions on utf-8 size
+-        unsigned int maxDestLength = 3 * srcLength;
+-        unsigned int charsEaten;
+-        unsigned int destLength;
++        XMLSize_t maxDestLength = 3 * srcLength;
++        XMLSize_t charsEaten;
++        XMLSize_t destLength;
+         // make a buffer - size does not matter - the object is temporary 
+         utf8String = new char[maxDestLength];
+         // transcode to utf-8 -- there are no unrepresentable chars