Date: Sunday, April 21, 2013 @ 15:06:07
Author: arodseth
Revision: 88660
archrelease: copy trunk to community-x86_64, community-i686
Added:
tinyxml/repos/community-i686/PKGBUILD
(from rev 88659, tinyxml/trunk/PKGBUILD)
tinyxml/repos/community-i686/entity.patch
(from rev 88659, tinyxml/trunk/entity.patch)
tinyxml/repos/community-i686/tinyxml-2.5.3-stl.patch
(from rev 88659, tinyxml/trunk/tinyxml-2.5.3-stl.patch)
tinyxml/repos/community-i686/tinyxml.pc
(from rev 88659, tinyxml/trunk/tinyxml.pc)
tinyxml/repos/community-x86_64/PKGBUILD
(from rev 88659, tinyxml/trunk/PKGBUILD)
tinyxml/repos/community-x86_64/entity.patch
(from rev 88659, tinyxml/trunk/entity.patch)
tinyxml/repos/community-x86_64/tinyxml-2.5.3-stl.patch
(from rev 88659, tinyxml/trunk/tinyxml-2.5.3-stl.patch)
tinyxml/repos/community-x86_64/tinyxml.pc
(from rev 88659, tinyxml/trunk/tinyxml.pc)
Deleted:
tinyxml/repos/community-i686/PKGBUILD
tinyxml/repos/community-i686/entity.patch
tinyxml/repos/community-i686/tinyxml-2.5.3-stl.patch
tinyxml/repos/community-x86_64/PKGBUILD
tinyxml/repos/community-x86_64/entity.patch
tinyxml/repos/community-x86_64/tinyxml-2.5.3-stl.patch
------------------------------------------+
/PKGBUILD | 124 ++++++++++++++++++++++++++++
/entity.patch | 128 +++++++++++++++++++++++++++++
/tinyxml-2.5.3-stl.patch | 24 +++++
community-i686/PKGBUILD | 51 -----------
community-i686/entity.patch | 64 --------------
community-i686/tinyxml-2.5.3-stl.patch | 12 --
community-i686/tinyxml.pc | 10 ++
community-x86_64/PKGBUILD | 51 -----------
community-x86_64/entity.patch | 64 --------------
community-x86_64/tinyxml-2.5.3-stl.patch | 12 --
community-x86_64/tinyxml.pc | 10 ++
11 files changed, 296 insertions(+), 254 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-04-21 13:05:51 UTC (rev 88659)
+++ community-i686/PKGBUILD 2013-04-21 13:06:07 UTC (rev 88660)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <[email protected]>
-# Contributor: Larry Hajali <larryhaja[at]gmail[dot]com>
-# Contributor: Hubert Grzeskowiak <arch at nemesis13 dot de>
-
-pkgname=tinyxml
-pkgver=2.6.2
-pkgrel=2
-pkgdesc="A simple, small, C++ XML parser that can be easily integrated into
other programs."
-url='http://www.grinninglizard.com/tinyxml/'
-arch=('i686' 'x86_64')
-license=('zlib')
-depends=('gcc-libs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_${pkgver//./_}.tar.gz";
- 'entity.patch'
- 'tinyxml-2.5.3-stl.patch')
-md5sums=('c1b864c96804a10526540c664ade67f0'
- 'b6cc2d9330707373d920f760793c6311'
- '6db8334398e0cdad7e3c6406206ff42a')
-
-build() {
- cd "$srcdir"/$pkgname
-
- # Fix entity encoding.
- patch -p0 < "$srcdir"/entity.patch
-
- # Make TINYXML_USE_STL permanently defined in tinyxml.h
- patch -p1 < "$srcdir"/$pkgname-2.5.3-stl.patch
-
- # Fix Makefile
- sed -i \
- -e '/^TINYXML_USE_STL/ s|=.*|=YES|' \
- -e "s|^RELEASE_CFLAGS.*|& ${CXXFLAGS} -fPIC|" Makefile
-
- make
- g++ -fPIC ${CXXFLAGS} -shared -o lib${pkgname}.so.0.$pkgver \
- -Wl,-soname,lib${pkgname}.so.0 $(ls *.o | grep -v xmltest)
-}
-
-package() {
- cd "$srcdir"/$pkgname
-
- install -d -m 0755 "$pkgdir"/usr/{lib,include}
- install -m 0755 lib${pkgname}.so.0.$pkgver "$pkgdir"/usr/lib/
- install -m 0644 $pkgname.h tinystr.h "$pkgdir"/usr/include
-
- (cd "$pkgdir"/usr/lib
- ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so.0
- ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so
- )
-}
Copied: tinyxml/repos/community-i686/PKGBUILD (from rev 88659,
tinyxml/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-04-21 13:06:07 UTC (rev 88660)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Alexander Rødseth <[email protected]>
+# Contributor: Bartłomiej Piotrowski <[email protected]>
+# Contributor: Larry Hajali <larryhaja[at]gmail[dot]com>
+# Contributor: Hubert Grzeskowiak <arch at nemesis13 dot de>
+
+pkgname=tinyxml
+pkgver=2.6.2
+pkgrel=3
+pkgdesc='Simple, small, C++ XML parser that can be easily integrated into
other programs'
+url="http://www.grinninglizard.com/tinyxml/";
+arch=('x86_64' 'i686')
+license=('zlib')
+depends=('gcc-libs')
+makedepends=('setconf')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_${pkgver//./_}.tar.gz";
+ 'entity.patch'
+ "$pkgname-2.5.3-stl.patch"
+ "$pkgname.pc")
+sha256sums=('15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593'
+ 'ef493209b0a51160171fd834a7ecdddd02679463b85fb89a2ea254213e47f99b'
+ '3baf2c4dbc2c8f54a151dac8860113d2f549174f83ed85d552b094dfaebb52af'
+ '0e37a568eaebb8f0644f148a3d3efa921ac518217e1c0de46c2859d26516bcc4')
+
+prepare() {
+ cd "$srcdir/$pkgname"
+
+ # Fix entity encoding.
+ patch -p0 -i "$srcdir"/entity.patch
+
+ # Make TINYXML_USE_STL permanently defined in tinyxml.h
+ patch -p1 -i "$srcdir"/$pkgname-2.5.3-stl.patch
+
+ # Fix Makefile
+ setconf Makefile TINYXML_USE_STL YES
+ setconf Makefile RELEASE_CFLAGS "$CXXFLAGS -fPIC"
+}
+
+build() {
+ cd "$srcdir/$pkgname"
+
+ make
+ g++ -fPIC "$CXXFLAGS" -shared -o "lib${pkgname}.so.0.$pkgver" \
+ -Wl,-soname,"lib${pkgname}.so.0" $(ls *.o | grep -v xmltest)
+}
+
+package() {
+ cd "$srcdir/$pkgname"
+
+ install -d -m 0755 "$pkgdir"/usr/{lib,include}
+ install -m 0755 "lib${pkgname}.so.0.$pkgver" "$pkgdir"/usr/lib/
+ install -m 0644 "$pkgname.h" tinystr.h "$pkgdir"/usr/include
+ install -Dm644 readme.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc"
+
+ (cd "$pkgdir/usr/lib"
+ ln -s "lib${pkgname}.so.0.$pkgver" "lib${pkgname}.so.0"
+ ln -s "lib${pkgname}.so.0.$pkgver" "lib${pkgname}.so"
+ )
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/entity.patch
===================================================================
--- community-i686/entity.patch 2013-04-21 13:05:51 UTC (rev 88659)
+++ community-i686/entity.patch 2013-04-21 13:06:07 UTC (rev 88660)
@@ -1,64 +0,0 @@
-? 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.
-- // © -- 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&#xa+bar</foo>");
-+ std::string str;
-+ str << xml;
-+ XmlTest( "Entity escaping", "<foo>foo&#xa+bar</foo>",
str.c_str() );
-+ }
-+ #endif
-+
- /* 1417717 experiment
- {
- TiXmlDocument xml;
Copied: tinyxml/repos/community-i686/entity.patch (from rev 88659,
tinyxml/trunk/entity.patch)
===================================================================
--- community-i686/entity.patch (rev 0)
+++ community-i686/entity.patch 2013-04-21 13:06:07 UTC (rev 88660)
@@ -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.
+- // © -- 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&#xa+bar</foo>");
++ std::string str;
++ str << xml;
++ XmlTest( "Entity escaping", "<foo>foo&#xa+bar</foo>",
str.c_str() );
++ }
++ #endif
++
+ /* 1417717 experiment
+ {
+ TiXmlDocument xml;
Deleted: community-i686/tinyxml-2.5.3-stl.patch
===================================================================
--- community-i686/tinyxml-2.5.3-stl.patch 2013-04-21 13:05:51 UTC (rev
88659)
+++ community-i686/tinyxml-2.5.3-stl.patch 2013-04-21 13:06:07 UTC (rev
88660)
@@ -1,12 +0,0 @@
-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 )
Copied: tinyxml/repos/community-i686/tinyxml-2.5.3-stl.patch (from rev 88659,
tinyxml/trunk/tinyxml-2.5.3-stl.patch)
===================================================================
--- community-i686/tinyxml-2.5.3-stl.patch (rev 0)
+++ community-i686/tinyxml-2.5.3-stl.patch 2013-04-21 13:06:07 UTC (rev
88660)
@@ -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 )
Copied: tinyxml/repos/community-i686/tinyxml.pc (from rev 88659,
tinyxml/trunk/tinyxml.pc)
===================================================================
--- community-i686/tinyxml.pc (rev 0)
+++ community-i686/tinyxml.pc 2013-04-21 13:06:07 UTC (rev 88660)
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: TinyXml
+Description: simple, small, C++ XML parser
+Version: 2.6.2
+Libs: -L${libdir} -ltinyxml
+Cflags: -I${includedir}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-04-21 13:05:51 UTC (rev 88659)
+++ community-x86_64/PKGBUILD 2013-04-21 13:06:07 UTC (rev 88660)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <[email protected]>
-# Contributor: Larry Hajali <larryhaja[at]gmail[dot]com>
-# Contributor: Hubert Grzeskowiak <arch at nemesis13 dot de>
-
-pkgname=tinyxml
-pkgver=2.6.2
-pkgrel=2
-pkgdesc="A simple, small, C++ XML parser that can be easily integrated into
other programs."
-url='http://www.grinninglizard.com/tinyxml/'
-arch=('i686' 'x86_64')
-license=('zlib')
-depends=('gcc-libs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_${pkgver//./_}.tar.gz";
- 'entity.patch'
- 'tinyxml-2.5.3-stl.patch')
-md5sums=('c1b864c96804a10526540c664ade67f0'
- 'b6cc2d9330707373d920f760793c6311'
- '6db8334398e0cdad7e3c6406206ff42a')
-
-build() {
- cd "$srcdir"/$pkgname
-
- # Fix entity encoding.
- patch -p0 < "$srcdir"/entity.patch
-
- # Make TINYXML_USE_STL permanently defined in tinyxml.h
- patch -p1 < "$srcdir"/$pkgname-2.5.3-stl.patch
-
- # Fix Makefile
- sed -i \
- -e '/^TINYXML_USE_STL/ s|=.*|=YES|' \
- -e "s|^RELEASE_CFLAGS.*|& ${CXXFLAGS} -fPIC|" Makefile
-
- make
- g++ -fPIC ${CXXFLAGS} -shared -o lib${pkgname}.so.0.$pkgver \
- -Wl,-soname,lib${pkgname}.so.0 $(ls *.o | grep -v xmltest)
-}
-
-package() {
- cd "$srcdir"/$pkgname
-
- install -d -m 0755 "$pkgdir"/usr/{lib,include}
- install -m 0755 lib${pkgname}.so.0.$pkgver "$pkgdir"/usr/lib/
- install -m 0644 $pkgname.h tinystr.h "$pkgdir"/usr/include
-
- (cd "$pkgdir"/usr/lib
- ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so.0
- ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so
- )
-}
Copied: tinyxml/repos/community-x86_64/PKGBUILD (from rev 88659,
tinyxml/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-04-21 13:06:07 UTC (rev 88660)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Alexander Rødseth <[email protected]>
+# Contributor: Bartłomiej Piotrowski <[email protected]>
+# Contributor: Larry Hajali <larryhaja[at]gmail[dot]com>
+# Contributor: Hubert Grzeskowiak <arch at nemesis13 dot de>
+
+pkgname=tinyxml
+pkgver=2.6.2
+pkgrel=3
+pkgdesc='Simple, small, C++ XML parser that can be easily integrated into
other programs'
+url="http://www.grinninglizard.com/tinyxml/";
+arch=('x86_64' 'i686')
+license=('zlib')
+depends=('gcc-libs')
+makedepends=('setconf')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_${pkgver//./_}.tar.gz";
+ 'entity.patch'
+ "$pkgname-2.5.3-stl.patch"
+ "$pkgname.pc")
+sha256sums=('15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593'
+ 'ef493209b0a51160171fd834a7ecdddd02679463b85fb89a2ea254213e47f99b'
+ '3baf2c4dbc2c8f54a151dac8860113d2f549174f83ed85d552b094dfaebb52af'
+ '0e37a568eaebb8f0644f148a3d3efa921ac518217e1c0de46c2859d26516bcc4')
+
+prepare() {
+ cd "$srcdir/$pkgname"
+
+ # Fix entity encoding.
+ patch -p0 -i "$srcdir"/entity.patch
+
+ # Make TINYXML_USE_STL permanently defined in tinyxml.h
+ patch -p1 -i "$srcdir"/$pkgname-2.5.3-stl.patch
+
+ # Fix Makefile
+ setconf Makefile TINYXML_USE_STL YES
+ setconf Makefile RELEASE_CFLAGS "$CXXFLAGS -fPIC"
+}
+
+build() {
+ cd "$srcdir/$pkgname"
+
+ make
+ g++ -fPIC "$CXXFLAGS" -shared -o "lib${pkgname}.so.0.$pkgver" \
+ -Wl,-soname,"lib${pkgname}.so.0" $(ls *.o | grep -v xmltest)
+}
+
+package() {
+ cd "$srcdir/$pkgname"
+
+ install -d -m 0755 "$pkgdir"/usr/{lib,include}
+ install -m 0755 "lib${pkgname}.so.0.$pkgver" "$pkgdir"/usr/lib/
+ install -m 0644 "$pkgname.h" tinystr.h "$pkgdir"/usr/include
+ install -Dm644 readme.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc"
+
+ (cd "$pkgdir/usr/lib"
+ ln -s "lib${pkgname}.so.0.$pkgver" "lib${pkgname}.so.0"
+ ln -s "lib${pkgname}.so.0.$pkgver" "lib${pkgname}.so"
+ )
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/entity.patch
===================================================================
--- community-x86_64/entity.patch 2013-04-21 13:05:51 UTC (rev 88659)
+++ community-x86_64/entity.patch 2013-04-21 13:06:07 UTC (rev 88660)
@@ -1,64 +0,0 @@
-? 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.
-- // © -- 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&#xa+bar</foo>");
-+ std::string str;
-+ str << xml;
-+ XmlTest( "Entity escaping", "<foo>foo&#xa+bar</foo>",
str.c_str() );
-+ }
-+ #endif
-+
- /* 1417717 experiment
- {
- TiXmlDocument xml;
Copied: tinyxml/repos/community-x86_64/entity.patch (from rev 88659,
tinyxml/trunk/entity.patch)
===================================================================
--- community-x86_64/entity.patch (rev 0)
+++ community-x86_64/entity.patch 2013-04-21 13:06:07 UTC (rev 88660)
@@ -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.
+- // © -- 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&#xa+bar</foo>");
++ std::string str;
++ str << xml;
++ XmlTest( "Entity escaping", "<foo>foo&#xa+bar</foo>",
str.c_str() );
++ }
++ #endif
++
+ /* 1417717 experiment
+ {
+ TiXmlDocument xml;
Deleted: community-x86_64/tinyxml-2.5.3-stl.patch
===================================================================
--- community-x86_64/tinyxml-2.5.3-stl.patch 2013-04-21 13:05:51 UTC (rev
88659)
+++ community-x86_64/tinyxml-2.5.3-stl.patch 2013-04-21 13:06:07 UTC (rev
88660)
@@ -1,12 +0,0 @@
-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 )
Copied: tinyxml/repos/community-x86_64/tinyxml-2.5.3-stl.patch (from rev 88659,
tinyxml/trunk/tinyxml-2.5.3-stl.patch)
===================================================================
--- community-x86_64/tinyxml-2.5.3-stl.patch (rev 0)
+++ community-x86_64/tinyxml-2.5.3-stl.patch 2013-04-21 13:06:07 UTC (rev
88660)
@@ -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 )
Copied: tinyxml/repos/community-x86_64/tinyxml.pc (from rev 88659,
tinyxml/trunk/tinyxml.pc)
===================================================================
--- community-x86_64/tinyxml.pc (rev 0)
+++ community-x86_64/tinyxml.pc 2013-04-21 13:06:07 UTC (rev 88660)
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: TinyXml
+Description: simple, small, C++ XML parser
+Version: 2.6.2
+Libs: -L${libdir} -ltinyxml
+Cflags: -I${includedir}
