add patch for building with xerces-c-3 from Frédéric COIFFIER via bug #242916

Package-Manager: portage-2.1.4.5

4 files changed, 60 insertions, 5 deletions

diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog
index 428792cc8f91..e0ba6b648339 100644
--- a/games-puzzle/enigma/ChangeLog
+++ b/games-puzzle/enigma/ChangeLog
@@ -1,6 +1,10 @@
 # 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.40 2008/08/18 05:47:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.41 2008/11/18 21:14:32 mr_bones_ Exp $
+
+  18 Nov 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/enigma-1.01-xerces-c.patch, enigma-1.01.ebuild:
+  add patch for building with xerces-c-3 from Frédéric COIFFIER via bug #242916
 
   18 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org> enigma-1.01.ebuild:
   new tarball from upstream for 64-bit support (bug #235076)
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index 880387a8fc60..2f78f6adb48d 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,6 +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
 DIST enigma-1.01-64bit.tar.gz 10891095 RMD160 671971415e8d96bc84e2a823d66359025e158128 SHA1 2f9f5aaf3d233c248d818c3a2fd5ea873d34135f SHA256 ae87ecf635bd89bec143a8011e30a4a3b546edb3fe2ed2fca243d366bb599736
-EBUILD enigma-1.01.ebuild 1161 RMD160 54177ed9df8047989476e92de7dfc7f01aa16da9 SHA1 3aab22cab077f983f6b55da7b430973ca4eef745 SHA256 4c4f29603ecc822cf65f4f696dbbdb777524a2f3b685eb13e6d1f0d69d6f6209
-MISC ChangeLog 6251 RMD160 fef16c5aee4a0f543ae8f5aca846a8ae52853f11 SHA1 4bab0442fdd4a9470c9dc242d2e0368bac3a84e8 SHA256 25c6f072a73325998ff5b5f3f27a21954d2914fa86bbb3a49400c3ab1520793b
+EBUILD enigma-1.01.ebuild 1199 RMD160 1d68c1023ea0e4307ad48be392e778b8a880d2e0 SHA1 dc9428075d36a47f3c220e1430e937cfac311f2c SHA256 97a8c4fe26a08aba32d8071893301e38674648b82a71b442bdca7b2130185b80
+MISC ChangeLog 6446 RMD160 2dc5dd21507ee720b873a747d832408522fbbb3a SHA1 8e403c094bb2844a224b950c01a75d7d18ca2c51 SHA256 67a72ea85ce964c76b2ad151776b0aee0bca54fe51ea957f39b39269fa9966f4
 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 047adab6594a..034dc37941af 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
 # 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.7 2008/08/18 05:47:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.01.ebuild,v 1.8 2008/11/18 21:14:32 mr_bones_ Exp $
 
 inherit autotools eutils games
 
@@ -30,7 +30,8 @@ src_unpack() {
 	cp /usr/share/gettext/config.rpath .
 	epatch \
 		"${FILESDIR}"/${P}-autotools.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-xerces-c.patch
 	eautoreconf
 }
 
diff --git a/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch b/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch
new file mode 100644
index 000000000000..b17ad8e76e4f
--- /dev/null
+++ b/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch
@@ -0,0 +1,49 @@
+--- configure.ac	2008-11-18 14:09:53.724778996 +0500
++++ configure.ac3	2008-11-18 14:42:30.322032537 +0500
+@@ -167,14 +167,14 @@ dnl ------------------------------------
+ dnl Check for xerces
+ dnl ----------------------------------------
+ if test "$MINGW32" = yes; then
+-  AC_MSG_CHECKING([for Xerces 3.0 experimental version])
+-  AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp],
++  AC_MSG_CHECKING([for Xerces 3 version])
++  AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp],
+       [AC_MSG_RESULT([found])],
+       [AC_MSG_ERROR([not found])])      
+    AC_CHECK_LIB(xerces, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])])
+ else
+-  AC_MSG_CHECKING([for Xerces 3.0 experimental version])
+-  AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp],
++  AC_MSG_CHECKING([for Xerces 3 version])
++  AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp],
+       xerces3exp="yes",
+       xerces3exp="no")      
+   if test "x$xerces3exp" = xyes; then
+--- src/lev/ScoreManager.cc
++++ src/lev/ScoreManager.cc
+@@ -65,15 +65,23 @@
+     class ScoreDomSerFilter : public DOMWriterFilter {
+ #endif
+         public:
++#if _XERCES_VERSION >= 30000
++            virtual DOMNodeFilter::FilterAction acceptNode(const DOMNode *node) const;
++#else
+             virtual short acceptNode(const DOMNode *node) const;
++#endif
+             virtual unsigned long getWhatToShow () const {
+                 return DOMNodeFilter::SHOW_ALL;
+             }
+             virtual void setWhatToShow (unsigned long toShow) {}
+     };
+-    
++   
++#if _XERCES_VERSION >= 30000
++    DOMNodeFilter::FilterAction ScoreDomSerFilter::acceptNode(const DOMNode *node) const {
++#else
+     short ScoreDomSerFilter::acceptNode(const DOMNode *node) const {
+-        if (node->getNodeType () == DOMNode::ELEMENT_NODE &&
++#endif
++	if (node->getNodeType () == DOMNode::ELEMENT_NODE &&
+                  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();