From 664529446e6f9e848c6aa802bef85976922b7a692eee475afb4995605422335e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 5 Apr 2011 09:56:05 +0000 Subject: [PATCH] Accepting request 64911 from home:namtrac OBS-URL: https://build.opensuse.org/request/show/64911 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=61 --- boost-fix-spirit-attr-handling.patch | 47 ++++++++++++++++++++++++++++ boost.changes | 6 ++++ boost.spec | 2 ++ 3 files changed, 55 insertions(+) create mode 100644 boost-fix-spirit-attr-handling.patch diff --git a/boost-fix-spirit-attr-handling.patch b/boost-fix-spirit-attr-handling.patch new file mode 100644 index 0000000..2a969ff --- /dev/null +++ b/boost-fix-spirit-attr-handling.patch @@ -0,0 +1,47 @@ +Index: boost/spirit/home/qi/auxiliary/attr.hpp +=================================================================== +--- boost/spirit/home/qi/auxiliary/attr.hpp (revision 69217) ++++ boost/spirit/home/qi/auxiliary/attr.hpp (revision 69218) +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -96,6 +97,14 @@ + }; + }}} + ++namespace boost { namespace spirit { namespace traits ++{ ++ /////////////////////////////////////////////////////////////////////////// ++ template ++ struct handles_container, Attr, Context, Iterator> ++ : traits::is_container {}; ++}}} ++ + #endif + + +Index: boost/spirit/home/qi/string/symbols.hpp +=================================================================== +--- boost/spirit/home/qi/string/symbols.hpp (revision 70041) ++++ boost/spirit/home/qi/string/symbols.hpp (revision 70042) +@@ -398,6 +398,15 @@ + }; + }}} + ++namespace boost { namespace spirit { namespace traits ++{ ++ /////////////////////////////////////////////////////////////////////////// ++ template ++ struct handles_container, Attr, Context, Iterator> ++ : traits::is_container {}; ++}}} ++ + #if defined(BOOST_MSVC) + # pragma warning(pop) + #endif diff --git a/boost.changes b/boost.changes index 92262b8..c9f3714 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 21 11:53:29 UTC 2011 - idoenmez@novell.com + +- Fix attribute handling problem in spirit library, + See http://comments.gmane.org/gmane.comp.parsers.spirit.general/22073 + ------------------------------------------------------------------- Mon Mar 21 11:46:48 CET 2011 - pth@suse.de diff --git a/boost.spec b/boost.spec index a7f5d1d..1f306c0 100644 --- a/boost.spec +++ b/boost.spec @@ -89,6 +89,7 @@ Patch1: boost-thread.patch Patch2: boost-no_type_punning.patch Patch4: boost-visit_each.diff Patch8: boost-no_segfault_in_Regex_filter.patch +Patch9: boost-fix-spirit-attr-handling.patch Patch19: boost-sane_versioning.patch Patch20: boost-strict_aliasing.patch Patch50: boost-use_std_xml_catalog.patch @@ -429,6 +430,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch2 %patch4 %patch8 +%patch9 %patch19 %patch20 %patch50