Attachment #209914 for bug #237016

View | Details | Raw Unified | Return to bug 237016
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	mapnik
PORTVERSION=	3.0.9
DISTVERSIONPREFIX=	v
DISTVERSION=	3.0.12-1078
DISTVERSIONSUFFIX=	-g538eb2026
CATEGORIES=	graphics geography
MASTER_SITES=	http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/

PATCH_SITES=	https://github.com/mapnik/mapnik/commit/
PATCHFILES=	1ddfe6c31548.patch:-p1
PATCHFILES+=	c067eb7eec32.patch:-p1

MAINTAINER=	littlesavage@rambler.ru
COMMENT=	Free Toolkit For Developing Mapping Applications

LICENSE=	LGPL21+
LICENSE_FILE=	${WRKSRC}/COPYING

BROKEN=		fails to build with boost 1.70, see bug 237016
DEPRECATED=	Broken for more than 8 months
EXPIRATION_DATE=	2020-01-10
BROKEN_powerpc=		fails to install: runs out of virtual memory

LIB_DEPENDS=	libicuuc.so:devel/icu \

		libfreetype.so:print/freetype2 \
		libharfbuzz.so:print/harfbuzz

USES=		compiler:c++14-lang gnome pkgconfig python scons tar:bzip2
USE_GITHUB=	yes
USE_GNOME=	libxml2
USE_LDCONFIG=	yes
GH_TUPLE=	mapnik:test-data:v3.0.13-28-gc3982b7:test_data/test/data \
		mapnik:test-data-visual:v3.0.13-90-g901ee22:test_data_visual/test/data-visual \
		mapbox:variant:v1.1.5-55-g0f734f0:variant/deps/mapbox/variant \
		mapbox:geometry.hpp:v1.0.0:geometry/deps/mapbox/geometry \
		mapbox:protozero:v1.6.4:protozero/deps/mapbox/protozero \
		mapbox:polylabel:v1.0.3-4-g23f6a76:polylabel/deps/mapbox/polylabel
