[mapnik-vector-tile] 10/14: Drop mapnik-config.patch, fixed upstream.
Bas Couwenberg
sebastic at debian.org
Tue Sep 26 20:15:08 UTC 2017
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 1e94e54c77dd43ed346065ee46dcf9f75cc786d1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Sep 26 21:33:36 2017 +0200
Drop mapnik-config.patch, fixed upstream.
---
debian/changelog | 1 +
debian/patches/mapnik-config.patch | 96 ------------------------
debian/patches/series | 1 -
debian/patches/skip-tests-for-missing-data.patch | 4 +-
debian/patches/use-protozero-package.patch | 18 +++--
5 files changed, 15 insertions(+), 105 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 96911ec..bdf2212 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mapnik-vector-tile (1.5.0+dfsg-1) UNRELEASED; urgency=medium
* Add license & copyright for catch.hpp.
* Don't use catch Debian package.
(closes: #876902)
+ * Drop mapnik-config.patch, fixed upstream.
-- Bas Couwenberg <sebastic at debian.org> Tue, 26 Sep 2017 21:26:49 +0200
diff --git a/debian/patches/mapnik-config.patch b/debian/patches/mapnik-config.patch
deleted file mode 100644
index 365ba06..0000000
--- a/debian/patches/mapnik-config.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Description: Use system mapnik-config.
-Author: Bas Couwenberg <sebastic at debian.org>
-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'
- ],
-@@ -206,18 +206,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 23f5e4e..107f9ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
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 e0c3dab..0a8c655 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
-@@ -248,6 +248,9 @@ mapnik::box2d<double> zoomed_out(mapnik:
+@@ -247,6 +247,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");
-@@ -293,3 +296,5 @@ TEST_CASE("geometries visual tests")
+@@ -292,3 +295,5 @@ TEST_CASE("geometries visual tests")
}
}
}
diff --git a/debian/patches/use-protozero-package.patch b/debian/patches/use-protozero-package.patch
index 3848942..b3b1cbb 100644
--- a/debian/patches/use-protozero-package.patch
+++ b/debian/patches/use-protozero-package.patch
@@ -4,26 +4,32 @@ Forwarded: not-needed
--- a/gyp/build.gyp
+++ b/gyp/build.gyp
-@@ -38,6 +38,7 @@
+@@ -37,7 +37,8 @@
+ "<(SHARED_INTERMEDIATE_DIR)/vector_tile.pb.cc"
],
'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/',
+- '<(SHARED_INTERMEDIATE_DIR)/'
++ '<(SHARED_INTERMEDIATE_DIR)/',
+ '/usr/include'
],
'cflags_cc' : [
'-D_THREAD_SAFE',
-@@ -56,6 +57,7 @@
+@@ -55,7 +56,8 @@
+ },
'direct_dependent_settings': {
'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/',
+- '<(SHARED_INTERMEDIATE_DIR)/'
++ '<(SHARED_INTERMEDIATE_DIR)/',
+ '/usr/include'
],
'libraries':[
'-lprotobuf-lite'
-@@ -92,6 +94,7 @@
+@@ -91,7 +93,8 @@
+ },
'direct_dependent_settings': {
'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/',
+- '<(SHARED_INTERMEDIATE_DIR)/'
++ '<(SHARED_INTERMEDIATE_DIR)/',
+ '/usr/include'
],
'defines' : [
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik-vector-tile.git
More information about the Pkg-grass-devel
mailing list