<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8b40ab31ee245a268c7ef69c3f0534625cb57d1d">https://github.com/macports/macports-ports/commit/8b40ab31ee245a268c7ef69c3f0534625cb57d1d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8b40ab31ee2 cegui: Add xercesc3 and fix build failures
</span>8b40ab31ee2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8b40ab31ee245a268c7ef69c3f0534625cb57d1d
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Aug 11 13:14:11 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> cegui: Add xercesc3 and fix build failures
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70529
</span>---
devel/cegui/Portfile | 11 +++++++----
devel/cegui/files/libxml2.patch | 20 ++++++++++++++++++++
devel/cegui/files/tinyxml.patch | 17 +++++++++++++++++
3 files changed, 44 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cegui/Portfile b/devel/cegui/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0417a338d98..e05d7a2df42 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cegui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cegui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name cegui
version 0.7.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> checksums rmd160 d776fd49a629248783b0d45b05ef8ad2804cca3b \
sha256 7c3b264def08b46de749c2acaba363e907479d924612436f3bd09da2e474bb8c \
size 9204644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ homepage http://cegui.org.uk
</span> master_sites sourceforge:project/crayzedsgui/CEGUI%20Mk-2/${version}
distname CEGUI-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build path:bin/pkg-config:pkgconfig
</span>
depends_lib port:expat \
port:freeglut \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,11 +33,14 @@ depends_lib port:expat \
</span> port:libxml2 \
port:pcre \
port:tinyxml \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xercesc3 \
</span> port:xorg-libice \
port:xorg-libsm
patchfiles patch-cegui-include-CEGUIDynamicModule.h.diff \
patch-cegui-src-CEGUIDynamicModule.cpp.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxml2.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tinyxml.patch \
</span> dynamic_lookup-11.patch
configure.args --disable-corona \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,13 +54,13 @@ configure.args --disable-corona \
</span> --disable-silly \
--disable-stb \
--disable-tga \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xerces-c \
</span> --enable-devil \
--enable-freeimage \
--enable-freetype \
--enable-null-renderer \
--enable-pcre \
--enable-tinyxml \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-xerces-c \
</span> --with-x
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex /CEGUI-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex /CEGUI-(\[0-9.\]+)[quotemeta ${extract.suffix}]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cegui/files/libxml2.patch b/devel/cegui/files/libxml2.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2e9dce25956
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cegui/files/libxml2.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: invalid conversion from 'const xmlError*' to 'xmlError*'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/cegui/cegui/issues/1309
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/cegui/cegui/commit/285ba5a2c0c435ed865c6e86afe314a822fd1e3f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cegui/src/XMLParserModules/LibxmlParser/CEGUILibxmlParser.cpp.orig 2013-01-12 11:07:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cegui/src/XMLParserModules/LibxmlParser/CEGUILibxmlParser.cpp 2024-08-11 11:37:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,7 +105,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!doc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if LIBXML_VERSION >= 21200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const xmlError* err = xmlGetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlError* err = xmlGetLastError();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CEGUI_THROW(GenericException(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ String("LibxmlParser::parseXMLFile - xmlParseMemory failed in file: '") +
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cegui/files/tinyxml.patch b/devel/cegui/files/tinyxml.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..78e78c6db1e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cegui/files/tinyxml.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: comparison between pointer and integer ('const char *' and 'char')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp.orig 2013-01-12 11:07:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp 2024-08-11 12:43:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,8 +145,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ processElement(childNode->ToElement());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case CEGUI_TINYXML_NAMESPACE::TiXmlNode::CEGUI_TINYXML_TEXT:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (childNode->ToText()->Value() != '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- d_handler->text((utf8*)childNode->ToText()->Value());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char* value = childNode->ToText()->Value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (value && *value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_handler->text((utf8*)value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Silently ignore unhandled node type
</span></pre><pre style='margin:0'>
</pre>