MAKE_ARGS=	INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`" \
		CUSTOM_CFLAGS="${CFLAGS}" CUSTOM_CXXFLAGS="${CXXFLAGS}" \
		CUSTOM_LDFLAGS="${LDFLAGS}"

PORTDOCS=	*

INPUT_PLUGINS=	csv raster shape geobuf geojson topojson

OPTIONS_DEFINE=	DOCS CAIRO JPEG PNG TIFF WEBP PROJ
OPTIONS_DEFAULT=CAIRO GDAL OGR POSTGIS PGRASTER SQLITE3 JPEG PNG TIFF PROJ WEBP




TIMESTAMP = 1576256861
SHA256 (mapnik-mapnik-v3.0.12-1078-g538eb2026_GH0.tar.gz) = 9915b452832464f79fbd0d5a6f628b0d4194fae2d49983173f29bb2fcb2a3a43
SIZE (mapnik-mapnik-v3.0.12-1078-g538eb2026_GH0.tar.gz) = 10518098
SHA256 (mapnik-test-data-v3.0.13-28-gc3982b7_GH0.tar.gz) = ba40463362981d27d181367372201a5d80388488a6c7c4b9684d29ca5ce45a9b
SIZE (mapnik-test-data-v3.0.13-28-gc3982b7_GH0.tar.gz) = 13926749
SHA256 (mapnik-test-data-visual-v3.0.13-90-g901ee22_GH0.tar.gz) = 08b38f2534f4322647250fa813c473c21d616868ae901c8374f7bd668f789c1e
SIZE (mapnik-test-data-visual-v3.0.13-90-g901ee22_GH0.tar.gz) = 142327876
SHA256 (mapbox-variant-v1.1.5-55-g0f734f0_GH0.tar.gz) = e198efd6851a4e4eae0cbc4fda4677030490d91e4e54af4c1c2cbacb01e7439e
SIZE (mapbox-variant-v1.1.5-55-g0f734f0_GH0.tar.gz) = 124752
SHA256 (mapbox-geometry.hpp-v1.0.0_GH0.tar.gz) = d871630f4ebe7b4270fa074d4a22213cad05d9fca79491dbf5a8fef5bb34893b
SIZE (mapbox-geometry.hpp-v1.0.0_GH0.tar.gz) = 17449
SHA256 (mapbox-protozero-v1.6.4_GH0.tar.gz) = 604456a979a0311b95c9e49c10e110f51ab58765bb9a77b0c67defe28fbe1402
SIZE (mapbox-protozero-v1.6.4_GH0.tar.gz) = 1064871
SHA256 (mapbox-polylabel-v1.0.3-4-g23f6a76_GH0.tar.gz) = 2379f9806c2461e87190f02679d4e60f0780103487f979bf7c314f5f857f8b77
SIZE (mapbox-polylabel-v1.0.3-4-g23f6a76_GH0.tar.gz) = 43555




--- SConstruct.orig	2019-10-22 08:47:07 UTC
+++ SConstruct
@@ -2044,8 +2044,6 @@ if not preconfigured:
             common_cxx_flags += ' -Wno-unsequenced  -Wtautological-compare -Wheader-hygiene '
         if env['DEBUG']:
             env.Append(CXXFLAGS = common_cxx_flags + '-O0')
-        else:
-            # TODO - add back -fvisibility-inlines-hidden
-            # https://github.com/mapnik/mapnik/issues/1863
-            env.Append(CXXFLAGS = common_cxx_flags + '-O%s' % (env['OPTIMIZATION']))
         if env['DEBUG_UNDEFINED']:
             env.Append(CXXFLAGS = '-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv -fwrapv')
 
 
         # if requested, sort LIBPATH and CPPPATH one last time before saving...




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




https://github.com/mapnik/mapnik/commit/9e58c890430d
https://github.com/mapnik/mapnik/commit/093fcee6d1ba

--- include/mapnik/text/harfbuzz_shaper.hpp.orig	2015-11-26 14:32:15 UTC
+++ include/mapnik/text/harfbuzz_shaper.hpp
@@ -41,6 +41,7 @@
 #include <harfbuzz/hb-ft.h>
 
 // icu
+#include <unicode/uvernum.h>
 #include <unicode/uscript.h>
 
 namespace mapnik
@@ -55,7 +56,8 @@ static inline hb_script_t _icu_script_to_script(UScrip
 static inline const uint16_t * uchar_to_utf16(const UChar* src)
 {
    static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t");
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || (U_ICU_VERSION_MAJOR_NUM >= 59)
+   // ^^ http://site.icu-project.org/download/59#TOC-ICU4C-char16_t1
    return reinterpret_cast<const uint16_t *>(src);
 #else
    return src;
--- include/mapnik/unicode.hpp.orig	2015-11-26 14:32:15 UTC
+++ include/mapnik/unicode.hpp
@@ -31,6 +31,13 @@
 // std
 #include <cstdint>
 #include <string>
+// icu
+#if (U_ICU_VERSION_MAJOR_NUM >= 59)
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <unicode/unistr.h>
+#pragma GCC diagnostic pop
+#endif
 
 struct UConverter;
 




bin/mapnik-index
bin/mapnik-render
bin/shapeindex
include/mapnik/adaptive_smooth.hpp
include/mapnik/agg/agg_alpha_mask_u8.h
include/mapnik/agg/agg_arc.h
include/mapnik/agg/agg_array.h

include/mapnik/attribute_collector.hpp
include/mapnik/attribute_descriptor.hpp
include/mapnik/boolean.hpp
include/mapnik/boost_spirit_instantiate.hpp
include/mapnik/cairo/cairo_context.hpp
include/mapnik/cairo/cairo_image_util.hpp
include/mapnik/cairo/cairo_render_vector.hpp
include/mapnik/cairo/cairo_renderer.hpp
include/mapnik/cairo/render_polygon_pattern.hpp
include/mapnik/cairo_io.hpp
include/mapnik/color.hpp
include/mapnik/color_factory.hpp
include/mapnik/config.hpp
include/mapnik/config_error.hpp
include/mapnik/coord.hpp
include/mapnik/css_color_grammar_x3.hpp
include/mapnik/css_color_grammar_x3_def.hpp
include/mapnik/csv/csv_grammar_x3.hpp
include/mapnik/csv/csv_grammar_x3_def.hpp
include/mapnik/csv/csv_types.hpp
include/mapnik/cxx11_support.hpp
include/mapnik/datasource.hpp
include/mapnik/datasource_cache.hpp
include/mapnik/datasource_geometry_type.hpp
include/mapnik/debug.hpp
include/mapnik/deps/mapbox/feature.hpp
include/mapnik/deps/mapbox/geometry.hpp
include/mapnik/deps/mapbox/geometry/box.hpp
include/mapnik/deps/mapbox/geometry/empty.hpp
include/mapnik/deps/mapbox/geometry/envelope.hpp
include/mapnik/deps/mapbox/geometry/for_each_point.hpp
include/mapnik/deps/mapbox/geometry/geometry.hpp
include/mapnik/deps/mapbox/geometry/line_string.hpp
include/mapnik/deps/mapbox/geometry/multi_line_string.hpp
include/mapnik/deps/mapbox/geometry/multi_point.hpp
include/mapnik/deps/mapbox/geometry/multi_polygon.hpp
include/mapnik/deps/mapbox/geometry/point.hpp
include/mapnik/deps/mapbox/geometry/point_arithmetic.hpp
include/mapnik/deps/mapbox/geometry/polygon.hpp
include/mapnik/deps/mapbox/geometry_io.hpp
include/mapnik/deps/mapbox/optional.hpp
include/mapnik/deps/mapbox/recursive_wrapper.hpp
include/mapnik/deps/mapbox/variant.hpp
include/mapnik/deps/mapbox/variant_cast.hpp
include/mapnik/deps/mapbox/variant_io.hpp
include/mapnik/deps/mapbox/variant_visitor.hpp
include/mapnik/enumeration.hpp
include/mapnik/evaluate_global_attributes.hpp
include/mapnik/expression.hpp
include/mapnik/expression_evaluator.hpp
include/mapnik/expression_grammar_x3.hpp
include/mapnik/expression_grammar_x3_config.hpp
include/mapnik/expression_grammar_x3_def.hpp
include/mapnik/expression_node.hpp
include/mapnik/expression_node_types.hpp
include/mapnik/expression_string.hpp
include/mapnik/extend_converter.hpp
include/mapnik/factory.hpp
include/mapnik/feature.hpp
include/mapnik/feature_factory.hpp

include/mapnik/feature_style_processor_impl.hpp
include/mapnik/feature_type_style.hpp
include/mapnik/featureset.hpp
include/mapnik/filter_factory.hpp
include/mapnik/filter_featureset.hpp
include/mapnik/font_engine_freetype.hpp
include/mapnik/font_set.hpp
include/mapnik/function_call.hpp
include/mapnik/geom_util.hpp
include/mapnik/geometry.hpp
include/mapnik/geometry/boost_adapters.hpp
include/mapnik/geometry/boost_spirit_karma_adapter.hpp
include/mapnik/geometry/box2d.hpp
include/mapnik/geometry/box2d_impl.hpp
include/mapnik/geometry/centroid.hpp
include/mapnik/geometry/closest_point.hpp
include/mapnik/geometry/correct.hpp
include/mapnik/geometry/envelope.hpp
include/mapnik/geometry/envelope_impl.hpp
include/mapnik/geometry/fusion_adapted.hpp
include/mapnik/geometry/geometry_type.hpp
include/mapnik/geometry/geometry_types.hpp
include/mapnik/geometry/interior.hpp
include/mapnik/geometry/is_empty.hpp
include/mapnik/geometry/is_simple.hpp
include/mapnik/geometry/is_valid.hpp
include/mapnik/geometry/line_string.hpp
include/mapnik/geometry/multi_line_string.hpp
include/mapnik/geometry/multi_point.hpp
include/mapnik/geometry/multi_polygon.hpp
include/mapnik/geometry/point.hpp
include/mapnik/geometry/polygon.hpp
include/mapnik/geometry/polygon_vertex_processor.hpp
include/mapnik/geometry/polylabel.hpp
include/mapnik/geometry/remove_empty.hpp
include/mapnik/geometry/reprojection.hpp
include/mapnik/geometry/reprojection_impl.hpp
include/mapnik/geometry/strategy.hpp
include/mapnik/geometry/to_path.hpp
include/mapnik/geometry/transform.hpp
include/mapnik/global.hpp
include/mapnik/gradient.hpp
include/mapnik/grid/grid.hpp

include/mapnik/grid/grid_renderer_base.hpp
include/mapnik/grid/grid_rendering_buffer.hpp
include/mapnik/grid/grid_view.hpp
include/mapnik/grid_vertex_converter.hpp
include/mapnik/group/group_layout.hpp
include/mapnik/group/group_layout_manager.hpp
include/mapnik/group/group_rule.hpp

include/mapnik/image_compositing.hpp
include/mapnik/image_copy.hpp
include/mapnik/image_filter.hpp
include/mapnik/image_filter_grammar_x3.hpp
include/mapnik/image_filter_grammar_x3_def.hpp
include/mapnik/image_filter_types.hpp
include/mapnik/image_impl.hpp
include/mapnik/image_null.hpp

include/mapnik/image_view_impl.hpp
include/mapnik/image_view_null.hpp
include/mapnik/jpeg_io.hpp
include/mapnik/json/attribute_value_visitor.hpp
include/mapnik/json/create_feature.hpp
include/mapnik/json/create_geometry.hpp
include/mapnik/json/extract_bounding_boxes_x3.hpp
include/mapnik/json/extract_bounding_boxes_x3_config.hpp
include/mapnik/json/feature_generator.hpp
include/mapnik/json/feature_generator_grammar.hpp
include/mapnik/json/feature_generator_grammar_impl.hpp
include/mapnik/json/feature_grammar_x3.hpp
include/mapnik/json/feature_grammar_x3_def.hpp
include/mapnik/json/feature_parser.hpp
include/mapnik/json/generic_json_grammar_x3.hpp
include/mapnik/json/generic_json_grammar_x3_def.hpp
include/mapnik/json/geojson_grammar_x3.hpp
include/mapnik/json/geojson_grammar_x3_def.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_generator_grammar_impl.hpp
include/mapnik/json/geometry_grammar.hpp
include/mapnik/json/geometry_grammar_impl.hpp
include/mapnik/json/geometry_parser.hpp
include/mapnik/json/json_grammar_config.hpp
include/mapnik/json/json_value.hpp
include/mapnik/json/parse_feature.hpp
include/mapnik/json/positions_grammar_x3.hpp
include/mapnik/json/positions_grammar_x3_def.hpp
include/mapnik/json/positions_x3.hpp
include/mapnik/json/properties_generator_grammar.hpp
include/mapnik/json/properties_generator_grammar_impl.hpp
include/mapnik/json/stringifier.hpp
include/mapnik/json/topojson_grammar_x3.hpp
include/mapnik/json/topojson_grammar_x3_def.hpp
include/mapnik/json/topojson_utils.hpp
include/mapnik/json/topology.hpp
include/mapnik/json/unicode_string_grammar_x3.hpp
include/mapnik/json/unicode_string_grammar_x3_def.hpp
include/mapnik/json/value_converters.hpp
include/mapnik/label_collision_detector.hpp
include/mapnik/layer.hpp

include/mapnik/marker_cache.hpp
include/mapnik/marker_helpers.hpp
include/mapnik/markers_placement.hpp
include/mapnik/markers_placements/basic.hpp
include/mapnik/markers_placements/interior.hpp
include/mapnik/markers_placements/line.hpp
include/mapnik/markers_placements/point.hpp
include/mapnik/markers_placements/polylabel.hpp
include/mapnik/markers_placements/vertex_first.hpp
include/mapnik/markers_placements/vertex_last.hpp
include/mapnik/memory_datasource.hpp
include/mapnik/memory_featureset.hpp
include/mapnik/miniz_png.hpp
include/mapnik/octree.hpp
include/mapnik/offset_converter.hpp
include/mapnik/palette.hpp
include/mapnik/params.hpp
include/mapnik/params_impl.hpp
include/mapnik/parse_path.hpp
include/mapnik/parse_transform.hpp
include/mapnik/path.hpp
include/mapnik/path_expression.hpp
include/mapnik/path_expression_grammar_x3.hpp
include/mapnik/path_expression_grammar_x3_def.hpp
include/mapnik/pixel_position.hpp
include/mapnik/pixel_types.hpp
include/mapnik/plugin.hpp

include/mapnik/raster.hpp
include/mapnik/raster_colorizer.hpp
include/mapnik/renderer_common.hpp
include/mapnik/renderer_common/apply_vertex_converter.hpp
include/mapnik/renderer_common/clipping_extent.hpp
include/mapnik/renderer_common/pattern_alignment.hpp
include/mapnik/renderer_common/process_building_symbolizer.hpp
include/mapnik/renderer_common/process_point_symbolizer.hpp
include/mapnik/renderer_common/process_polygon_symbolizer.hpp
include/mapnik/renderer_common/process_raster_symbolizer.hpp
include/mapnik/renderer_common/render_group_symbolizer.hpp
include/mapnik/renderer_common/render_markers_symbolizer.hpp
include/mapnik/renderer_common/render_pattern.hpp
include/mapnik/renderer_common/render_thunk.hpp
include/mapnik/renderer_common/render_thunk_extractor.hpp
include/mapnik/request.hpp
include/mapnik/rule.hpp
include/mapnik/rule_cache.hpp
include/mapnik/safe_cast.hpp
include/mapnik/save_map.hpp
include/mapnik/scale_denominator.hpp
include/mapnik/segment.hpp
include/mapnik/simplify.hpp
include/mapnik/simplify_converter.hpp
include/mapnik/span_image_filter.hpp
include/mapnik/sparsehash/dense_hash_map
include/mapnik/sparsehash/internal/densehashtable.h
include/mapnik/sparsehash/internal/hashtable-common.h

include/mapnik/sparsehash/type_traits.h
include/mapnik/sql_utils.hpp
include/mapnik/sse.hpp
include/mapnik/stringify_macro.hpp
include/mapnik/svg/geometry_svg_generator.hpp
include/mapnik/svg/geometry_svg_generator_impl.hpp
include/mapnik/svg/svg_converter.hpp
include/mapnik/svg/svg_grammar_config_x3.hpp
include/mapnik/svg/svg_parser.hpp
include/mapnik/svg/svg_parser_exception.hpp
include/mapnik/svg/svg_path_adapter.hpp
include/mapnik/svg/svg_path_attributes.hpp
include/mapnik/svg/svg_path_commands.hpp
include/mapnik/svg/svg_path_grammar_x3.hpp
include/mapnik/svg/svg_path_grammar_x3_def.hpp
include/mapnik/svg/svg_path_parser.hpp
include/mapnik/svg/svg_points_grammar.hpp
include/mapnik/svg/svg_renderer_agg.hpp
include/mapnik/svg/svg_storage.hpp
include/mapnik/svg/svg_transform_grammar_x3.hpp
include/mapnik/svg/svg_transform_grammar_x3_def.hpp
include/mapnik/symbolizer.hpp
include/mapnik/symbolizer_base.hpp
include/mapnik/symbolizer_default_values.hpp

include/mapnik/symbolizer_hash.hpp
include/mapnik/symbolizer_keys.hpp
include/mapnik/symbolizer_utils.hpp
include/mapnik/text/color_font_renderer.hpp
include/mapnik/text/evaluated_format_properties_ptr.hpp
include/mapnik/text/face.hpp
include/mapnik/text/font_feature_settings.hpp

include/mapnik/tiff_io.hpp
include/mapnik/timer.hpp
include/mapnik/tolerance_iterator.hpp
include/mapnik/transform/parse_transform.hpp
include/mapnik/transform/transform_expression.hpp
include/mapnik/transform/transform_expression_grammar_x3.hpp
include/mapnik/transform/transform_expression_grammar_x3_def.hpp
include/mapnik/transform/transform_processor.hpp
include/mapnik/transform_path_adapter.hpp
include/mapnik/transform_processor.hpp
include/mapnik/unicode.hpp
include/mapnik/util/char_array_buffer.hpp
include/mapnik/util/const_rendering_buffer.hpp
include/mapnik/util/container_adapter.hpp
include/mapnik/util/conversions.hpp

include/mapnik/util/hsl.hpp
include/mapnik/util/is_clockwise.hpp
include/mapnik/util/math.hpp
include/mapnik/util/name_to_int.hpp
include/mapnik/util/noncopyable.hpp
include/mapnik/util/path_iterator.hpp
include/mapnik/util/recursive_wrapper.hpp
include/mapnik/util/rounding_cast.hpp
include/mapnik/util/singleton.hpp
include/mapnik/util/spatial_index.hpp

include/mapnik/util/variant.hpp
include/mapnik/util/variant_io.hpp
include/mapnik/value.hpp
include/mapnik/value/error.hpp
include/mapnik/value/hash.hpp
include/mapnik/value/types.hpp
include/mapnik/version.hpp
include/mapnik/vertex.hpp
include/mapnik/vertex_adapters.hpp

include/mapnik/view_strategy.hpp
include/mapnik/view_transform.hpp
include/mapnik/warning_ignore.hpp
include/mapnik/warning_ignore_agg.hpp
include/mapnik/warp.hpp
include/mapnik/webp_io.hpp
include/mapnik/well_known_srs.hpp

include/mapnik/wkt/wkt_factory.hpp
include/mapnik/wkt/wkt_generator_grammar.hpp
include/mapnik/wkt/wkt_generator_grammar_impl.hpp
include/mapnik/wkt/wkt_grammar_x3.hpp
include/mapnik/wkt/wkt_grammar_x3_def.hpp
include/mapnik/xml_attribute_cast.hpp
include/mapnik/xml_loader.hpp
include/mapnik/xml_node.hpp

lib/libmapnik-json.a
lib/libmapnik-wkt.a
lib/libmapnik.so
lib/libmapnik.so.4.0
lib/libmapnik.so.4.0.0
lib/mapnik/fonts/DejaVuMathTeXGyre.ttf
lib/mapnik/fonts/DejaVuSans-Bold.ttf
lib/mapnik/fonts/DejaVuSans-BoldOblique.ttf
lib/mapnik/fonts/DejaVuSans-ExtraLight.ttf

lib/mapnik/fonts/DejaVuSerifCondensed-BoldItalic.ttf
lib/mapnik/fonts/DejaVuSerifCondensed-Italic.ttf
lib/mapnik/fonts/DejaVuSerifCondensed.ttf
lib/mapnik/input/csv.input
@comment =====[ Uncomment these after boost 1.60 hits the tree ]=====
@comment lib/mapnik/input/csv.input
%%GDAL%%lib/mapnik/input/gdal.input
lib/mapnik/input/geobuf.input
lib/mapnik/input/geojson.input
%%OGR%%lib/mapnik/input/ogr.input
%%PGRASTER%%lib/mapnik/input/pgraster.input
%%POSTGIS%%lib/mapnik/input/postgis.input
lib/mapnik/input/raster.input
lib/mapnik/input/shape.input
%%SQLITE3%%lib/mapnik/input/sqlite.input
lib/mapnik/input/topojson.input

Return to bug 237016

Lines 2-16 Link Here

(-)b/graphics/mapnik/Makefile (-12 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mapnik	4	PORTNAME= mapnik
5	PORTVERSION= 3.0.9
6	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
7	PORTREVISION= 30	6	DISTVERSION= 3.0.12-1078
		7	DISTVERSIONSUFFIX= -g538eb2026
8	CATEGORIES= graphics geography	8	CATEGORIES= graphics geography
9	MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/
10
11	PATCH_SITES= https://github.com/mapnik/mapnik/commit/
12	PATCHFILES= 1ddfe6c31548.patch:-p1
13	PATCHFILES+= c067eb7eec32.patch:-p1
14		9
15	MAINTAINER= littlesavage@rambler.ru	10	MAINTAINER= littlesavage@rambler.ru
16	COMMENT= Free Toolkit For Developing Mapping Applications	11	COMMENT= Free Toolkit For Developing Mapping Applications
Lines 18-26 COMMENT= Free Toolkit For Developing Mapping Applications Link Here
18	LICENSE= LGPL21+	13	LICENSE= LGPL21+
19	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
20		15
21	BROKEN= fails to build with boost 1.70, see bug 237016
22	DEPRECATED= Broken for more than 8 months
23	EXPIRATION_DATE= 2020-01-10
24	BROKEN_powerpc= fails to install: runs out of virtual memory	16	BROKEN_powerpc= fails to install: runs out of virtual memory
25		17
26	LIB_DEPENDS= libicuuc.so:devel/icu \	18	LIB_DEPENDS= libicuuc.so:devel/icu \
Lines 28-43 LIB_DEPENDS= libicuuc.so:devel/icu \ Link Here
28	libfreetype.so:print/freetype2 \	20	libfreetype.so:print/freetype2 \
29	libharfbuzz.so:print/harfbuzz	21	libharfbuzz.so:print/harfbuzz
30		22
31	USES= compiler:c++11-lib gnome pkgconfig python scons tar:bzip2	23	USES= compiler:c++14-lang gnome pkgconfig python scons tar:bzip2
		24	USE_GITHUB= yes
32	USE_GNOME= libxml2	25	USE_GNOME= libxml2
33	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
		27	GH_TUPLE= mapnik:test-data:v3.0.13-28-gc3982b7:test_data/test/data \
		28	mapnik:test-data-visual:v3.0.13-90-g901ee22:test_data_visual/test/data-visual \
		29	mapbox:variant:v1.1.5-55-g0f734f0:variant/deps/mapbox/variant \
		30	mapbox:geometry.hpp:v1.0.0:geometry/deps/mapbox/geometry \
		31	mapbox:protozero:v1.6.4:protozero/deps/mapbox/protozero \
		32	mapbox:polylabel:v1.0.3-4-g23f6a76:polylabel/deps/mapbox/polylabel
34	MAKE_ARGS= INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} \| ${TR} ' ' ,`" \	33	MAKE_ARGS= INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} \| ${TR} ' ' ,`" \
35	CUSTOM_CFLAGS="${CFLAGS}" CUSTOM_CXXFLAGS="${CXXFLAGS}" \	34	CUSTOM_CFLAGS="${CFLAGS}" CUSTOM_CXXFLAGS="${CXXFLAGS}" \
36	CUSTOM_LDFLAGS="${LDFLAGS}"	35	CUSTOM_LDFLAGS="${LDFLAGS}"
37		36
38	PORTDOCS= *	37	PORTDOCS= *
39		38
40	INPUT_PLUGINS= csv raster shape geojson topojson	39	INPUT_PLUGINS= csv raster shape geobuf geojson topojson
41		40
42	OPTIONS_DEFINE= DOCS CAIRO JPEG PNG TIFF WEBP PROJ	41	OPTIONS_DEFINE= DOCS CAIRO JPEG PNG TIFF WEBP PROJ
43	OPTIONS_DEFAULT=CAIRO GDAL OGR POSTGIS PGRASTER SQLITE3 JPEG PNG TIFF PROJ WEBP	42	OPTIONS_DEFAULT=CAIRO GDAL OGR POSTGIS PGRASTER SQLITE3 JPEG PNG TIFF PROJ WEBP

