summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip Warner <pc_warner@yahoo.com>2010-11-29 22:23:26 -0600
committerRobby Workman <rworkman@slackbuilds.org>2010-12-05 20:02:04 -0600
commitd5ecd5c9c1ba473122e4d36cc82465f6371931e5 (patch)
tree283c91fefc6cfc0d2de1b65fe224e57ee52dc146
parent37d7a4860ada712472459c04aabcba9d7213fc53 (diff)
downloadslackbuilds-d5ecd5c9c1ba473122e4d36cc82465f6371931e5.tar.gz
libraries/CEGUI: Fixed build with tinyxml
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--libraries/CEGUI/CEGUI-tinyxml.patch15
-rw-r--r--libraries/CEGUI/CEGUI.SlackBuild8
2 files changed, 19 insertions, 4 deletions
diff --git a/libraries/CEGUI/CEGUI-tinyxml.patch b/libraries/CEGUI/CEGUI-tinyxml.patch
new file mode 100644
index 0000000000..64ba9306c9
--- /dev/null
+++ b/libraries/CEGUI/CEGUI-tinyxml.patch
@@ -0,0 +1,15 @@
+--- CEGUITinyXMLParser.cpp.orig 2009-10-16 11:56:28.000000000 +0100
++++ CEGUITinyXMLParser.cpp 2009-10-16 11:56:35.000000000 +0100
+@@ -131,10 +131,10 @@
+ {
+ switch(childNode->Type())
+ {
+- case CEGUI_TINYXML_NAMESPACE::TiXmlNode::ELEMENT:
++ case CEGUI_TINYXML_NAMESPACE::TiXmlNode::TINYXML_ELEMENT:
+ processElement(childNode->ToElement());
+ break;
+- case CEGUI_TINYXML_NAMESPACE::TiXmlNode::TEXT:
++ case CEGUI_TINYXML_NAMESPACE::TiXmlNode::TINYXML_TEXT:
+ if (childNode->ToText()->Value() != '\0')
+ d_handler->text((utf8*)childNode->ToText()->Value());
+ break;
diff --git a/libraries/CEGUI/CEGUI.SlackBuild b/libraries/CEGUI/CEGUI.SlackBuild
index 3274cd02f2..f92016b411 100644
--- a/libraries/CEGUI/CEGUI.SlackBuild
+++ b/libraries/CEGUI/CEGUI.SlackBuild
@@ -6,15 +6,13 @@
PRGNAM=CEGUI
VERSION=${VERSION:-0.6.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -40,7 +38,7 @@ fi
set -e
-rm -rf $PKG
+rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
@@ -53,6 +51,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p0 -d XMLParserModules/TinyXMLParser -i $CWD/CEGUI-tinyxml.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \