mirror of https://gitee.com/openkylin/tinyxml.git
Import Debian changes 2.6.2-ok1
tinyxml (2.6.2-ok1) yangtze; urgency=medium * Build for openKylin.
This commit is contained in:
parent
697f300f00
commit
8fcf9df390
|
@ -0,0 +1,5 @@
|
||||||
|
tinyxml (2.6.2-ok1) yangtze; urgency=medium
|
||||||
|
|
||||||
|
* Build for openKylin.
|
||||||
|
|
||||||
|
-- openKylinBot <openKylinBot@openkylin.com> Mon, 25 Apr 2022 22:03:04 +0800
|
|
@ -0,0 +1 @@
|
||||||
|
9
|
|
@ -0,0 +1,67 @@
|
||||||
|
Source: tinyxml
|
||||||
|
Section: libs
|
||||||
|
Priority: optional
|
||||||
|
Maintainer: Felix Geyer <fgeyer@debian.org>
|
||||||
|
Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~)
|
||||||
|
Standards-Version: 3.9.4
|
||||||
|
Homepage: http://www.grinninglizard.com/tinyxml/
|
||||||
|
Vcs-Git: https://anonscm.debian.org/git/collab-maint/tinyxml.git
|
||||||
|
Vcs-Browser: https://anonscm.debian.org/git/collab-maint/tinyxml.git
|
||||||
|
|
||||||
|
Package: libtinyxml2.6.2v5
|
||||||
|
Architecture: any
|
||||||
|
Multi-Arch: same
|
||||||
|
Pre-Depends: ${misc:Pre-Depends}
|
||||||
|
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||||
|
Conflicts: libtinyxml2.6.2
|
||||||
|
Replaces: libtinyxml2.6.2
|
||||||
|
Description: C++ XML parsing library
|
||||||
|
This package contains the shared version of the TinyXml library.
|
||||||
|
.
|
||||||
|
TinyXml is a simple and small C++ XML parser that can be easily integrating
|
||||||
|
into other programs. It reads XML and creates C++ objects representing
|
||||||
|
the XML document. The objects can be manipulated, changed, and
|
||||||
|
saved again as XML.
|
||||||
|
|
||||||
|
Package: libtinyxml2.6.2v5-dbg
|
||||||
|
Section: debug
|
||||||
|
Priority: extra
|
||||||
|
Architecture: any
|
||||||
|
Multi-Arch: same
|
||||||
|
Depends: ${misc:Depends}, libtinyxml2.6.2v5 (= ${binary:Version})
|
||||||
|
Description: TinyXml library - debug files
|
||||||
|
This package contains debug symbols of the TinyXml library.
|
||||||
|
.
|
||||||
|
TinyXml is a simple and small C++ XML parser that can be easily integrating
|
||||||
|
into other programs. It reads XML and creates C++ objects representing
|
||||||
|
the XML document. The objects can be manipulated, changed, and
|
||||||
|
saved again as XML.
|
||||||
|
|
||||||
|
Package: libtinyxml-dev
|
||||||
|
Section: libdevel
|
||||||
|
Architecture: any
|
||||||
|
Multi-Arch: same
|
||||||
|
Depends: ${misc:Depends}, libtinyxml2.6.2v5 (= ${binary:Version})
|
||||||
|
Suggests: libtinyxml-doc
|
||||||
|
Description: TinyXml library - header and static library
|
||||||
|
This package contains the header file and a static version of the
|
||||||
|
TinyXml library.
|
||||||
|
.
|
||||||
|
TinyXml is a simple and small C++ XML parser that can be easily integrating
|
||||||
|
into other programs. It reads XML and creates C++ objects representing
|
||||||
|
the XML document. The objects can be manipulated, changed, and
|
||||||
|
saved again as XML.
|
||||||
|
|
||||||
|
Package: libtinyxml-doc
|
||||||
|
Section: doc
|
||||||
|
Priority: extra
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Recommends: libtinyxml-dev
|
||||||
|
Description: TinyXml library - documentation files
|
||||||
|
This package contains the documentation to program with the TinyXml library.
|
||||||
|
.
|
||||||
|
TinyXml is a simple and small C++ XML parser that can be easily integrating
|
||||||
|
into other programs. It reads XML and creates C++ objects representing
|
||||||
|
the XML document. The objects can be manipulated, changed, and
|
||||||
|
saved again as XML.
|
|
@ -0,0 +1,39 @@
|
||||||
|
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
|
||||||
|
Name: TinyXml
|
||||||
|
Maintainer: Lee Thomason <leethomason@mindspring.com>
|
||||||
|
Source: http://sourceforge.net/projects/tinyxml/
|
||||||
|
|
||||||
|
Files: *
|
||||||
|
Copyright: 2000-2007, Lee Thomason <leethomason@mindspring.com>
|
||||||
|
2002-2004, Yves Berquin <yvesb@users.sourceforge.net>
|
||||||
|
License: ZLIB
|
||||||
|
|
||||||
|
Files: tinystr.*
|
||||||
|
Copyright: 2000-2007, Lee Thomason <leethomason@mindspring.com>
|
||||||
|
2002-2004, Yves Berquin <yvesb@users.sourceforge.net>
|
||||||
|
2005, Tyge Lovset
|
||||||
|
License: ZLIB
|
||||||
|
|
||||||
|
Files: debian/*
|
||||||
|
Copyright: 2009-2010, Felix Geyer <debfx-pkg@fobos.de>
|
||||||
|
License: ZLIB
|
||||||
|
|
||||||
|
License: ZLIB
|
||||||
|
This software is provided 'as-is', without any express or implied
|
||||||
|
warranty. In no event will the authors be held liable for any
|
||||||
|
damages arising from the use of this software.
|
||||||
|
.
|
||||||
|
Permission is granted to anyone to use this software for any
|
||||||
|
purpose, including commercial applications, and to alter it and
|
||||||
|
redistribute it freely, subject to the following restrictions:
|
||||||
|
.
|
||||||
|
1. The origin of this software must not be misrepresented; you must
|
||||||
|
not claim that you wrote the original software. If you use this
|
||||||
|
software in a product, an acknowledgment in the product documentation
|
||||||
|
would be appreciated but is not required.
|
||||||
|
.
|
||||||
|
2. Altered source versions must be plainly marked as such, and
|
||||||
|
must not be misrepresented as being the original software.
|
||||||
|
.
|
||||||
|
3. This notice may not be removed or altered from any source
|
||||||
|
distribution.
|
|
@ -0,0 +1,2 @@
|
||||||
|
[DEFAULT]
|
||||||
|
pristine-tar = True
|
|
@ -0,0 +1,4 @@
|
||||||
|
usr/include/tinyxml.h
|
||||||
|
usr/lib/*/libtinyxml.a
|
||||||
|
usr/lib/*/libtinyxml.so
|
||||||
|
usr/lib/*/pkgconfig/tinyxml.pc
|
|
@ -0,0 +1 @@
|
||||||
|
docs
|
|
@ -0,0 +1 @@
|
||||||
|
usr/lib/*/libtinyxml.so.*
|
|
@ -0,0 +1,18 @@
|
||||||
|
Description: TinyXml is built with TIXML_USE_STL, so we have to
|
||||||
|
enforce it when the library is used.
|
||||||
|
Author: Felix Geyer <debfx-pkg@fobos.de>
|
||||||
|
|
||||||
|
diff -Nur tinyxml-2.5.3/tinyxml.h tinyxml-2.5.3.patch/tinyxml.h
|
||||||
|
--- tinyxml-2.5.3/tinyxml.h 2007-05-07 00:41:23.000000000 +0200
|
||||||
|
+++ tinyxml-2.5.3.patch/tinyxml.h 2009-07-08 22:32:03.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 )
|
|
@ -0,0 +1,58 @@
|
||||||
|
Description: TinyXML incorrectly encodes text element containing an ampersand followed by either x or #.
|
||||||
|
Origin: http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
|
||||||
|
|
||||||
|
diff -u -r1.105 tinyxml.cpp
|
||||||
|
--- a/tinyxml.cpp
|
||||||
|
+++ b/tinyxml.cpp
|
||||||
|
@@ -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;
|
||||||
|
diff -u -r1.89 xmltest.cpp
|
||||||
|
--- a/xmltest.cpp
|
||||||
|
+++ b/xmltest.cpp
|
||||||
|
@@ -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;
|
|
@ -0,0 +1,2 @@
|
||||||
|
enforce-use-stl.patch
|
||||||
|
entity-encoding.patch
|
|
@ -0,0 +1,53 @@
|
||||||
|
#!/usr/bin/make -f
|
||||||
|
|
||||||
|
include /usr/share/dpkg/default.mk
|
||||||
|
ifeq ($(origin CXX),default)
|
||||||
|
CXX = $(DEB_HOST_GNU_TYPE)-g++
|
||||||
|
endif
|
||||||
|
|
||||||
|
CXXFLAGS += -DTIXML_USE_STL
|
||||||
|
|
||||||
|
OBJ_FILES := tinyxml.o tinyxmlparser.o tinyxmlerror.o
|
||||||
|
|
||||||
|
%:
|
||||||
|
dh $@ --parallel
|
||||||
|
|
||||||
|
override_dh_auto_build:
|
||||||
|
dh_auto_build -- CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CXX="$(CXX)" LD="$(CXX)"
|
||||||
|
$(DEB_HOST_GNU_TYPE)-ar rc libtinyxml.a $(OBJ_FILES)
|
||||||
|
rm *.o xmltest
|
||||||
|
|
||||||
|
dh_auto_build -- CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS) -fPIC" LDFLAGS="$(LDFLAGS)" CXX="$(CXX)" LD="$(CXX)"
|
||||||
|
$(CXX) -shared -Wl,-soname,libtinyxml.so.$(DEB_VERSION_UPSTREAM) \
|
||||||
|
-o libtinyxml.so.$(DEB_VERSION_UPSTREAM) $(LDFLAGS) \
|
||||||
|
$(OBJ_FILES)
|
||||||
|
|
||||||
|
override_dh_auto_install:
|
||||||
|
mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
|
||||||
|
mkdir -p debian/tmp/usr/include
|
||||||
|
install -m 644 -p libtinyxml.so.$(DEB_VERSION_UPSTREAM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
|
||||||
|
ln -f -s libtinyxml.so.$(DEB_VERSION_UPSTREAM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libtinyxml.so
|
||||||
|
install -m 644 -p libtinyxml.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
|
||||||
|
install -m 644 -p tinyxml.h debian/tmp/usr/include/
|
||||||
|
sed -e 's/\$${DEB_HOST_MULTIARCH}/$(DEB_HOST_MULTIARCH)/' -e 's/\$${DEB_VERSION_UPSTREAM}/$(DEB_VERSION_UPSTREAM)/' \
|
||||||
|
debian/tinyxml.pc.in > debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tinyxml.pc
|
||||||
|
|
||||||
|
ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
|
||||||
|
override_dh_auto_test:
|
||||||
|
rm -rf xmltestdir
|
||||||
|
mkdir xmltestdir
|
||||||
|
cp -a utf8test*.xml xmltestdir
|
||||||
|
cd xmltestdir && ../xmltest
|
||||||
|
rm -rf xmltestdir
|
||||||
|
endif
|
||||||
|
|
||||||
|
override_dh_auto_clean:
|
||||||
|
dh_auto_clean
|
||||||
|
rm -f libtinyxml.so* libtinyxml.a
|
||||||
|
rm -rf xmltestdir
|
||||||
|
|
||||||
|
override_dh_strip:
|
||||||
|
dh_strip --dbg-package=libtinyxml$(DEB_VERSION_UPSTREAM)v5-dbg
|
||||||
|
|
||||||
|
override_dh_install:
|
||||||
|
dh_install --fail-missing
|
|
@ -0,0 +1 @@
|
||||||
|
3.0 (quilt)
|
|
@ -0,0 +1,10 @@
|
||||||
|
prefix=/usr
|
||||||
|
exec_prefix=${prefix}
|
||||||
|
libdir=${exec_prefix}/lib/${DEB_HOST_MULTIARCH}
|
||||||
|
includedir=${prefix}/include
|
||||||
|
|
||||||
|
Name: TinyXml
|
||||||
|
Description: simple, small, C++ XML parser
|
||||||
|
Version: ${DEB_VERSION_UPSTREAM}
|
||||||
|
Libs: -L${libdir} -ltinyxml
|
||||||
|
Cflags: -I${includedir}
|
|
@ -0,0 +1,2 @@
|
||||||
|
version=3
|
||||||
|
http://sf.net/tinyxml/ tinyxml_(\d+)_(\d+)_(\d+).tar.gz
|
Loading…
Reference in New Issue