Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
000584626f | ||
|
|
e678ec93f4 | ||
|
|
b4b214f873 | ||
|
|
07718e90c2 |
2 changed files with 58 additions and 9 deletions
58
wt-3.3.3-boost-1.57.patch
Normal file
58
wt-3.3.3-boost-1.57.patch
Normal file
|
|
@ -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)
|
||||||
9
wt.spec
9
wt.spec
|
|
@ -300,21 +300,12 @@ popd
|
||||||
- Replace bogus BR: boost-devel%%{_isa} with BR: boost-devel.
|
- Replace bogus BR: boost-devel%%{_isa} with BR: boost-devel.
|
||||||
- Unbundle GLEW.
|
- Unbundle GLEW.
|
||||||
|
|
||||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.3-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jun 13 2014 Michal Minar <miminar@redhat.com> 3.3.3-2
|
* Fri Jun 13 2014 Michal Minar <miminar@redhat.com> 3.3.3-2
|
||||||
- Reenabled raster image support.
|
- Reenabled raster image support.
|
||||||
|
|
||||||
* Wed Jun 11 2014 Michal Minar <miminar@redhat.com> 3.3.3-1
|
* Wed Jun 11 2014 Michal Minar <miminar@redhat.com> 3.3.3-1
|
||||||
- New upstream version 3.3.3.
|
- New upstream version 3.3.3.
|
||||||
|
|
||||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.2-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri May 23 2014 David Tardon <dtardon@redhat.com> - 3.3.2-3
|
|
||||||
- rebuild for boost 1.55.0
|
|
||||||
|
|
||||||
* Fri Mar 21 2014 Michal Minar <miminar@redhat.com> 3.3.2-2
|
* Fri Mar 21 2014 Michal Minar <miminar@redhat.com> 3.3.2-2
|
||||||
- Got rid of bundled sqlite libraries.
|
- Got rid of bundled sqlite libraries.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue