3 files changed, 21 insertions, 7 deletions
diff --git a/libraries/tinyxml/tinyxml-2.5.3-stl.patch b/libraries/tinyxml/tinyxml-2.5.3-stl.patch
new file mode 100644
index 0000000000..7bcde59ff9
--- /dev/null
+++ b/libraries/tinyxml/tinyxml-2.5.3-stl.patch
@@ -0,0 +1,12 @@
+diff -up tinyxml/tinyxml.h~ tinyxml/tinyxml.h
+--- tinyxml/tinyxml.h~	2007-11-30 22:39:36.000000000 +0100
++++ tinyxml/tinyxml.h	2007-11-30 22:39:36.000000000 +0100
+@@ -26,6 +26,8 @@ distribution.
+ #ifndef TINYXML_INCLUDED
+ #define TINYXML_INCLUDED
+ 
++#define TIXML_USE_STL 1
++
+ #ifdef _MSC_VER
+ #pragma warning( push )
+ #pragma warning( disable : 4530 )
diff --git a/libraries/tinyxml/tinyxml.SlackBuild b/libraries/tinyxml/tinyxml.SlackBuild
index 3a91683ebb..c1cb95ac77 100644
--- a/libraries/tinyxml/tinyxml.SlackBuild
+++ b/libraries/tinyxml/tinyxml.SlackBuild
@@ -5,8 +5,8 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=tinyxml
-VERSION=2.6.1
-BUILD=${BUILD:-2}
+VERSION=2.6.2
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -53,6 +53,8 @@ find . \
 
 # Define TINYXML_USE_STL to YES and use custom SLKCFLAGS.
 sed -i -e '/^TINYXML_USE_STL/s|=.*|= YES|' -e "s|-O3|$SLKCFLAGS|" Makefile
+# Permanently define TINYXML_USE_STL in tinyxml.h.
+patch -p1 < $CWD/tinyxml-2.5.3-stl.patch
 # Fix for bug
 # http://trac.filezilla-project.org/ticket/5473
 # http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
@@ -63,7 +65,7 @@ make
 g++ -v $SLKCFLAGS -Wall -Wno-unknown-pragmas -Wno-format -shared -o \
   lib${PRGNAM}.so.0.${VERSION} -Wl,-soname,lib${PRGNAM}.so.0 *.o
 
-install -d -m 0755 $PKG/usr/{include,lib${LIBDIRSUFFIX}}
+mkdir -p $PKG/usr/{include,lib${LIBDIRSUFFIX}}
 install -m 0755 lib${PRGNAM}.so.0.${VERSION} $PKG/usr/lib${LIBDIRSUFFIX}
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
     ln -s lib${PRGNAM}.so.0.${VERSION} lib${PRGNAM}.so.0
diff --git a/libraries/tinyxml/tinyxml.info b/libraries/tinyxml/tinyxml.info
index 5ed7b56f39..ccb695dcf4 100644
--- a/libraries/tinyxml/tinyxml.info
+++ b/libraries/tinyxml/tinyxml.info
@@ -1,10 +1,10 @@
 PRGNAM="tinyxml"
-VERSION="2.6.1"
+VERSION="2.6.2"
 HOMEPAGE="http://www.grinninglizard.com/tinyxml/"
-DOWNLOAD="http://downloads.sourceforge.net/tinyxml/tinyxml_2_6_1.tar.gz"
-MD5SUM="adb56a2a5cceb53141c5fb67f53a096d"
+DOWNLOAD="http://downloads.sourceforge.net/tinyxml/tinyxml_2_6_2.tar.gz"
+MD5SUM="c1b864c96804a10526540c664ade67f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="dsomero,Erik Hanson"