Lines 1-7 Link Here

(-)b/graphics/mapnik/distinfo (-7 / +15 lines)
1	TIMESTAMP = 1448548335	1	TIMESTAMP = 1576256861
2	SHA256 (mapnik-v3.0.9.tar.bz2) = 3a3f67532b05f8a527a5bab32effd7dd5aa59165c7e24505268f6d827955d3da	2	SHA256 (mapnik-mapnik-v3.0.12-1078-g538eb2026_GH0.tar.gz) = 9915b452832464f79fbd0d5a6f628b0d4194fae2d49983173f29bb2fcb2a3a43
3	SIZE (mapnik-v3.0.9.tar.bz2) = 75213927	3	SIZE (mapnik-mapnik-v3.0.12-1078-g538eb2026_GH0.tar.gz) = 10518098
4	SHA256 (1ddfe6c31548.patch) = fab754996485dc607108a4fd69d0df82414928eb5a210b329a84f47e90da0c8a	4	SHA256 (mapnik-test-data-v3.0.13-28-gc3982b7_GH0.tar.gz) = ba40463362981d27d181367372201a5d80388488a6c7c4b9684d29ca5ce45a9b
5	SIZE (1ddfe6c31548.patch) = 2148	5	SIZE (mapnik-test-data-v3.0.13-28-gc3982b7_GH0.tar.gz) = 13926749
6	SHA256 (c067eb7eec32.patch) = ac00d86197bba3ea5d6f72d23ea336412effd29ce779cedd8acafbcc563b81dc	6	SHA256 (mapnik-test-data-visual-v3.0.13-90-g901ee22_GH0.tar.gz) = 08b38f2534f4322647250fa813c473c21d616868ae901c8374f7bd668f789c1e
7	SIZE (c067eb7eec32.patch) = 2405	7	SIZE (mapnik-test-data-visual-v3.0.13-90-g901ee22_GH0.tar.gz) = 142327876
		8	SHA256 (mapbox-variant-v1.1.5-55-g0f734f0_GH0.tar.gz) = e198efd6851a4e4eae0cbc4fda4677030490d91e4e54af4c1c2cbacb01e7439e
		9	SIZE (mapbox-variant-v1.1.5-55-g0f734f0_GH0.tar.gz) = 124752
		10	SHA256 (mapbox-geometry.hpp-v1.0.0_GH0.tar.gz) = d871630f4ebe7b4270fa074d4a22213cad05d9fca79491dbf5a8fef5bb34893b
		11	SIZE (mapbox-geometry.hpp-v1.0.0_GH0.tar.gz) = 17449
		12	SHA256 (mapbox-protozero-v1.6.4_GH0.tar.gz) = 604456a979a0311b95c9e49c10e110f51ab58765bb9a77b0c67defe28fbe1402
		13	SIZE (mapbox-protozero-v1.6.4_GH0.tar.gz) = 1064871
		14	SHA256 (mapbox-polylabel-v1.0.3-4-g23f6a76_GH0.tar.gz) = 2379f9806c2461e87190f02679d4e60f0780103487f979bf7c314f5f857f8b77
		15	SIZE (mapbox-polylabel-v1.0.3-4-g23f6a76_GH0.tar.gz) = 43555

