[arch-commits] Commit in boost/trunk (PKGBUILD boost-1.46.0-spirit.patch)

[Ionut Biru]

    Date: Thursday, March 3, 2011 @ 05:41:09
  Author: ibiru
Revision: 112033

upgpkg: boost 1.46.0-3
backport patch to fix compilation failures for applications that uses spirit module.FS#23112

Added:
  boost/trunk/boost-1.46.0-spirit.patch
Modified:
  boost/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    9 ++++--
 boost-1.46.0-spirit.patch |   59 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-03 09:55:50 UTC (rev 112032)
+++ PKGBUILD	2011-03-03 10:41:09 UTC (rev 112033)
@@ -8,15 +8,17 @@
 pkgname=('boost-libs' 'boost')
 pkgver=1.46.0
 _boostver=${pkgver//./_}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.boost.org/"
 makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
-        4994-compile-fix-for-Python32-v2.patch)
+        4994-compile-fix-for-Python32-v2.patch
+        boost-1.46.0-spirit.patch)
 license=('custom')
 md5sums=('820393d5746553c192db7b81ba0e53fe'
-         'cb59e8adbf2a45ef9264a2f4ab92b849')
+         'cb59e8adbf2a45ef9264a2f4ab92b849'
+         '9d6e2f13fef23bf27d7bdddc104e182a')
 
 _stagedir="${srcdir}/stagedir"
 
@@ -48,6 +50,7 @@
   #python 3.2 support
   #https://svn.boost.org/trac/boost/ticket/4994
   patch -Np0 -i "${srcdir}/4994-compile-fix-for-Python32-v2.patch"
+  patch -Np0 -i "${srcdir}/boost-1.46.0-spirit.patch"
 
   # default "minimal" install: "release link=shared,static
   # runtime-link=shared threading=single,multi"

Added: boost-1.46.0-spirit.patch
===================================================================
--- boost-1.46.0-spirit.patch	                        (rev 0)
+++ boost-1.46.0-spirit.patch	2011-03-03 10:41:09 UTC (rev 112033)
@@ -0,0 +1,59 @@
+Index: boost/spirit/home/qi/nonterminal/detail/parameterized.hpp
+===================================================================
+--- boost/spirit/home/qi/nonterminal/detail/parameterized.hpp	(revision 68724)
++++ boost/spirit/home/qi/nonterminal/detail/parameterized.hpp	(revision 68725)
+@@ -14,6 +14,7 @@
+ 
+ #include <boost/ref.hpp>
+ 
++#include <boost/spirit/home/support/handles_container.hpp>
+ #include <boost/spirit/home/qi/parser.hpp>
+ 
+ namespace boost { namespace spirit { namespace qi
+@@ -59,4 +60,16 @@ namespace boost { namespace spirit { nam
+     };
+ }}}
+ 
++namespace boost { namespace spirit { namespace traits
++{
++    ///////////////////////////////////////////////////////////////////////////
++    template <typename Subject, typename Params, typename Attribute
++      , typename Context, typename Iterator>
++    struct handles_container<qi::parameterized_nonterminal<Subject, Params>
++          , Attribute, Context, Iterator>
++      : handles_container<typename remove_const<Subject>::type
++        , Attribute, Context, Iterator> 
++    {};
++}}}
++
+ #endif
+Index: boost/spirit/home/karma/nonterminal/detail/parameterized.hpp
+===================================================================
+--- boost/spirit/home/karma/nonterminal/detail/parameterized.hpp	(revision 68724)
++++ boost/spirit/home/karma/nonterminal/detail/parameterized.hpp	(revision 68725)
+@@ -14,6 +14,7 @@
+ 
+ #include <boost/ref.hpp>
+ 
++#include <boost/spirit/home/support/handles_container.hpp>
+ #include <boost/spirit/home/karma/generator.hpp>
+ 
+ namespace boost { namespace spirit { namespace karma
+@@ -60,4 +61,17 @@ namespace boost { namespace spirit { nam
+     };
+ }}}
+ 
++
++namespace boost { namespace spirit { namespace traits
++{
++    ///////////////////////////////////////////////////////////////////////////
++    template <typename Subject, typename Params, typename Attribute
++      , typename Context, typename Iterator>
++    struct handles_container<karma::parameterized_nonterminal<Subject, Params>
++          , Attribute, Context, Iterator>
++      : handles_container<typename remove_const<Subject>::type
++        , Attribute, Context, Iterator> 
++    {};
++}}}
++
+ #endif