diff options
| author | jbeich <jbeich@FreeBSD.org> | 2018-10-23 04:29:33 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2018-10-23 04:29:33 +0800 |
| commit | 58d345fbcddc0f0209cdb1499a891f0593974cd4 (patch) | |
| tree | c1d57055046f8773fd9fe9c338cd884b433f8b34 /graphics | |
| parent | 984ae26519cb1a5df31fe97d95064b8d3379ff26 (diff) | |
| download | freebsd-ports-gnome-58d345fbcddc0f0209cdb1499a891f0593974cd4.tar.gz freebsd-ports-gnome-58d345fbcddc0f0209cdb1499a891f0593974cd4.tar.zst freebsd-ports-gnome-58d345fbcddc0f0209cdb1499a891f0593974cd4.zip | |
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 <boost/gil/gil_all.hpp>
^~~~~~~~~~~~~~~~~~~~~~~
deps/agg/src/agg_pixfmt_rgba.cpp:6:10: fatal error: 'boost/gil/gil_all.hpp' file not found
#include <boost/gil/gil_all.hpp>
^~~~~~~~~~~~~~~~~~~~~~~
PR: 232525
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/mapnik/files/patch-boost-1.69 | 62 |
1 files changed, 62 insertions, 0 deletions
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 <mapnik/warning_ignore.hpp> ++#include <boost/version.hpp> ++#if BOOST_VERSION >= 106900 ++#include <boost/gil.hpp> ++#else + #include <boost/gil/gil_all.hpp> ++#endif + #include <boost/gil/extension/toolbox/hsv.hpp> + #include <boost/gil/extension/toolbox/hsl.hpp> + #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 <mapnik/warning_ignore.hpp> ++#include <boost/version.hpp> ++#if BOOST_VERSION >= 106900 ++#include <boost/gil.hpp> ++#else + #include <boost/gil/gil_all.hpp> ++#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 <mapnik/warning_ignore.hpp> ++#include <boost/version.hpp> ++#if BOOST_VERSION >= 106900 ++#include <boost/gil.hpp> ++#else + #include <boost/gil/gil_all.hpp> ++#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 <mapnik/warning_ignore.hpp> ++#include <boost/version.hpp> ++#if BOOST_VERSION >= 106900 ++#include <boost/gil.hpp> ++#else + #include <boost/gil/gil_all.hpp> ++#endif + #pragma GCC diagnostic pop + + // agg |