Author: glen Date: Sun May 20 20:28:16 2012 GMT Module: packages Tag: HEAD ---- Log message: - enforce-use-stl.patch patch from debian
---- Files affected: packages/tinyxml: tinyxml.spec (1.10 -> 1.11) , enforce-use-stl.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/tinyxml/tinyxml.spec diff -u packages/tinyxml/tinyxml.spec:1.10 packages/tinyxml/tinyxml.spec:1.11 --- packages/tinyxml/tinyxml.spec:1.10 Sat May 19 19:22:46 2012 +++ packages/tinyxml/tinyxml.spec Sun May 20 22:28:11 2012 @@ -4,12 +4,13 @@ Summary(pl.UTF-8): Prosty, mały, napisany w C++ parser XML Name: tinyxml Version: 2.6.2 -Release: 2 +Release: 3 License: zlib Group: Libraries Source0: http://downloads.sourceforge.net/tinyxml/%{name}_%{file_version}.tar.gz # Source0-md5: c1b864c96804a10526540c664ade67f0 Patch0: %{name}-flags.patch +Patch1: enforce-use-stl.patch URL: http://www.grinninglizard.com/tinyxml/ BuildRequires: libstdc++-devel BuildRequires: libtool @@ -51,6 +52,7 @@ %prep %setup -q -n %{name} %patch0 -p1 +%patch1 -p1 %build %{__make} \ @@ -107,6 +109,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2012/05/20 20:28:11 glen +- enforce-use-stl.patch patch from debian + Revision 1.10 2012/05/19 17:22:46 wiget - enable STL API - rel. 2 ================================================================ Index: packages/tinyxml/enforce-use-stl.patch diff -u /dev/null packages/tinyxml/enforce-use-stl.patch:1.1 --- /dev/null Sun May 20 22:28:17 2012 +++ packages/tinyxml/enforce-use-stl.patch Sun May 20 22:28:11 2012 @@ -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 <[email protected]> + +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 ) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/tinyxml/tinyxml.spec?r1=1.10&r2=1.11 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
