This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik-vector-tile.
commit dcf0e53b4ba3bdf7730a42fe4171303f3840adc0 Author: Bas Couwenberg <[email protected]> Date: Sat Jun 3 11:23:48 2017 +0200 Add patch to use system mapnik-config. --- debian/changelog | 1 + debian/patches/mapnik-config.patch | 96 ++++++++++++++++++++++++ debian/patches/series | 1 + debian/patches/skip-tests-for-missing-data.patch | 4 +- debian/patches/test_using_created_tif.patch | 2 +- debian/patches/use-protozero-package.patch | 87 ++------------------- 6 files changed, 106 insertions(+), 85 deletions(-) diff --git a/debian/changelog b/debian/changelog index 716a89d..de25ba6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mapnik-vector-tile (1.3.0+dfsg-1) UNRELEASED; urgency=medium * Team upload. * New upstream release. * Bump minimum required protozero to 1.5.1. + * Add patch to use system mapnik-config. -- Bas Couwenberg <[email protected]> Sat, 03 Jun 2017 11:08:37 +0200 diff --git a/debian/patches/mapnik-config.patch b/debian/patches/mapnik-config.patch new file mode 100644 index 0000000..27df362 --- /dev/null +++ b/debian/patches/mapnik-config.patch @@ -0,0 +1,96 @@ +Description: Use system mapnik-config. +Author: Bas Couwenberg <[email protected]> +Forwarded: not-needed + +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,7 @@ mason_packages/.link/bin/mapnik-config: + ./deps/gyp: + git clone https://chromium.googlesource.com/external/gyp.git ./deps/gyp && cd ./deps/gyp && git checkout $(GYP_REVISION) + +-build/Makefile: mason_packages/.link/bin/mapnik-config ./deps/gyp gyp/build.gyp test/* ++build/Makefile: ./deps/gyp gyp/build.gyp test/* + deps/gyp/gyp gyp/build.gyp --depth=. -DMAPNIK_PLUGINDIR=\"$(MAPNIK_PLUGINDIR)\" -Goutput_dir=. --generator-output=./build -f make + + libvtile: build/Makefile Makefile +--- a/gyp/build.gyp ++++ b/gyp/build.gyp +@@ -42,14 +42,14 @@ + ], + 'cflags_cc' : [ + '-D_THREAD_SAFE', +- '<!@(../mason_packages/.link/bin/mapnik-config --cflags)', # assume protobuf headers are here ++ '<!@(/usr/bin/mapnik-config --cflags)', # assume protobuf headers are here + '-Wno-sign-compare', + '-Wno-sign-conversion' + ], + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS':[ + '-D_THREAD_SAFE', +- '<!@(../mason_packages/.link/bin/mapnik-config --cflags)', # assume protobuf headers are here ++ '<!@(/usr/bin/mapnik-config --cflags)', # assume protobuf headers are here + '-Wno-sign-compare', + '-Wno-sign-conversion' + ], +@@ -84,11 +84,11 @@ + "<@(common_defines)" + ], + 'cflags_cc' : [ +- '<!@(../mason_packages/.link/bin/mapnik-config --cflags)' ++ '<!@(/usr/bin/mapnik-config --cflags)' + ], + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS':[ +- '<!@(../mason_packages/.link/bin/mapnik-config --cflags)' ++ '<!@(/usr/bin/mapnik-config --cflags)' + ], + }, + 'direct_dependent_settings': { +@@ -100,19 +100,19 @@ + "<@(common_defines)" + ], + 'cflags_cc' : [ +- '<!@(../mason_packages/.link/bin/mapnik-config --cflags)' ++ '<!@(/usr/bin/mapnik-config --cflags)' + ], + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS':[ +- '<!@(../mason_packages/.link/bin/mapnik-config --cflags)' ++ '<!@(/usr/bin/mapnik-config --cflags)' + ], + }, + 'libraries':[ +- '<!@(../mason_packages/.link/bin/mapnik-config --libs)', +- '<!@(../mason_packages/.link/bin/mapnik-config --ldflags)', ++ '<!@(/usr/bin/mapnik-config --libs)', ++ '<!@(/usr/bin/mapnik-config --ldflags)', + '-lmapnik-wkt', + '-lmapnik-json', +- '<!@(../mason_packages/.link/bin/mapnik-config --dep-libs)', ++ '<!@(/usr/bin/mapnik-config --dep-libs)', + '-lprotobuf-lite', + '-lz' + ], +@@ -221,18 +221,18 @@ + "../src" + ], + 'libraries':[ +- '-L<!@(../mason_packages/.link/bin/mapnik-config --prefix)/lib', +- '<!@(../mason_packages/.link/bin/mapnik-config --ldflags)', ++ '-L<!@(/usr/bin/mapnik-config --prefix)/lib', ++ '<!@(/usr/bin/mapnik-config --ldflags)', + '-lz' + ], + 'cflags_cc' : [ + '-D_THREAD_SAFE', +- '<!@(../mason_packages/.link/bin/mapnik-config --cflags)' # assume protobuf headers are here ++ '<!@(/usr/bin/mapnik-config --cflags)' # assume protobuf headers are here + ], + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS':[ + '-D_THREAD_SAFE', +- '<!@(../mason_packages/.link/bin/mapnik-config --cflags)' # assume protobuf headers are here ++ '<!@(/usr/bin/mapnik-config --cflags)' # assume protobuf headers are here + ], + } + } diff --git a/debian/patches/series b/debian/patches/series index 107f9ad..23f5e4e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ test_using_created_tif.patch use-protozero-package.patch skip-tests-for-missing-data.patch +mapnik-config.patch diff --git a/debian/patches/skip-tests-for-missing-data.patch b/debian/patches/skip-tests-for-missing-data.patch index 3fb57c6..e0c3dab 100644 --- a/debian/patches/skip-tests-for-missing-data.patch +++ b/debian/patches/skip-tests-for-missing-data.patch @@ -25,7 +25,7 @@ Forwarded: not-needed // the test is to check if you can overzoom a raster after encoding it into a vector tile --- a/test/geometry_visual_test.cpp +++ b/test/geometry_visual_test.cpp -@@ -242,6 +242,9 @@ mapnik::box2d<double> zoomed_out(mapnik: +@@ -248,6 +248,9 @@ mapnik::box2d<double> zoomed_out(mapnik: return new_bbox; } @@ -35,7 +35,7 @@ Forwarded: not-needed TEST_CASE("geometries visual tests") { std::vector<std::string> geometries = mapnik::util::list_directory("./test/geometry-test-data/input"); -@@ -287,3 +290,5 @@ TEST_CASE("geometries visual tests") +@@ -293,3 +296,5 @@ TEST_CASE("geometries visual tests") } } } diff --git a/debian/patches/test_using_created_tif.patch b/debian/patches/test_using_created_tif.patch index da0e175..dcacbc6 100644 --- a/debian/patches/test_using_created_tif.patch +++ b/debian/patches/test_using_created_tif.patch @@ -11,7 +11,7 @@ Forwarded: not-needed mapnik::save_to_file(im_data,"test/fixtures/actual-2.jpeg","jpeg"); } -- std::size_t expected_image_size = 45660; +- std::size_t expected_image_size = 42977; - std::size_t expected_vtile_size = expected_image_size + 26; + std::size_t expected_image_size = 4723; + std::size_t expected_vtile_size = expected_image_size + 23; diff --git a/debian/patches/use-protozero-package.patch b/debian/patches/use-protozero-package.patch index 0f5c9b0..3848942 100644 --- a/debian/patches/use-protozero-package.patch +++ b/debian/patches/use-protozero-package.patch @@ -4,104 +4,27 @@ Forwarded: not-needed --- a/gyp/build.gyp +++ b/gyp/build.gyp -@@ -42,7 +42,7 @@ +@@ -38,6 +38,7 @@ ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/', -- '../deps/protozero/include' + '/usr/include' ], 'cflags_cc' : [ '-D_THREAD_SAFE', -@@ -61,7 +61,7 @@ +@@ -56,6 +57,7 @@ 'direct_dependent_settings': { 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/', -- '../deps/protozero/include' + '/usr/include' ], 'libraries':[ '-lprotobuf-lite' -@@ -92,7 +92,7 @@ - '<!@(mapnik-config --cflags)' - ], - 'include_dirs': [ -- '../deps/protozero/include', -+ '/usr/include', - '../deps/clipper/cpp' - ], - 'xcode_settings': { -@@ -103,7 +103,7 @@ +@@ -92,6 +94,7 @@ 'direct_dependent_settings': { 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/', -- '../deps/protozero/include', -+ '/usr/include', - '../deps/clipper/cpp' ++ '/usr/include' ], 'defines' : [ -@@ -141,7 +141,7 @@ - ], - "include_dirs": [ - "../src", -- '../deps/protozero/include', -+ '/usr/include', - '../test', - '../test/utils' - ] -@@ -159,7 +159,7 @@ - ], - "include_dirs": [ - "../src", -- '../deps/protozero/include' -+ '/usr/include' - ] - }, - { -@@ -175,7 +175,7 @@ - ], - "include_dirs": [ - "../src", -- '../deps/protozero/include' -+ '/usr/include' - ] - }, - { -@@ -191,7 +191,7 @@ - ], - "include_dirs": [ - "../src", -- '../deps/protozero/include' -+ '/usr/include' - ] - }, - { -@@ -207,7 +207,7 @@ - ], - "include_dirs": [ - "../src", -- '../deps/protozero/include' -+ '/usr/include' - ] - }, - { -@@ -223,7 +223,7 @@ - ], - "include_dirs": [ - "../src", -- '../deps/protozero/include' -+ '/usr/include' - ] - }, - { ---- a/Makefile -+++ b/Makefile -@@ -16,7 +16,7 @@ all: libvtile - ./deps/clipper: - git clone https://github.com/mapnik/clipper.git -b r496-mapnik ./deps/clipper && cd ./deps/clipper && git checkout $(CLIPPER_REVISION) && ./cpp/fix_members.sh - --build/Makefile: ./deps/gyp ./deps/clipper ./deps/protozero gyp/build.gyp test/* -+build/Makefile: ./deps/gyp ./deps/clipper gyp/build.gyp test/* - deps/gyp/gyp gyp/build.gyp --depth=. -DMAPNIK_PLUGINDIR=\"$(MAPNIK_PLUGINDIR)\" -Goutput_dir=. --generator-output=./build -f make - - libvtile: build/Makefile Makefile + "<@(common_defines)" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik-vector-tile.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
