c987560802
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
81 lines
2.4 KiB
Diff
81 lines
2.4 KiB
Diff
--- a/cegui/include/CEGUISystem.h
|
|
+++ b/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
|
|
--- a/cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h
|
|
+++ b/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
|
|
--- a/cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
|
|
+++ b/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;
|
|
|
|
--- a/configure.ac
|
|
+++ b/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
|
|
|