3 files changed, 15 insertions, 34 deletions
diff --git a/libraries/tinyxml/tinyxml-2.5.3-stl.patch b/libraries/tinyxml/tinyxml-2.5.3-stl.patch
deleted file mode 100644
index cfdb0406d9..0000000000
--- a/libraries/tinyxml/tinyxml-2.5.3-stl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tinyxml/tinyxml.h~ tinyxml/tinyxml.h
---- tinyxml.h~	2007-11-30 22:39:36.000000000 +0100
-+++ 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 cdc5f1c064..49c6b79b38 100644
--- a/libraries/tinyxml/tinyxml.SlackBuild
+++ b/libraries/tinyxml/tinyxml.SlackBuild
@@ -5,16 +5,14 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=tinyxml
-VERSION=${VERSION:-2.5.3}
-BUILD=${BUILD:-2}
+VERSION=2.6.1
+BUILD=${BUILD:-1}
 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
@@ -24,8 +22,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCVER=$(echo "$VERSION" | tr . _)
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -46,7 +42,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/${PRGNAM}_$SRCVER.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION//./_}.tar.gz
 cd $PRGNAM
 chown -R root:root .
 find . \
@@ -55,24 +51,21 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Always have TIXML_USE_STL defined.
-patch -p0 < $CWD/tinyxml-2.5.3-stl.patch
+# Define TINYXML_USE_STL to YES and use custom SLKCFLAGS.
+sed -i -e '/^TINYXML_USE_STL/s|=.*|= YES|' -e "s|-O3|$SLKCFLAGS|" Makefile
 
-for i in tinyxml.cpp tinystr.cpp tinyxmlerror.cpp tinyxmlparser.cpp; do
-  g++ -v $SLKCFLAGS -fPIC -Wall -Wno-unknown-pragmas -Wno-format -o $i.o -c $i
-done
+make
 
-g++ -v $SLKCFLAGS -fPIC -Wall -Wno-unknown-pragmas -Wno-format -shared -o \
-  lib${PRGNAM}.so.0.${VERSION} -Wl,-soname,lib${PRGNAM}.so.0 *.cpp.o
+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}}
 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
-  ln -s lib${PRGNAM}.so.0.${VERSION} lib${PRGNAM}.so
+    ln -s lib${PRGNAM}.so.0.${VERSION} lib${PRGNAM}.so.0
+    ln -s lib${PRGNAM}.so.0.${VERSION} lib${PRGNAM}.so
 )
-install -m 0644 ${PRGNAM}.h $PKG/usr/include
-install -m 0644 tinystr.h $PKG/usr/include
+install -m 0644 $PRGNAM.h tinystr.h $PKG/usr/include
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/libraries/tinyxml/tinyxml.info b/libraries/tinyxml/tinyxml.info
index bae0448b9e..47f9253716 100644
--- a/libraries/tinyxml/tinyxml.info
+++ b/libraries/tinyxml/tinyxml.info
@@ -1,10 +1,10 @@
 PRGNAM="tinyxml"
-VERSION="2.5.3"
+VERSION="2.6.1"
 HOMEPAGE="http://www.grinninglizard.com/tinyxml/"
-DOWNLOAD="http://downloads.sourceforge.net/sourceforge/tinyxml/tinyxml_2_5_3.tar.gz"
-MD5SUM="84b605a31628e7f1a6694d47bf5999cc"
+DOWNLOAD="http://downloads.sourceforge.net/tinyxml/tinyxml_2_6_1.tar.gz"
+MD5SUM="adb56a2a5cceb53141c5fb67f53a096d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="pprkut"
+APPROVED="rworkman"