Merge branch 'master' of https://github.com/mapnik/mapnik

.travis.yml

@@ -92,11 +92,11 @@ script:
  - export SCONSFLAGS='--debug=time'
  - configure BENCHMARK=${BENCH}
  - cat config.log
- # we limit the `make` to 35 min
+ # we limit the `make` to 40 min
  # to ensure that slow builds still upload their
  # ccache results and therefore should be faster
  # (and might work) for the next build
- - DURATION=2100
+ - DURATION=2400
  - scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make
  - make test
  - enabled ${COVERAGE} coverage

CHANGELOG.md

@@ -41,6 +41,8 @@ Released: xx-xx-xx
 - GeoJSON - exposed `num_features_to_query` as datasource paramer (ref #3495)
 - Replaced `boost::mpl::vector<Types...>` with `std::tuple<Types...>` (ref #3503)
 - BuildingSymbolizer - fixed closing segment of polygon in building symbolizer (ref #3505)
+- Update dependencies versions
+- Fixed warnings when compiling with g++5
 
 ## 3.0.11
 

scripts/time-header

@@ -6,4 +6,4 @@ set -o pipefail
 CXXFLAGS="$(./utils/mapnik-config/mapnik-config --cflags)"
 CXX="$(./utils/mapnik-config/mapnik-config --cxx)"
 echo "Time taken to compile '$(basename $1)':"
-time ${CXX} $1 -I./test -I./deps/agg/include -Ideps -I./include $CXXFLAGS -o /tmp/header.out
+time ${CXX} $1 -I./test -I./deps/agg/include -Ideps -I./deps/mapbox/variant/include -I./include $CXXFLAGS -o /tmp/header.out