Bug#880377: cegui-mk2: FTBFS with new gcc / icu

[Dimitri John Ledkov]

Source: cegui-mk2
Version: 0.8.7-1.3
Severity: wishlist
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear Maintainer,

In ubuntu, cegui-mk2 FTBFS with new gcc/icu/boost.

Please see attached patches.

Regards,

Dimitri.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBCAAGBQJZ983UAAoJEMrC2LnNLKX5DYsH/iTtVJ6yZRBELXkMV6rHwqnh
pS+Tb17Kny+HBFlrQ7oKyuyCaQzKwPJzN8xlPMyEAxzmmHIXaHTJ+gYwumfpqdjP
cGpHXmSj1395UWLmNBRarrR4MMida48wfCeO3qSz0BPn4AvCfjci8PV5k+KUzBb3
vnl2NVydEgguzJ4xmUlVieJb6R2e3EeDA9BMe5Xs4sLgAcWSVJZSRQBB+O0VEY1l
uZqvjmgx2TiFcwhtEkhg7NpXlneDyTTLJIjSlMQd+cYnUVfxR1vshgyXf9yXxmGQ
H/3EW1i6Tds4V8/0GcA9yinbf1z2VBOpB28VE+mn6df3ZifiuOv1+PXgkASJ2gQ=
=HfPI
-----END PGP SIGNATURE-----

Description: Drop standards version checks, welcome to the 10s.
Author: Dimitri John Ledkov <x...@ubuntu.com>

--- cegui-mk2-0.8.7.orig/CMakeLists.txt
+++ cegui-mk2-0.8.7/CMakeLists.txt
@@ -70,14 +70,6 @@ if ((WIN32 OR APPLE) AND NOT CMAKE_PREFI
     set (CMAKE_FIND_FRAMEWORK LAST)
 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")
-elseif (NOT CMAKE_VERSION VERSION_LESS "3.1")
-    set (CMAKE_C_STANDARD_REQUIRED TRUE)
-    set (CMAKE_C_STANDARD "99")
-endif ()
-
 # Look for packages
 find_package(PCRE)
 find_package(Freetype)

Description: Do not compare pointer with an integer, FTBFS
Author: Dimitri John Ledkov <x...@ubuntu.com>

--- a/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp
+++ b/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp
@@ -130,7 +130,7 @@
                 processElement(childNode->ToElement());
                 break;
             case TiXmlNode::CEGUI_TINYXML_TEXT:
-                if (childNode->ToText()->Value() != '\0')
+                if (childNode->ToText()->Value()[0] != '\0')
                     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 @@
             break;
 
         case rapidxml::node_data:
-            if (childNode->value() != '\0')
+            if (childNode->value()[0] != '\0')
                 d_handler->text(
                     reinterpret_cast<encoded_char*>(childNode->value()));