From 58d345fbcddc0f0209cdb1499a891f0593974cd4 Mon Sep 17 00:00:00 2001 From: jbeich Date: Mon, 22 Oct 2018 20:29:33 +0000 Subject: graphics/mapnik: unbreak with boost 1.69 In file included from src/save_map.cpp:40: include/mapnik/image_filter.hpp:34:10: fatal error: 'boost/gil/gil_all.hpp' file not found #include ^~~~~~~~~~~~~~~~~~~~~~~ deps/agg/src/agg_pixfmt_rgba.cpp:6:10: fatal error: 'boost/gil/gil_all.hpp' file not found #include ^~~~~~~~~~~~~~~~~~~~~~~ PR: 232525 --- graphics/mapnik/files/patch-boost-1.69 | 62 ++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 graphics/mapnik/files/patch-boost-1.69 (limited to 'graphics') diff --git a/graphics/mapnik/files/patch-boost-1.69 b/graphics/mapnik/files/patch-boost-1.69 new file mode 100644 index 000000000000..23d3ac35a2f7 --- /dev/null +++ b/graphics/mapnik/files/patch-boost-1.69 @@ -0,0 +1,62 @@ +https://github.com/mapnik/mapnik/issues/4000 + +--- deps/agg/src/agg_pixfmt_rgba.cpp.orig 2015-11-26 14:32:15 UTC ++++ deps/agg/src/agg_pixfmt_rgba.cpp +@@ -3,7 +3,12 @@ + + #pragma GCC diagnostic push + #include ++#include ++#if BOOST_VERSION >= 106900 ++#include ++#else + #include ++#endif + #include + #include + #pragma GCC diagnostic pop +--- deps/boost/gil/extension/toolbox/hsl.hpp.orig 2015-11-26 14:32:15 UTC ++++ deps/boost/gil/extension/toolbox/hsl.hpp +@@ -16,7 +16,12 @@ + + #pragma GCC diagnostic push + #include ++#include ++#if BOOST_VERSION >= 106900 ++#include ++#else + #include ++#endif + #pragma GCC diagnostic pop + + namespace boost { namespace gil { +--- deps/boost/gil/extension/toolbox/hsv.hpp.orig 2015-11-26 14:32:15 UTC ++++ deps/boost/gil/extension/toolbox/hsv.hpp +@@ -16,7 +16,12 @@ + + #pragma GCC diagnostic push + #include ++#include ++#if BOOST_VERSION >= 106900 ++#include ++#else + #include ++#endif + #pragma GCC diagnostic pop + + namespace boost { namespace gil { +--- include/mapnik/image_filter.hpp.orig 2015-11-26 14:32:15 UTC ++++ include/mapnik/image_filter.hpp +@@ -31,7 +31,12 @@ + + #pragma GCC diagnostic push + #include ++#include ++#if BOOST_VERSION >= 106900 ++#include ++#else + #include ++#endif + #pragma GCC diagnostic pop + + // agg -- cgit