Lines 1-13 Link Here

(-)b/graphics/mapnik/files/patch-SConstruct (-7 / +5 lines)
1	--- SConstruct.orig 2016-02-15 15:52:54 UTC	1	--- SConstruct.orig 2019-10-22 08:47:07 UTC
2	+++ SConstruct	2	+++ SConstruct
3	@@ -1789,10 +1789,6 @@ if not preconfigured:	3	@@ -2044,8 +2044,6 @@ if not preconfigured:
4		4	common_cxx_flags += ' -Wno-unsequenced -Wtautological-compare -Wheader-hygiene '
5	if env['DEBUG']:	5	if env['DEBUG']:
6	env.Append(CXXFLAGS = common_cxx_flags + '-O0')	6	env.Append(CXXFLAGS = common_cxx_flags + '-O0')
7	- else:	7	- else:
8	- # TODO - add back -fvisibility-inlines-hidden
9	- # https://github.com/mapnik/mapnik/issues/1863
10	- env.Append(CXXFLAGS = common_cxx_flags + '-O%s' % (env['OPTIMIZATION']))	8	- env.Append(CXXFLAGS = common_cxx_flags + '-O%s' % (env['OPTIMIZATION']))
11	if env['DEBUG_UNDEFINED']:
12	env.Append(CXXFLAGS = '-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv -fwrapv')
13		9
		10
		11	# if requested, sort LIBPATH and CPPPATH one last time before saving...

