[wt/f20] New.

corsepiu corsepiu at fedoraproject.org
Mon Feb 9 07:05:17 UTC 2015


commit 000584626fa3984576028bc1e152b459cc7a81c0
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Feb 9 07:37:28 2015 +0100

    New.

 wt-3.3.3-boost-1.57.patch |   58 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 deletions(-)
---
diff --git a/wt-3.3.3-boost-1.57.patch b/wt-3.3.3-boost-1.57.patch
new file mode 100644
index 0000000..e37240a
--- /dev/null
+++ b/wt-3.3.3-boost-1.57.patch
@@ -0,0 +1,58 @@
+diff -Naur wt-3.3.3.orig/src/Wt/Dbo/SqlQueryParse.C wt-3.3.3/src/Wt/Dbo/SqlQueryParse.C
+--- wt-3.3.3.orig/src/Wt/Dbo/SqlQueryParse.C	2012-02-27 22:14:29.000000000 +0100
++++ wt-3.3.3/src/Wt/Dbo/SqlQueryParse.C	2015-02-08 15:15:27.820770357 +0100
+@@ -20,7 +20,11 @@
+ #include <boost/spirit/include/phoenix_core.hpp>
+ #include <boost/spirit/include/phoenix_operator.hpp>
+ #include <boost/spirit/include/phoenix_object.hpp>
++#if BOOST_VERSION < 105600
+ #include <boost/spirit/home/phoenix/statement/throw.hpp>
++#else
++#include <boost/phoenix.hpp>
++#endif
+ #include <boost/bind.hpp>
+ #include <iostream>
+ 
+diff -Naur wt-3.3.3.orig/src/Wt/Json/Parser.C wt-3.3.3/src/Wt/Json/Parser.C
+--- wt-3.3.3.orig/src/Wt/Json/Parser.C	2013-02-03 22:26:10.000000000 +0100
++++ wt-3.3.3/src/Wt/Json/Parser.C	2015-02-08 15:18:41.573842062 +0100
+@@ -24,7 +24,11 @@
+ #include <boost/spirit/include/phoenix_core.hpp>
+ #include <boost/spirit/include/phoenix_operator.hpp>
+ #include <boost/spirit/include/phoenix_object.hpp>
++#if BOOST_VERSION < 105600
+ #include <boost/spirit/home/phoenix/statement/throw.hpp>
++#else
++#include <boost/phoenix.hpp>
++#endif
+ #include <boost/bind.hpp>
+ 
+ #endif // JSON_PARSER
+diff -Naur wt-3.3.3.orig/src/Wt/Render/CssParser.C wt-3.3.3/src/Wt/Render/CssParser.C
+--- wt-3.3.3.orig/src/Wt/Render/CssParser.C	2013-08-08 20:43:18.000000000 +0200
++++ wt-3.3.3/src/Wt/Render/CssParser.C	2015-02-08 15:15:27.821770347 +0100
+@@ -34,7 +34,11 @@
+ #include <boost/fusion/include/adapt_struct.hpp>
+ #include <boost/variant/recursive_variant.hpp>
+ #include <boost/spirit/home/support/context.hpp>
++#if BOOST_VERSION < 105600
+ #include <boost/spirit/home/phoenix.hpp>
++#else
++#include <boost/phoenix.hpp>
++#endif
+ #include <boost/spirit/include/classic_file_iterator.hpp>
+ 
+ #include <map>
+@@ -157,8 +161,12 @@
+ template< typename Iterator >
+ struct ErrorReporting
+ {
++#if BOOST_VERSION < 105600
+   template< typename, typename, typename, typename, typename > // Phoenix v2
+   struct result { typedef void type;};
++#else
++  typedef void result_type;
++#endif
+ 
+   ErrorReporting(CssGrammer< Iterator >* grammer)
+     : grammer_(grammer)


More information about the scm-commits mailing list