| 1 |
mr_bones_ 08/11/18 21:14:32 |
| 2 |
|
| 3 |
Added: enigma-1.01-xerces-c.patch |
| 4 |
Log: |
| 5 |
add patch for building with xerces-c-3 from Frédéric COIFFIER via bug #242916 |
| 6 |
(Portage version: 2.1.4.5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-puzzle/enigma/files/enigma-1.01-xerces-c.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: enigma-1.01-xerces-c.patch |
| 15 |
=================================================================== |
| 16 |
--- configure.ac 2008-11-18 14:09:53.724778996 +0500 |
| 17 |
+++ configure.ac3 2008-11-18 14:42:30.322032537 +0500 |
| 18 |
@@ -167,14 +167,14 @@ dnl ------------------------------------ |
| 19 |
dnl Check for xerces |
| 20 |
dnl ---------------------------------------- |
| 21 |
if test "$MINGW32" = yes; then |
| 22 |
- AC_MSG_CHECKING([for Xerces 3.0 experimental version]) |
| 23 |
- AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp], |
| 24 |
+ AC_MSG_CHECKING([for Xerces 3 version]) |
| 25 |
+ AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp], |
| 26 |
[AC_MSG_RESULT([found])], |
| 27 |
[AC_MSG_ERROR([not found])]) |
| 28 |
AC_CHECK_LIB(xerces, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])]) |
| 29 |
else |
| 30 |
- AC_MSG_CHECKING([for Xerces 3.0 experimental version]) |
| 31 |
- AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp], |
| 32 |
+ AC_MSG_CHECKING([for Xerces 3 version]) |
| 33 |
+ AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp], |
| 34 |
xerces3exp="yes", |
| 35 |
xerces3exp="no") |
| 36 |
if test "x$xerces3exp" = xyes; then |
| 37 |
--- src/lev/ScoreManager.cc |
| 38 |
+++ src/lev/ScoreManager.cc |
| 39 |
@@ -65,15 +65,23 @@ |
| 40 |
class ScoreDomSerFilter : public DOMWriterFilter { |
| 41 |
#endif |
| 42 |
public: |
| 43 |
+#if _XERCES_VERSION >= 30000 |
| 44 |
+ virtual DOMNodeFilter::FilterAction acceptNode(const DOMNode *node) const; |
| 45 |
+#else |
| 46 |
virtual short acceptNode(const DOMNode *node) const; |
| 47 |
+#endif |
| 48 |
virtual unsigned long getWhatToShow () const { |
| 49 |
return DOMNodeFilter::SHOW_ALL; |
| 50 |
} |
| 51 |
virtual void setWhatToShow (unsigned long toShow) {} |
| 52 |
}; |
| 53 |
- |
| 54 |
+ |
| 55 |
+#if _XERCES_VERSION >= 30000 |
| 56 |
+ DOMNodeFilter::FilterAction ScoreDomSerFilter::acceptNode(const DOMNode *node) const { |
| 57 |
+#else |
| 58 |
short ScoreDomSerFilter::acceptNode(const DOMNode *node) const { |
| 59 |
- if (node->getNodeType () == DOMNode::ELEMENT_NODE && |
| 60 |
+#endif |
| 61 |
+ if (node->getNodeType () == DOMNode::ELEMENT_NODE && |
| 62 |
std::string(XMLtoUtf8(node->getNodeName()).c_str()) == "level") { |
| 63 |
const DOMElement *e = dynamic_cast<const DOMElement *>(node); |
| 64 |
std::string id = XMLtoUtf8(e->getAttribute(Utf8ToXML("id").x_str())).c_str(); |
Archives