Date: Mon, 27 Apr 2026 00:03:00 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: David Hummel <hummeltech@sherpaguru.com> Subject: git: 6ede25fa51a1 - main - graphics/mapnik: update to 4.2.2 Message-ID: <69eea7b4.1ce24.44bcb02b@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ede25fa51a1ce61cd44cd3b006d35cc5c1f8e30 commit 6ede25fa51a1ce61cd44cd3b006d35cc5c1f8e30 Author: David Hummel <hummeltech@sherpaguru.com> AuthorDate: 2026-03-31 19:11:34 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-04-27 00:01:04 +0000 graphics/mapnik: update to 4.2.2 Remove patch upstreamed in e4e80db44f769a00684002e83f863c4ee9a9f35b Changelog: https://github.com/mapnik/mapnik/blob/v4.2.2/CHANGELOG.md Compare changes: https://github.com/mapnik/mapnik/compare/v4.1.3...v4.2.2 PR: 294169 Event: Wiesbaden Hackathon 202604 --- graphics/mapnik/Makefile | 3 +-- graphics/mapnik/distinfo | 6 +++--- graphics/mapnik/files/patch-gdal | 16 ---------------- .../patch-plugins_input_tiles_pmtiles__source.hpp | 20 -------------------- graphics/mapnik/pkg-plist | 11 +++++------ 5 files changed, 9 insertions(+), 47 deletions(-) diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index cb37493799ab..fded914a03c3 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -1,7 +1,6 @@ PORTNAME= mapnik DISTVERSIONPREFIX= v -DISTVERSION= 4.1.3 -PORTREVISION= 3 +DISTVERSION= 4.2.2 CATEGORIES= graphics geography MAINTAINER= hummeltech@sherpaguru.com diff --git a/graphics/mapnik/distinfo b/graphics/mapnik/distinfo index a6c57bffda1f..506f4d093dba 100644 --- a/graphics/mapnik/distinfo +++ b/graphics/mapnik/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1759637867 -SHA256 (mapnik-mapnik-v4.1.3_GH0.tar.gz) = 04a39a878fb60204853adf79a9e5be803609c6eab180d6403d67fc8b4691fa9f -SIZE (mapnik-mapnik-v4.1.3_GH0.tar.gz) = 13264597 +TIMESTAMP = 1774982775 +SHA256 (mapnik-mapnik-v4.2.2_GH0.tar.gz) = 631136738aee04aa1476084fcb0df2604759cceffb1963c27ec0eef1b3c42c7c +SIZE (mapnik-mapnik-v4.2.2_GH0.tar.gz) = 13270783 SHA256 (catchorg-Catch2-v2.13.10_GH0.tar.gz) = d54a712b7b1d7708bc7a819a8e6e47b2fde9536f487b89ccbca295072a7d9943 SIZE (catchorg-Catch2-v2.13.10_GH0.tar.gz) = 662225 SHA256 (mapbox-geometry.hpp-c83a2ab_GH0.tar.gz) = 676c7490fa7cdba26f45fc6b3932dc04bec110f75d660493a7c31d5b0d86e923 diff --git a/graphics/mapnik/files/patch-gdal b/graphics/mapnik/files/patch-gdal deleted file mode 100644 index e4bbd30edbdc..000000000000 --- a/graphics/mapnik/files/patch-gdal +++ /dev/null @@ -1,16 +0,0 @@ -Obtained from: https://github.com/mapnik/mapnik/commit/ca60dda74671cb373419b8a8f91b0f730c16f161 - ---- plugins/input/ogr/ogr_datasource.cpp.orig 2025-10-01 08:04:52 UTC -+++ plugins/input/ogr/ogr_datasource.cpp -@@ -378,7 +378,11 @@ void ogr_datasource::init(mapnik::parameters const& pa - } - } - mapnik::parameters& extra_params = desc_.get_extra_parameters(); -+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 12, 0) -+ const OGRSpatialReference* srs_ref = layer->GetSpatialRef(); -+#else - OGRSpatialReference* srs_ref = layer->GetSpatialRef(); -+#endif - char* srs_output = nullptr; - if (srs_ref && srs_ref->exportToProj4(&srs_output) == OGRERR_NONE) - { diff --git a/graphics/mapnik/files/patch-plugins_input_tiles_pmtiles__source.hpp b/graphics/mapnik/files/patch-plugins_input_tiles_pmtiles__source.hpp deleted file mode 100644 index 5f266a6c709d..000000000000 --- a/graphics/mapnik/files/patch-plugins_input_tiles_pmtiles__source.hpp +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/input/tiles/pmtiles_source.hpp.orig 2025-10-05 04:06:02 UTC -+++ plugins/input/tiles/pmtiles_source.hpp -@@ -470,7 +470,7 @@ class pmtiles_source : public tiles_source, - { - std::string decompressed_dir; - #if defined(MAPNIK_MEMORY_MAPPED_FILE) -- std::string_view buffer{file_.buffer().first + dir_offset, dir_length}; -+ std::string_view buffer{file_.buffer().first + dir_offset, static_cast<std::size_t>(dir_length)}; - #else - std::string buffer; - buffer.resize(dir_length); -@@ -559,7 +559,7 @@ class pmtiles_source : public tiles_source, - { - std::string metadata; - #if defined(MAPNIK_MEMORY_MAPPED_FILE) -- std::string_view buffer{file_.buffer().first + metadata_offset_, metadata_length_}; -+ std::string_view buffer{file_.buffer().first + metadata_offset_, static_cast<std::size_t>(metadata_length_)}; - #else - std::string buffer; - buffer.resize(metadata_length_); diff --git a/graphics/mapnik/pkg-plist b/graphics/mapnik/pkg-plist index 2a61941bfd8a..a82413cf255a 100644 --- a/graphics/mapnik/pkg-plist +++ b/graphics/mapnik/pkg-plist @@ -492,6 +492,7 @@ include/mapnik/util/noncopyable.hpp include/mapnik/util/path_iterator.hpp include/mapnik/util/rounding_cast.hpp include/mapnik/util/singleton.hpp +include/mapnik/util/sort_by.hpp include/mapnik/util/spatial_index.hpp include/mapnik/util/timer.hpp include/mapnik/util/trim.hpp @@ -545,17 +546,15 @@ lib/cmake/mapnik/mapnikUtilityTargets_shapeindex.cmake lib/cmake/mapnik/mapnikUtilityTargets_svg2png-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/mapnik/mapnikUtilityTargets_svg2png.cmake lib/libmapnik.so -lib/libmapnik.so.4.1 -lib/libmapnik.so.4.1.3 +lib/libmapnik.so.4.2 +lib/libmapnik.so.4.2.2 lib/libmapnikjson.a lib/libmapnikwkt.a lib/mapnik/input/csv.input -lib/mapnik/input/gdal.input +lib/mapnik/input/gdal+ogr.input lib/mapnik/input/geobuf.input lib/mapnik/input/geojson.input -lib/mapnik/input/ogr.input -lib/mapnik/input/pgraster.input -lib/mapnik/input/postgis.input +lib/mapnik/input/postgis+pgraster.input lib/mapnik/input/raster.input lib/mapnik/input/shape.input lib/mapnik/input/sqlite.inputhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69eea7b4.1ce24.44bcb02b>