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 + #include + #include ++#if BOOST_VERSION < 105600 + #include ++#else ++#include ++#endif + #include + #include + +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 + #include + #include ++#if BOOST_VERSION < 105600 + #include ++#else ++#include ++#endif + #include + + #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 + #include + #include ++#if BOOST_VERSION < 105600 + #include ++#else ++#include ++#endif + #include + + #include +@@ -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) diff --git a/wt.spec b/wt.spec index fb24b4c..36b054a 100644 --- a/wt.spec +++ b/wt.spec @@ -300,21 +300,12 @@ popd - Replace bogus BR: boost-devel%%{_isa} with BR: boost-devel. - Unbundle GLEW. -* Mon Aug 18 2014 Fedora Release Engineering - 3.3.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - * Fri Jun 13 2014 Michal Minar 3.3.3-2 - Reenabled raster image support. * Wed Jun 11 2014 Michal Minar 3.3.3-1 - New upstream version 3.3.3. -* Sun Jun 08 2014 Fedora Release Engineering - 3.3.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 David Tardon - 3.3.2-3 -- rebuild for boost 1.55.0 - * Fri Mar 21 2014 Michal Minar 3.3.2-2 - Got rid of bundled sqlite libraries.