summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2008-11-18 21:14:32 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2008-11-18 21:14:32 +0000
commit29b581b71f1e6808dbab8ad479d6208d4b830335 (patch)
treed6180d1a91510b397c8935dfaba004f258b103e1 /games-puzzle/enigma/files
parentPackage mask app-emacs/quilt-el. (diff)
downloadhistorical-29b581b71f1e6808dbab8ad479d6208d4b830335.tar.gz
historical-29b581b71f1e6808dbab8ad479d6208d4b830335.tar.bz2
historical-29b581b71f1e6808dbab8ad479d6208d4b830335.zip
add patch for building with xerces-c-3 from Frédéric COIFFIER via bug #242916
Package-Manager: portage-2.1.4.5
Diffstat (limited to 'games-puzzle/enigma/files')
-rw-r--r--games-puzzle/enigma/files/enigma-1.01-xerces-c.patch49
1 files changed, 49 insertions, 0 deletions
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();