From 16963b99c8acfe6d7e0e421a5c85a420c27afd5e Mon Sep 17 00:00:00 2001
From: Larry Hajali <larryhaja[at]gmail[dot]com>
Date: Thu, 13 May 2010 00:33:41 +0200
Subject: libraries/tinyxml: Updated for version 2.5.3

---
 libraries/tinyxml/README                  |  2 +-
 libraries/tinyxml/slack-desc              | 12 ++++++------
 libraries/tinyxml/tinyxml-2.5.3-stl.patch | 12 ++++++++++++
 libraries/tinyxml/tinyxml.SlackBuild      |  7 +++++--
 libraries/tinyxml/tinyxml.info            |  4 +++-
 5 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 libraries/tinyxml/tinyxml-2.5.3-stl.patch

(limited to 'libraries/tinyxml')

diff --git a/libraries/tinyxml/README b/libraries/tinyxml/README
index b9d2e88f07..93a1e267c0 100644
--- a/libraries/tinyxml/README
+++ b/libraries/tinyxml/README
@@ -1,2 +1,2 @@
 TinyXML is a simple, small, C++ XML parser that can be easily
-integrated into other programs.
\ No newline at end of file
+integrating into other programs.
diff --git a/libraries/tinyxml/slack-desc b/libraries/tinyxml/slack-desc
index 6e17a7f258..a1adbccd9f 100644
--- a/libraries/tinyxml/slack-desc
+++ b/libraries/tinyxml/slack-desc
@@ -9,11 +9,11 @@
 tinyxml: tinyxml (A small xml parser)
 tinyxml: 
 tinyxml: TinyXML is a simple, small, C++ XML parser that can be easily
-tinyxml: integrated into other programs.
+tinyxml: integrating into other programs.
 tinyxml: 
 tinyxml: Homepage: http://www.grinninglizard.com/tinyxml/
-tinyxml: 
-tinyxml: 
-tinyxml: 
-tinyxml: 
-tinyxml: 
+tinyxml:
+tinyxml:
+tinyxml:
+tinyxml:
+tinyxml:
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..cfdb0406d9
--- /dev/null
+++ b/libraries/tinyxml/tinyxml-2.5.3-stl.patch
@@ -0,0 +1,12 @@
+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 e17b8a74ba..60da6ecd60 100644
--- a/libraries/tinyxml/tinyxml.SlackBuild
+++ b/libraries/tinyxml/tinyxml.SlackBuild
@@ -7,7 +7,7 @@
 PRGNAM=tinyxml
 VERSION=${VERSION:-2.5.3}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -43,6 +43,9 @@ 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
+
 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
@@ -76,4 +79,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/tinyxml/tinyxml.info b/libraries/tinyxml/tinyxml.info
index 6905e11d7b..bae0448b9e 100644
--- a/libraries/tinyxml/tinyxml.info
+++ b/libraries/tinyxml/tinyxml.info
@@ -3,6 +3,8 @@ VERSION="2.5.3"
 HOMEPAGE="http://www.grinninglizard.com/tinyxml/"
 DOWNLOAD="http://downloads.sourceforge.net/sourceforge/tinyxml/tinyxml_2_5_3.tar.gz"
 MD5SUM="84b605a31628e7f1a6694d47bf5999cc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="pprkut"
-- 
cgit v1.2.3