Import of pkgsrc-2014Q1

textproc/tinyxml/patches/patch-tinyxml.cpp

@@ -0,0 +1,39 @@
+$NetBSD: patch-tinyxml.cpp,v 1.1 2014/02/16 23:16:05 wiz Exp $
+
+Fix entity encoding. From
+http://sourceforge.net/p/tinyxml/patches/51/
+
+--- tinyxml.cpp.orig	2011-05-15 02:24:57.000000000 +0000
++++ tinyxml.cpp
+@@ -57,30 +57,7 @@ void TiXmlBase::EncodeString( const TIXM
+ 	{
+ 		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;

textproc/tinyxml/patches/patch-tinyxml.h

@@ -0,0 +1,17 @@
+$NetBSD: patch-tinyxml.h,v 1.1 2014/02/16 23:05:33 wiz Exp $
+
+Force the use of STL in tinyxml.h.
+
+--- tinyxml.h~	2011-05-15 04:24:57.000000000 +0200
++++ tinyxml.h	2013-06-20 23:42:16.000000000 +0200
+@@ -26,6 +26,10 @@
+ #ifndef TINYXML_INCLUDED
+ #define TINYXML_INCLUDED
+ 
++#ifndef TIXML_USE_STL
++#	define TIXML_USE_STL
++#endif
++
+ #ifdef _MSC_VER
+ #pragma warning( push )
+ #pragma warning( disable : 4530 )

textproc/tinyxml/patches/patch-xmltest.cpp

@@ -0,0 +1,24 @@
+$NetBSD: patch-xmltest.cpp,v 1.1 2014/02/16 23:16:05 wiz Exp $
+
+Fix entity encoding. From
+http://sourceforge.net/p/tinyxml/patches/51/
+
+--- xmltest.cpp.orig	2011-05-15 02:24:57.000000000 +0000
++++ xmltest.cpp
+@@ -1366,6 +1366,16 @@ int main()
+ 		}*/
+ 	}
+ 
++	#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;