aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja[at]gmail[dot]com>2010-09-07 10:33:31 -0400
committerdsomero <xgizzmo@slackbuilds.org>2010-09-07 10:33:31 -0400
commit907aa1db32f6f4435991f8ee445fe53c9f815dd6 (patch)
treec7fb4cbe584316ddb5a230885eb5db40f36e1a54
parent270c7783c1dc825f6c51ec6903977891fba90ac0 (diff)
libraries/tinyxml: Patched so filezilla can compile with tinyxml.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/tinyxml/entity.patch64
-rw-r--r--libraries/tinyxml/slack-desc4
-rw-r--r--libraries/tinyxml/tinyxml.SlackBuild6
-rw-r--r--libraries/tinyxml/tinyxml.info2
4 files changed, 72 insertions, 4 deletions
diff --git a/libraries/tinyxml/entity.patch b/libraries/tinyxml/entity.patch
new file mode 100644
index 0000000000000..66d89a61743d5
--- /dev/null
+++ b/libraries/tinyxml/entity.patch
@@ -0,0 +1,64 @@
+? entity.patch
+Index: tinyxml.cpp
+===================================================================
+RCS file: /cvsroot/tinyxml/tinyxml/tinyxml.cpp,v
+retrieving revision 1.105
+diff -u -r1.105 tinyxml.cpp
+--- tinyxml.cpp 5 Jun 2010 19:06:57 -0000 1.105
++++ tinyxml.cpp 19 Jul 2010 21:24:16 -0000
+@@ -57,30 +57,7 @@
+ {
+ unsigned char c = (unsigned char) str[i];
+
+- if ( c == '&'
+- && i < ( (int)str.length() - 2 )
+- && str[i+1] == '#'
+- && str[i+2] == 'x' )
+- {
+- // Hexadecimal character reference.
+- // Pass through unchanged.
+- // &#xA9; -- copyright symbol, for example.
+- //
+- // The -1 is a bug fix from Rob Laveaux. It keeps
+- // an overflow from happening if there is no ';'.
+- // There are actually 2 ways to exit this loop -
+- // while fails (error case) and break (semicolon found).
+- // However, there is no mechanism (currently) for
+- // this function to return an error.
+- while ( i<(int)str.length()-1 )
+- {
+- outString->append( str.c_str() + i, 1 );
+- ++i;
+- if ( str[i] == ';' )
+- break;
+- }
+- }
+- else if ( c == '&' )
++ if ( c == '&' )
+ {
+ outString->append( entity[0].str, entity[0].strLength );
+ ++i;
+Index: xmltest.cpp
+===================================================================
+RCS file: /cvsroot/tinyxml/tinyxml/xmltest.cpp,v
+retrieving revision 1.89
+diff -u -r1.89 xmltest.cpp
+--- xmltest.cpp 5 Jun 2010 17:41:52 -0000 1.89
++++ xmltest.cpp 19 Jul 2010 21:24:16 -0000
+@@ -1340,6 +1340,16 @@
+ }*/
+ }
+
++ #ifdef TIXML_USE_STL
++ {
++ TiXmlDocument xml;
++ xml.Parse("<foo>foo&amp;#xa+bar</foo>");
++ std::string str;
++ str << xml;
++ XmlTest( "Entity escaping", "<foo>foo&amp;#xa+bar</foo>", str.c_str() );
++ }
++ #endif
++
+ /* 1417717 experiment
+ {
+ TiXmlDocument xml;
diff --git a/libraries/tinyxml/slack-desc b/libraries/tinyxml/slack-desc
index a1adbccd9fe37..3c59909138ea2 100644
--- a/libraries/tinyxml/slack-desc
+++ b/libraries/tinyxml/slack-desc
@@ -7,10 +7,10 @@
|-----handy-ruler------------------------------------------------------|
tinyxml: tinyxml (A small xml parser)
-tinyxml:
+tinyxml:
tinyxml: TinyXML is a simple, small, C++ XML parser that can be easily
tinyxml: integrating into other programs.
-tinyxml:
+tinyxml:
tinyxml: Homepage: http://www.grinninglizard.com/tinyxml/
tinyxml:
tinyxml:
diff --git a/libraries/tinyxml/tinyxml.SlackBuild b/libraries/tinyxml/tinyxml.SlackBuild
index 49c6b79b38cd3..3a91683ebb153 100644
--- a/libraries/tinyxml/tinyxml.SlackBuild
+++ b/libraries/tinyxml/tinyxml.SlackBuild
@@ -6,7 +6,7 @@
PRGNAM=tinyxml
VERSION=2.6.1
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -53,6 +53,10 @@ find . \
# Define TINYXML_USE_STL to YES and use custom SLKCFLAGS.
sed -i -e '/^TINYXML_USE_STL/s|=.*|= YES|' -e "s|-O3|$SLKCFLAGS|" Makefile
+# 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
+patch -p0 < $CWD/entity.patch
make
diff --git a/libraries/tinyxml/tinyxml.info b/libraries/tinyxml/tinyxml.info
index 47f925371650b..5ed7b56f39122 100644
--- a/libraries/tinyxml/tinyxml.info
+++ b/libraries/tinyxml/tinyxml.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Larry Hajali"
EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="rworkman"
+APPROVED="dsomero"