diff options
Diffstat (limited to 'community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch')
| -rw-r--r-- | community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch b/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch new file mode 100644 index 000000000..00b37c08f --- /dev/null +++ b/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch @@ -0,0 +1,36 @@ +From cf70b9959a45b9ab6af4a34824a5e4e80ce1d05c Mon Sep 17 00:00:00 2001 +From: Dane Springmeyer <dane@dbsgeo.com> +Date: Sun, 10 Feb 2013 07:24:35 -0800 +Subject: [PATCH] fix compile of json feature_collection grammar when building + against >= boost 1.52 - refs #1658 and #1716 + +--- + src/json/feature_collection_parser.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/json/feature_collection_parser.cpp b/src/json/feature_collection_parser.cpp +index 3faeda7..51ad824 100644 +--- a/src/json/feature_collection_parser.cpp ++++ b/src/json/feature_collection_parser.cpp +@@ -20,12 +20,17 @@ + * + *****************************************************************************/ + ++// TODO https://github.com/mapnik/mapnik/issues/1658 ++#include <boost/version.hpp> ++#if BOOST_VERSION >= 105200 ++#define BOOST_SPIRIT_USE_PHOENIX_V3 ++#endif ++ + // mapnik + #include <mapnik/json/feature_collection_parser.hpp> + #include <mapnik/json/feature_collection_grammar.hpp> + + // boost +-#include <boost/version.hpp> + #include <boost/spirit/include/qi.hpp> + #include <boost/spirit/include/support_multi_pass.hpp> + +-- +1.8.1.5 + |