From 23a7cab4920ac8ad543b43b91d6a662eaa56c792 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 18 Sep 2023 18:22:52 +0200 Subject: [PATCH] [mapnik] fix features input-csv (#33801) --- ports/mapnik/missing-include.patch | 13 +++++++++++++ ports/mapnik/portfile.cmake | 2 ++ ports/mapnik/vcpkg.json | 7 +++++-- versions/baseline.json | 2 +- versions/m-/mapnik.json | 5 +++++ 5 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 ports/mapnik/missing-include.patch diff --git a/ports/mapnik/missing-include.patch b/ports/mapnik/missing-include.patch new file mode 100644 index 00000000000000..49b80d400611cf --- /dev/null +++ b/ports/mapnik/missing-include.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp +index 382b1ce..c0256de 100644 +--- a/plugins/input/csv/csv_utils.cpp ++++ b/plugins/input/csv/csv_utils.cpp +@@ -40,6 +40,8 @@ + #include + #include + ++#include ++ + namespace csv_utils { + namespace detail { + diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index f1baeab41a111a..8ff420149a1cc0 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 123232ffde565af38afd06fe3e8edd9bfdce93bc SHA512 b940312688fcece8bb52b8b687fcc60eaac159d4737966eacacbafbde6fbd3245f9acf170d55a664a781908282cb21347bd4b79bd08b8ab2461270ef453b10c5 HEAD_REF master + PATCHES + missing-include.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 3a87054df95cac..f7c80e196bd48b 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mapnik", "version-date": "2023-06-12", - "port-version": 1, + "port-version": 2, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "license": "LGPL-2.1-only", @@ -85,7 +85,10 @@ "description": "Grid renderer" }, "input-csv": { - "description": "CSV input plugin" + "description": "CSV input plugin", + "dependencies": [ + "boost-algorithm" + ] }, "input-gdal": { "description": "GDAL input plugin", diff --git a/versions/baseline.json b/versions/baseline.json index 034195122e1ff6..f5a80694bd5fc6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5238,7 +5238,7 @@ }, "mapnik": { "baseline": "2023-06-12", - "port-version": 1 + "port-version": 2 }, "marble": { "baseline": "22.04.0", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index a081556e954f8f..b4d21345323a27 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdb516de71b06cb77bb51196e59709278606e32a", + "version-date": "2023-06-12", + "port-version": 2 + }, { "git-tree": "64501290af397067ec972c69113abd28139efdcc", "version-date": "2023-06-12",