Removed Link Here

(-)a/graphics/mapnik/files/patch-boost-1.69 (-62 lines)
1	https://github.com/mapnik/mapnik/issues/4000
2
3	--- deps/agg/src/agg_pixfmt_rgba.cpp.orig 2015-11-26 14:32:15 UTC
4	+++ deps/agg/src/agg_pixfmt_rgba.cpp
5	@@ -3,7 +3,12 @@
6
7	#pragma GCC diagnostic push
8	#include <mapnik/warning_ignore.hpp>
9	+#include <boost/version.hpp>
10	+#if BOOST_VERSION >= 106900
11	+#include <boost/gil.hpp>
12	+#else
13	#include <boost/gil/gil_all.hpp>
14	+#endif
15	#include <boost/gil/extension/toolbox/hsv.hpp>
16	#include <boost/gil/extension/toolbox/hsl.hpp>
17	#pragma GCC diagnostic pop
18	--- deps/boost/gil/extension/toolbox/hsl.hpp.orig 2015-11-26 14:32:15 UTC
19	+++ deps/boost/gil/extension/toolbox/hsl.hpp
20	@@ -16,7 +16,12 @@
21
22	#pragma GCC diagnostic push
23	#include <mapnik/warning_ignore.hpp>
24	+#include <boost/version.hpp>
25	+#if BOOST_VERSION >= 106900
26	+#include <boost/gil.hpp>
27	+#else
28	#include <boost/gil/gil_all.hpp>
29	+#endif
30	#pragma GCC diagnostic pop
31
32	namespace boost { namespace gil {
33	--- deps/boost/gil/extension/toolbox/hsv.hpp.orig 2015-11-26 14:32:15 UTC
34	+++ deps/boost/gil/extension/toolbox/hsv.hpp
35	@@ -16,7 +16,12 @@
36
37	#pragma GCC diagnostic push
38	#include <mapnik/warning_ignore.hpp>
39	+#include <boost/version.hpp>
40	+#if BOOST_VERSION >= 106900
41	+#include <boost/gil.hpp>
42	+#else
43	#include <boost/gil/gil_all.hpp>
44	+#endif
45	#pragma GCC diagnostic pop
46
47	namespace boost { namespace gil {
48	--- include/mapnik/image_filter.hpp.orig 2015-11-26 14:32:15 UTC
49	+++ include/mapnik/image_filter.hpp
50	@@ -31,7 +31,12 @@
51
52	#pragma GCC diagnostic push
53	#include <mapnik/warning_ignore.hpp>
54	+#include <boost/version.hpp>
55	+#if BOOST_VERSION >= 106900
56	+#include <boost/gil.hpp>
57	+#else
58	#include <boost/gil/gil_all.hpp>
59	+#endif
60	#pragma GCC diagnostic pop
61
62	// agg

Removed Link Here

(-)a/graphics/mapnik/files/patch-icu59 (-39 lines)
1	https://github.com/mapnik/mapnik/commit/9e58c890430d
2	https://github.com/mapnik/mapnik/commit/093fcee6d1ba
3
4	--- include/mapnik/text/harfbuzz_shaper.hpp.orig 2015-11-26 14:32:15 UTC
5	+++ include/mapnik/text/harfbuzz_shaper.hpp
6	@@ -41,6 +41,7 @@
7	#include <harfbuzz/hb-ft.h>
8
9	// icu
10	+#include <unicode/uvernum.h>
11	#include <unicode/uscript.h>
12
13	namespace mapnik
14	@@ -55,7 +56,8 @@ static inline hb_script_t _icu_script_to_script(UScrip
15	static inline const uint16_t * uchar_to_utf16(const UChar* src)
16	{
17	static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t");
18	-#if defined(_MSC_VER)
19	+#if defined(_MSC_VER) \|\| (U_ICU_VERSION_MAJOR_NUM >= 59)
20	+ // ^^ http://site.icu-project.org/download/59#TOC-ICU4C-char16_t1
21	return reinterpret_cast<const uint16_t *>(src);
22	#else
23	return src;
24	--- include/mapnik/unicode.hpp.orig 2015-11-26 14:32:15 UTC
25	+++ include/mapnik/unicode.hpp
26	@@ -31,6 +31,13 @@
27	// std
28	#include <cstdint>
29	#include <string>
30	+// icu
31	+#if (U_ICU_VERSION_MAJOR_NUM >= 59)
32	+#pragma GCC diagnostic push
33	+#include <mapnik/warning_ignore.hpp>
34	+#include <unicode/unistr.h>
35	+#pragma GCC diagnostic pop
36	+#endif
37
38	struct UConverter;
39

Lines 2-7 bin/mapnik-config Link Here

(-)b/graphics/mapnik/pkg-plist (-72 / +135 lines)
2	bin/mapnik-index	2	bin/mapnik-index
3	bin/mapnik-render	3	bin/mapnik-render
4	bin/shapeindex	4	bin/shapeindex
		5	include/mapnik/adaptive_smooth.hpp
5	include/mapnik/agg/agg_alpha_mask_u8.h	6	include/mapnik/agg/agg_alpha_mask_u8.h
6	include/mapnik/agg/agg_arc.h	7	include/mapnik/agg/agg_arc.h
7	include/mapnik/agg/agg_array.h	8	include/mapnik/agg/agg_array.h
Lines 136-169 include/mapnik/attribute.hpp Link Here
136	include/mapnik/attribute_collector.hpp	137	include/mapnik/attribute_collector.hpp
137	include/mapnik/attribute_descriptor.hpp	138	include/mapnik/attribute_descriptor.hpp
138	include/mapnik/boolean.hpp	139	include/mapnik/boolean.hpp
139	include/mapnik/box2d.hpp	140	include/mapnik/boost_spirit_instantiate.hpp
140	include/mapnik/cairo/cairo_context.hpp	141	include/mapnik/cairo/cairo_context.hpp
141	include/mapnik/cairo/cairo_image_util.hpp	142	include/mapnik/cairo/cairo_image_util.hpp
142	include/mapnik/cairo/cairo_render_vector.hpp	143	include/mapnik/cairo/cairo_render_vector.hpp
143	include/mapnik/cairo/cairo_renderer.hpp	144	include/mapnik/cairo/cairo_renderer.hpp
		145	include/mapnik/cairo/render_polygon_pattern.hpp
144	include/mapnik/cairo_io.hpp	146	include/mapnik/cairo_io.hpp
145	include/mapnik/color.hpp	147	include/mapnik/color.hpp
146	include/mapnik/color_factory.hpp	148	include/mapnik/color_factory.hpp
147	include/mapnik/config.hpp	149	include/mapnik/config.hpp
148	include/mapnik/config_error.hpp	150	include/mapnik/config_error.hpp
149	include/mapnik/coord.hpp	151	include/mapnik/coord.hpp
150	include/mapnik/css_color_grammar.hpp	152	include/mapnik/css_color_grammar_x3.hpp
151	include/mapnik/css_color_grammar_impl.hpp	153	include/mapnik/css_color_grammar_x3_def.hpp
152	include/mapnik/csv/csv_grammar.hpp	154	include/mapnik/csv/csv_grammar_x3.hpp
		155	include/mapnik/csv/csv_grammar_x3_def.hpp
		156	include/mapnik/csv/csv_types.hpp
		157	include/mapnik/cxx11_support.hpp
153	include/mapnik/datasource.hpp	158	include/mapnik/datasource.hpp
154	include/mapnik/datasource_cache.hpp	159	include/mapnik/datasource_cache.hpp
155	include/mapnik/datasource_geometry_type.hpp	160	include/mapnik/datasource_geometry_type.hpp
156	include/mapnik/debug.hpp	161	include/mapnik/debug.hpp
157	include/mapnik/ellipsoid.hpp	162	include/mapnik/deps/mapbox/feature.hpp
		163	include/mapnik/deps/mapbox/geometry.hpp
		164	include/mapnik/deps/mapbox/geometry/box.hpp
		165	include/mapnik/deps/mapbox/geometry/empty.hpp
		166	include/mapnik/deps/mapbox/geometry/envelope.hpp