aports/testing/mapnik/boost-1.83.patch
Holger Jaekel 0fac8f2b71 testing/mapnik: rebuild against gdal 3.9.0
fix build with libxml2 2.12.x
fix build with boost 1.83
2024-05-18 21:03:46 +02:00

54 lines
1.9 KiB
Diff

Author: Antonio Rojas
Summary: fixes for boost 1.83
URL: https://gitlab.archlinux.org/archlinux/packaging/packages/mapnik/-/blob/f9f723222c0af50e4db747e7c4e8138dbc769f53/boost-1.83.patch
----
diff --git a/include/mapnik/geometry/boost_spirit_karma_adapter.hpp b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
index a146ef1d1..bfdf00d7f 100644
--- a/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
+++ b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
@@ -25,6 +25,7 @@
#define MAPNIK_BOOST_SPIRIT_KARMA_ADAPTER_HPP
#include <mapnik/geometry.hpp>
+#include <cstdint>
namespace boost { using mapbox::util::get; }
diff --git a/include/mapnik/geometry_fusion_adapted.hpp b/include/mapnik/geometry_fusion_adapted.hpp
index 66869891a..c4b4cae13 100644
--- a/include/mapnik/geometry_fusion_adapted.hpp
+++ b/include/mapnik/geometry_fusion_adapted.hpp
@@ -26,6 +26,7 @@
#include <mapnik/geometry.hpp>
#include <boost/fusion/include/adapt_struct.hpp>
+#include <cstdint>
BOOST_FUSION_ADAPT_STRUCT(
mapnik::geometry::point<double>,
diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp
index 0c4662304..b81a742c7 100644
--- a/include/mapnik/json/generic_json.hpp
+++ b/include/mapnik/json/generic_json.hpp
@@ -32,6 +32,7 @@
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix.hpp>
#include <boost/fusion/include/std_pair.hpp>
+#include <boost/regex/pending/unicode_iterator.hpp>
#pragma GCC diagnostic pop
#include <vector>
diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp
index 916b17e01..227ee2c9b 100644
--- a/plugins/input/csv/csv_utils.cpp
+++ b/plugins/input/csv/csv_utils.cpp
@@ -32,6 +32,7 @@
// csv grammar
#include <mapnik/csv/csv_grammar_impl.hpp>
//
+#include <boost/algorithm/string/trim.hpp>
#include "csv_getline.hpp"
#include "csv_utils.hpp"