[arch-commits] Commit in tinyxml/repos/community-x86_64 (8 files)

Allan McRae allan at gemini.archlinux.org
Mon Apr 25 02:39:51 UTC 2022


    Date: Monday, April 25, 2022 @ 02:39:50
  Author: allan
Revision: 1189828

archrelease: copy trunk to community-x86_64

Added:
  tinyxml/repos/community-x86_64/PKGBUILD
    (from rev 1189827, tinyxml/trunk/PKGBUILD)
  tinyxml/repos/community-x86_64/entity.patch
    (from rev 1189827, tinyxml/trunk/entity.patch)
  tinyxml/repos/community-x86_64/tinyxml-2.5.3-stl.patch
    (from rev 1189827, tinyxml/trunk/tinyxml-2.5.3-stl.patch)
  tinyxml/repos/community-x86_64/tinyxml.pc
    (from rev 1189827, tinyxml/trunk/tinyxml.pc)
Deleted:
  tinyxml/repos/community-x86_64/PKGBUILD
  tinyxml/repos/community-x86_64/entity.patch
  tinyxml/repos/community-x86_64/tinyxml-2.5.3-stl.patch
  tinyxml/repos/community-x86_64/tinyxml.pc

-------------------------+
 PKGBUILD                |  114 ++++++++++++++++++++--------------------
 entity.patch            |  128 +++++++++++++++++++++++-----------------------
 tinyxml-2.5.3-stl.patch |   24 ++++----
 tinyxml.pc              |   20 +++----
 4 files changed, 143 insertions(+), 143 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-25 02:39:21 UTC (rev 1189827)
+++ PKGBUILD	2022-04-25 02:39:50 UTC (rev 1189828)
@@ -1,57 +0,0 @@
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <barthalion at gmail.com>
-# Contributor: Larry Hajali <larryhaja[at]gmail[dot]com>
-# Contributor: Hubert Grzeskowiak <arch at nemesis13 dot de>
-
-pkgname=tinyxml
-pkgver=2.6.2
-pkgrel=8
-pkgdesc='Simple, small XML parser'
-url='http://grinninglizard.com/tinyxml/'
-arch=(x86_64)
-license=(zlib)
-makedepends=(setconf)
-source=("https://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver//./_}.tar.gz"
-        entity.patch
-        $pkgname-2.5.3-stl.patch
-        $pkgname.pc)
-b2sums=('84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77'
-        'e8430b2fea965f351c12a0413c3bba43ce19da7e8a0973fae3c7db4b4a8978cbc8b74beb495dd9141e79e90f9ad012b6b5e738207f8075ad7001cb85b424f5be'
-        'e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8'
-        '8d7658c143ccc3ebe226f3dfdf96ec96de94bca4168e77c560ec4bea41c5d78245c4a3cdf1f4126361f9214176bfb362a6c8377404ccf2a4c999c3f0d491930c')
-
-prepare() {
-  cd $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 $pkgname
-
-  make
-  g++ -fPIC $CXXFLAGS $LDFLAGS -shared -o "lib$pkgname.so.0.$pkgver" \
-      -Wl,-soname,"lib$pkgname.so.0" $(ls *.o | grep -v xmltest)
-}
-
-package() {
-  cd $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
-}

Copied: tinyxml/repos/community-x86_64/PKGBUILD (from rev 1189827, tinyxml/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-25 02:39:50 UTC (rev 1189828)
@@ -0,0 +1,57 @@
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <barthalion at gmail.com>
+# Contributor: Larry Hajali <larryhaja[at]gmail[dot]com>
+# Contributor: Hubert Grzeskowiak <arch at nemesis13 dot de>
+
+pkgname=tinyxml
+pkgver=2.6.2
+pkgrel=9
+pkgdesc='Simple, small XML parser'
+url='http://grinninglizard.com/tinyxml/'
+arch=(x86_64)
+license=(zlib)
+makedepends=(setconf)
+source=("https://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver//./_}.tar.gz"
+        entity.patch
+        $pkgname-2.5.3-stl.patch
+        $pkgname.pc)
+b2sums=('84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77'
+        'e8430b2fea965f351c12a0413c3bba43ce19da7e8a0973fae3c7db4b4a8978cbc8b74beb495dd9141e79e90f9ad012b6b5e738207f8075ad7001cb85b424f5be'
+        'e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8'
+        '8d7658c143ccc3ebe226f3dfdf96ec96de94bca4168e77c560ec4bea41c5d78245c4a3cdf1f4126361f9214176bfb362a6c8377404ccf2a4c999c3f0d491930c')
+
+prepare() {
+  cd $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 $pkgname
+
+  make
+  g++ -fPIC $CXXFLAGS $LDFLAGS -shared -o "lib$pkgname.so.0.$pkgver" \
+      -Wl,-soname,"lib$pkgname.so.0" $(ls *.o | grep -v xmltest)
+}
+
+package() {
+  cd $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
+}

Deleted: entity.patch
===================================================================
--- entity.patch	2022-04-25 02:39:21 UTC (rev 1189827)
+++ entity.patch	2022-04-25 02:39:50 UTC (rev 1189828)
@@ -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.
--			// &#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&#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 1189827, tinyxml/trunk/entity.patch)
===================================================================
--- entity.patch	                        (rev 0)
+++ entity.patch	2022-04-25 02:39:50 UTC (rev 1189828)
@@ -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&#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: tinyxml-2.5.3-stl.patch
===================================================================
--- tinyxml-2.5.3-stl.patch	2022-04-25 02:39:21 UTC (rev 1189827)
+++ tinyxml-2.5.3-stl.patch	2022-04-25 02:39:50 UTC (rev 1189828)
@@ -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 1189827, tinyxml/trunk/tinyxml-2.5.3-stl.patch)
===================================================================
--- tinyxml-2.5.3-stl.patch	                        (rev 0)
+++ tinyxml-2.5.3-stl.patch	2022-04-25 02:39:50 UTC (rev 1189828)
@@ -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 )

Deleted: tinyxml.pc
===================================================================
--- tinyxml.pc	2022-04-25 02:39:21 UTC (rev 1189827)
+++ tinyxml.pc	2022-04-25 02:39:50 UTC (rev 1189828)
@@ -1,10 +0,0 @@
-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}

Copied: tinyxml/repos/community-x86_64/tinyxml.pc (from rev 1189827, tinyxml/trunk/tinyxml.pc)
===================================================================
--- tinyxml.pc	                        (rev 0)
+++ tinyxml.pc	2022-04-25 02:39:50 UTC (rev 1189828)
@@ -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}



More information about the arch-commits mailing list