diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2009-01-01 15:58:09 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-01-01 15:58:09 +0000 |
| commit | 260190d8debaf4ecce5c173d560abc8507c1a0d7 (patch) | |
| tree | d9733ab7e664b115614d6500404dc0510afb4755 /games-puzzle/enigma | |
| parent | fix install failure (diff) | |
| download | gentoo-2-260190d8debaf4ecce5c173d560abc8507c1a0d7.tar.gz gentoo-2-260190d8debaf4ecce5c173d560abc8507c1a0d7.tar.bz2 gentoo-2-260190d8debaf4ecce5c173d560abc8507c1a0d7.zip | |
Add additional patching from Ivan Boldyrev for cross-platform building with dev-libs/xerces-c-3 (bug #242916)
(Portage version: 2.1.6.4/cvs/Linux 2.6.27.8 i686)
Diffstat (limited to 'games-puzzle/enigma')
| -rw-r--r-- | games-puzzle/enigma/ChangeLog | 9 | ||||
| -rw-r--r-- | games-puzzle/enigma/enigma-1.01.ebuild | 6 | ||||
| -rw-r--r-- | games-puzzle/enigma/files/enigma-1.01-xerces-c.patch | 36 |
3 files changed, 46 insertions, 5 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/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 |