wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-11 01:23:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cegui07: fix build with gcc7

Browse source
This commit is contained in:
Alessio Sergi 2017-12-08 20:49:21 +01:00
parent 59dae4e9ce
commit 24fc38a2a7
1 changed files with 81 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
srcpkgs/cegui07/patches/fix-build.patch Normal file
View file

@ -0,0 +1,81 @@
--- cegui/include/CEGUISystem.h.orig
+++ cegui/include/CEGUISystem.h
@@ -1123,12 +1123,6 @@
ScriptModule* scriptModule, const String& configFile,
const String& logFile);
- /*!
- \brief
- Destructor for System objects.
- */
- ~System(void);
-
/*!
\brief
Given Point \a pt, return a pointer to the Window that should receive a mouse input if \a pt is the mouse location.
@@ -1364,6 +1358,13 @@
RenderedStringParser* d_customRenderedStringParser;
//! true if mouse click events will be automatically generated.
bool d_generateMouseClickEvents;
+
+protected:
+ /*!
+ \brief
+ Destructor for System objects.
+ */
+ ~System(void);
};
} // End of CEGUI namespace section
--- cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h.orig
+++ cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h
@@ -291,12 +291,6 @@
*/
OpenGLRenderer(const Size& display_size, const TextureTargetType tt_type);
- /*!
- \brief
- Destructor for OpenGLRenderer objects
- */
- virtual ~OpenGLRenderer();
-
//! init the extra GL states enabled via enableExtraStateSettings
void setupExtraStates();
@@ -336,6 +330,13 @@
OGLTextureTargetFactory* d_textureTargetFactory;
//! What blend mode we think is active.
BlendMode d_activeBlendMode;
+
+protected:
+ /*!
+ \brief
+ Destructor for OpenGLRenderer objects
+ */
+ virtual ~OpenGLRenderer();
};
} // End of CEGUI namespace section
--- cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp.orig
+++ cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
@@ -145,7 +145,7 @@
processElement(childNode->ToElement());
break;
case CEGUI_TINYXML_NAMESPACE::TiXmlNode::CEGUI_TINYXML_TEXT:
- if (childNode->ToText()->Value() != '\0')
+ if (childNode->ToText()->Value() != NULL)
d_handler->text((utf8*)childNode->ToText()->Value());
break;
--- configure.ac.orig
+++ configure.ac
@@ -14,7 +14,8 @@
AC_INIT([CEGUI], [CEGUI_RELEASE_VERSION], [http://mantis.cegui.org.uk/], [CEGUI])
AC_CONFIG_SRCDIR([cegui/src/CEGUIBase.cpp])
-AM_INIT_AUTOMAKE([dist-zip tar-ustar])
+AM_INIT_AUTOMAKE([dist-zip tar-ustar subdir-objects])
+AM_SILENT_RULES([yes])
AC_CONFIG_HEADER([cegui/include/config.h])
AC_CANONICAL_HOST