Date: Mon, 22 Oct 2018 20:29:33 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482785 - head/graphics/mapnik/files Message-ID: <201810222029.w9MKTX3m097668@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Oct 22 20:29:33 2018 New Revision: 482785 URL: https://svnweb.freebsd.org/changeset/ports/482785 Log: 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 Added: head/graphics/mapnik/files/patch-boost-1.69 (contents, props changed) Added: head/graphics/mapnik/files/patch-boost-1.69 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/mapnik/files/patch-boost-1.69 Mon Oct 22 20:29:33 2018 (r482785) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810222029.w9MKTX3m097668>