Source: cegui-mk2
Version: 0.8.7-1.3
Severity: normal
Tags: patch
xerces-c will be transitioning from 3.1 to 3.2 soon. However, cegui-mk2
fails to build when built against libcerces-c3.2.
Patch attached.
diff -Nuar cegui-mk2-0.8.7/debian/control cegui-mk2-0.8.7_modified/debian/control
--- cegui-mk2-0.8.7/debian/control 2016-08-21 11:48:42.000000000 -0400
+++ cegui-mk2-0.8.7_modified/debian/control 2017-11-07 00:20:08.832430196 -0500
@@ -59,7 +59,7 @@
Architecture: any
Suggests: libcegui-mk2-0.8.7-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, libcegui-mk2-0.8.7 (= ${binary:Version}),
- libdevil-dev, libxerces-c3.1, libpng-dev,
+ libdevil-dev, libxerces-c3.2, libpng-dev,
libtiff5-dev | libtiff-dev, libjpeg-dev, libmng-dev,
zlib1g-dev | libz-dev, libfreetype6-dev, lua-expat-dev, liblcms2-dev,
libpcre3-dev, libfreeimage-dev, ${python:Depends}
diff -Nuar cegui-mk2-0.8.7/debian/patches/series cegui-mk2-0.8.7_modified/debian/patches/series
--- cegui-mk2-0.8.7/debian/patches/series 2016-08-21 11:48:42.000000000 -0400
+++ cegui-mk2-0.8.7_modified/debian/patches/series 2017-11-06 21:23:34.461148759 -0500
@@ -1,3 +1,4 @@
doxygenout
cmakelistchanges
SimpleTimer_kfreebsd
+xerces32_changes
diff -Nuar cegui-mk2-0.8.7/debian/patches/xerces32_changes cegui-mk2-0.8.7_modified/debian/patches/xerces32_changes
--- cegui-mk2-0.8.7/debian/patches/xerces32_changes 1969-12-31 19:00:00.000000000 -0500
+++ cegui-mk2-0.8.7_modified/debian/patches/xerces32_changes 2017-11-06 22:31:10.738418876 -0500
@@ -0,0 +1,33 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,7 +72,7 @@ endif()
+
+ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ elseif (NOT CMAKE_VERSION VERSION_LESS "3.1")
+ set (CMAKE_C_STANDARD_REQUIRED TRUE)
+ set (CMAKE_C_STANDARD "99")
+--- a/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp
++++ b/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp
+@@ -130,7 +130,7 @@ namespace CEGUI
+ processElement(childNode->ToElement());
+ break;
+ case TiXmlNode::CEGUI_TINYXML_TEXT:
+- if (childNode->ToText()->Value() != '\0')
++ if (childNode->ToText()->Value() != nullptr)
+ d_handler->text((encoded_char*)childNode->ToText()->Value());
+ break;
+
+--- a/cegui/src/XMLParserModules/RapidXML/XMLParser.cpp
++++ b/cegui/src/XMLParserModules/RapidXML/XMLParser.cpp
+@@ -144,7 +144,7 @@ void RapidXMLDocument::processElement(co
+ break;
+
+ case rapidxml::node_data:
+- if (childNode->value() != '\0')
++ if (childNode->value() != nullptr)
+ d_handler->text(
+ reinterpret_cast<encoded_char*>(childNode->value()));
+
