From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-libs/tinyxml/Manifest | 8 +++ dev-libs/tinyxml/files/Makefile-3 | 44 +++++++++++++++ dev-libs/tinyxml/files/tinyxml-2.6.1-entity.patch | 64 ++++++++++++++++++++++ .../tinyxml/files/tinyxml-2.6.2-defineSTL.patch | 12 ++++ dev-libs/tinyxml/files/tinyxml.pc.patch | 14 +++++ dev-libs/tinyxml/metadata.xml | 14 +++++ dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild | 52 ++++++++++++++++++ dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild | 61 +++++++++++++++++++++ 8 files changed, 269 insertions(+) create mode 100644 dev-libs/tinyxml/Manifest create mode 100644 dev-libs/tinyxml/files/Makefile-3 create mode 100644 dev-libs/tinyxml/files/tinyxml-2.6.1-entity.patch create mode 100644 dev-libs/tinyxml/files/tinyxml-2.6.2-defineSTL.patch create mode 100644 dev-libs/tinyxml/files/tinyxml.pc.patch create mode 100644 dev-libs/tinyxml/metadata.xml create mode 100644 dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild create mode 100644 dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild (limited to 'dev-libs/tinyxml') diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest new file mode 100644 index 000000000000..a58a37748e80 --- /dev/null +++ b/dev-libs/tinyxml/Manifest @@ -0,0 +1,8 @@ +AUX Makefile-3 1054 BLAKE2B 30f94d5ec66a4ab11703c53caccec0ac34a034686dddab9595d9ca2892fbf68b603035f6b80c1d47219c7ca6aeff43830a4096ec1d36fc8d00c19468cf59c1a6 SHA512 81b05e25341095444d0112fe58840d334a14f754cdc0e907b468484655008de026a4b96947de98d009a4a54d84af121ee0a663075fe0ad727894d3aa432426e2 +AUX tinyxml-2.6.1-entity.patch 1776 BLAKE2B e8430b2fea965f351c12a0413c3bba43ce19da7e8a0973fae3c7db4b4a8978cbc8b74beb495dd9141e79e90f9ad012b6b5e738207f8075ad7001cb85b424f5be SHA512 e03f4bdfb80354c6d262abb40e6c105cb2d37530e2f1f1d865ff4fd8434320a26957fbc2379db8af1bd18cd3c8662e064e79525831a5fb9fcb4aff46f3eb0809 +AUX tinyxml-2.6.2-defineSTL.patch 353 BLAKE2B e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8 SHA512 52cd82ef9e8f1783b3d6042551342a8c592c447e1da352d5d017db4211144bc0a908ddbfe2a4641b3108fb8e02dc47f385a851f920532d94178314255904a6ef +AUX tinyxml.pc.patch 383 BLAKE2B 7f13d388d80605a9576ca6c6dca263d9d1afe87026801f4a5d1db9b341b8bc763c66dfdfef924ce388b30fc453b143f01019ba676f66805fb11270c54d19ecfb SHA512 e423baf55f488fe4788234b8b19819520db3f9a43e677c34dd0bb9250c187c349b796a5c2749b5bee35d468b8676ccc8db7eab8a1094c36f65f63e128572b860 +DIST tinyxml_2_6_2.tar.gz 210124 BLAKE2B 84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56 +EBUILD tinyxml-2.6.2-r2.ebuild 1272 BLAKE2B 52eb49192dbc1f2fb465aab5c49e43b90fda4ae8c4bfd9ece8ab49231d9fdaa3097003b21f065332c0b15dfed89befd2c3d6be3b6ee0425fe51a68331734776b SHA512 d01c6c429d6c1fcc0361a3da80de019e329b55492bee5b769a8717016529f3f7e5443341babd3b9431610cd5b7a11fdcedcfffe03a38372333a907a8ebd26f54 +EBUILD tinyxml-2.6.2-r3.ebuild 1511 BLAKE2B 4dc93c2cfddd1603fe48d1ea908883877637ff93858fbf862e59b9633874d5ad52d337fdacc54bcdd43802bef356e5edc433ee27d71ed8f040416d458faf8dc1 SHA512 fbc56b50f7835135a19fb01ad4c518a93ca57a6b2a64374517731a241ab093a899987e26408a984353a7f139d83d4c83c3bfcba27302edbdad12b9913d85c441 +MISC metadata.xml 405 BLAKE2B 3df8b80574d2d5d42ee82fc2056f99d03fdd76190bc4fce6318a7b4ce79765c8c518f34b78181c0252de98dd587f6a48e745f1c094bd20f167a2667c8e64187f SHA512 b11af65ea7f12e4840154047ded852f3a393fecdca6c247d2eee83330a1ca834d210cb5d55db1601534c13a391321b82311fb9d5b288326beacdce2ad743ebb2 diff --git a/dev-libs/tinyxml/files/Makefile-3 b/dev-libs/tinyxml/files/Makefile-3 new file mode 100644 index 000000000000..40ad4fe7e9ce --- /dev/null +++ b/dev-libs/tinyxml/files/Makefile-3 @@ -0,0 +1,44 @@ +AR ?= ar +CXX ?= g++ +CXXFLAGS += -Wall +RANLIB ?= ranlib +LIBDIR ?= /usr/lib + +name = libtinyxml +major = @MAJOR_V@ +minor = @MINOR_V@ +version = $(major).$(minor) + +src = tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp tinystr.cpp +lo = $(addsuffix .lo,$(basename ${src})) +o = $(addsuffix .o,$(basename ${src})) + +lib = so +ifeq ($(shell uname),Darwin) + lib = dylib +endif + +all: $(name).a $(name).$(lib) + +%.o: %.cpp + $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $< -o $@ + +$(name).a: $(o) + $(AR) rc $(name).a $(o) + $(RANLIB) $(name).a + +%.lo: %.cpp + $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -fPIC $< -o $@ + +$(name).so: $(lo) + $(CXX) $(LDFLAGS) -fPIC -shared $(lo) -Wl,-soname,$(name).so.$(major) -o $(name).so.$(version) + ln -s $(name).so.$(version) $(name).so.$(major) + ln -s $(name).so.$(version) $(name).so + +$(name).dylib: $(lo) + $(CXX) $(LDFLAGS) -fPIC -dynamiclib $(lo) -install_name $(LIBDIR)/$(name).$(major).dylib -o $(name).$(version).dylib + ln -s $(name).$(version).dylib $(name).$(major).dylib + ln -s $(name).$(version).dylib $(name).dylib + +clean: + -rm -f *.o *.lo *.so* *.a diff --git a/dev-libs/tinyxml/files/tinyxml-2.6.1-entity.patch b/dev-libs/tinyxml/files/tinyxml-2.6.1-entity.patch new file mode 100644 index 000000000000..66d89a61743d --- /dev/null +++ b/dev-libs/tinyxml/files/tinyxml-2.6.1-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. +- // © -- 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&#xa+bar"); ++ std::string str; ++ str << xml; ++ XmlTest( "Entity escaping", "foo&#xa+bar", str.c_str() ); ++ } ++ #endif ++ + /* 1417717 experiment + { + TiXmlDocument xml; diff --git a/dev-libs/tinyxml/files/tinyxml-2.6.2-defineSTL.patch b/dev-libs/tinyxml/files/tinyxml-2.6.2-defineSTL.patch new file mode 100644 index 000000000000..7bcde59ff946 --- /dev/null +++ b/dev-libs/tinyxml/files/tinyxml-2.6.2-defineSTL.patch @@ -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 ) diff --git a/dev-libs/tinyxml/files/tinyxml.pc.patch b/dev-libs/tinyxml/files/tinyxml.pc.patch new file mode 100644 index 000000000000..74cb8042b491 --- /dev/null +++ b/dev-libs/tinyxml/files/tinyxml.pc.patch @@ -0,0 +1,14 @@ +diff -Naur old/tinyxml.pc new/tinyxml.pc +--- /dev/null 1970-01-01 03:00:00.000000000 +0300 ++++ tinyxml.pc 2018-05-07 01:46:25.000000000 +0300 +@@ -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} diff --git a/dev-libs/tinyxml/metadata.xml b/dev-libs/tinyxml/metadata.xml new file mode 100644 index 000000000000..f225bc05a9ee --- /dev/null +++ b/dev-libs/tinyxml/metadata.xml @@ -0,0 +1,14 @@ + + + + + voyageur@gentoo.org + Bernard Cafarelli + + + Compile with TIXML_USE_STL support + + + tinyxml + + diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild new file mode 100644 index 000000000000..52ba8c0050dd --- /dev/null +++ b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +inherit flag-o-matic toolchain-funcs eutils multilib versionator + +DESCRIPTION="Simple and small C++ XML parser" +HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-macos" +IUSE="debug doc static-libs +stl" + +RDEPEND="" +DEPEND="doc? ( app-doc/doxygen )" + +S="${WORKDIR}/${PN}" + +src_prepare() { + local major_v=$(get_major_version) + local minor_v=$(get_version_component_range 2-3) + + sed -e "s:@MAJOR_V@:$major_v:" \ + -e "s:@MINOR_V@:$minor_v:" \ + "${FILESDIR}"/Makefile-3 > Makefile || die + + epatch "${FILESDIR}"/${PN}-2.6.1-entity.patch + + use debug && append-cppflags -DDEBUG + use stl && epatch "${FILESDIR}"/${P}-defineSTL.patch + + if ! use static-libs; then + sed -e "/^all:/s/\$(name).a //" -i Makefile || die + fi + + tc-export AR CXX RANLIB + + [[ ${CHOST} == *-darwin* ]] && export LIBDIR="${EPREFIX}"/usr/$(get_libdir) +} + +src_install() { + dolib.so *$(get_libname)* + + insinto /usr/include + doins *.h + + dodoc {changes,readme}.txt + + use doc && dohtml -r docs/* +} diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild new file mode 100644 index 000000000000..1a6e115660f5 --- /dev/null +++ b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit flag-o-matic toolchain-funcs eutils multilib versionator + +DESCRIPTION="Simple and small C++ XML parser" +HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x86-macos" +IUSE="debug doc static-libs +stl" + +RDEPEND="" +DEPEND="doc? ( app-doc/doxygen )" + +S="${WORKDIR}/${PN}" + +src_prepare() { + local major_v=$(get_major_version) + local minor_v=$(get_version_component_range 2-3) + + sed -e "s:@MAJOR_V@:$major_v:" \ + -e "s:@MINOR_V@:$minor_v:" \ + "${FILESDIR}"/Makefile-3 > Makefile || die + + epatch "${FILESDIR}"/${PN}-2.6.1-entity.patch + epatch "${FILESDIR}"/${PN}.pc.patch + + use debug && append-cppflags -DDEBUG + use stl && epatch "${FILESDIR}"/${P}-defineSTL.patch + + if use stl; then + sed -e "s/Cflags: -I\${includedir}/Cflags: -I\${includedir} -DTIXML_USE_STL=YES/g" -i tinyxml.pc || die + fi + + if ! use static-libs; then + sed -e "/^all:/s/\$(name).a //" -i Makefile || die + fi + + tc-export AR CXX RANLIB + + [[ ${CHOST} == *-darwin* ]] && export LIBDIR="${EPREFIX}"/usr/$(get_libdir) + eapply_user +} + +src_install() { + dolib.so *$(get_libname)* + + insinto /usr/include + doins *.h + + insinto /usr/share/pkgconfig + doins tinyxml.pc + + dodoc {changes,readme}.txt + + use doc && dohtml -r docs/* +} -- cgit v1.2.3