[Pkg-javascript-commits] [node-mapnik] 09/14: Refresh patches.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository node-mapnik.

commit 74972567c39bb681370ba79fb560376d35d51dac
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 10 23:05:12 2017 +0200

    Refresh patches.
---
 debian/changelog                               |  1 +
 debian/patches/nodejs.patch                    | 12 ++++++++----
 debian/patches/test_disable_raster_layer.patch |  4 ++--
 debian/patches/use-packaged-dependencies.patch |  8 ++++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91cbf3a..0c07084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ node-mapnik (3.6.0+dfsg-1) UNRELEASED; urgency=medium
   * Add libmapbox-wagyu-dev to build dependencies.
   * Bump minimum required libmapnik-dev version to 3.0.13.
   * Drop license & copyright for clipper, removed upstream.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 10 Jun 2017 22:52:20 +0200
 
diff --git a/debian/patches/nodejs.patch b/debian/patches/nodejs.patch
index e2c9aea..90ed6b3 100644
--- a/debian/patches/nodejs.patch
+++ b/debian/patches/nodejs.patch
@@ -35,14 +35,18 @@ Author: Bas Couwenberg <sebastic at debian.org>
  
 --- a/binding.gyp
 +++ b/binding.gyp
-@@ -56,9 +56,9 @@
-       'include_dirs': [
-         './deps/clipper/',
+@@ -58,13 +58,13 @@
+         './mason_packages/.link/include/freetype2',
+         './mason_packages/.link/include/cairo',
          './src',
 -        "<!(node -e \"require('nan')\")",
++        "<!(nodejs -e \"require('nan')\")",
+         # TODO: move these to mason packages once we have a minimal windows client for mason (@springmeyer)
+         # https://github.com/mapbox/mason/issues/396
+         "./deps/geometry/include/",
+         "./deps/wagyu/include/",
 -        "<!(node -e \"require('protozero')\")",
 -        "<!(node -e \"require('mapnik-vector-tile')\")"
-+        "<!(nodejs -e \"require('nan')\")",
 +        "<!(nodejs -e \"require('protozero')\")",
 +        "<!(nodejs -e \"require('mapnik-vector-tile')\")"
        ],
diff --git a/debian/patches/test_disable_raster_layer.patch b/debian/patches/test_disable_raster_layer.patch
index 35c4d4d..93087b6 100644
--- a/debian/patches/test_disable_raster_layer.patch
+++ b/debian/patches/test_disable_raster_layer.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/test/vector-tile.test.js
 +++ b/test/vector-tile.test.js
-@@ -2727,6 +2727,7 @@ describe('mapnik.VectorTile ', function(
+@@ -2734,6 +2734,7 @@ describe('mapnik.VectorTile ', function(
          });
      });
  
@@ -13,7 +13,7 @@ Forwarded: not-needed
      it('should be able to resample and encode (render) a geotiff into vector tile', function(done) {
          var vtile = new mapnik.VectorTile(0, 0, 0, {tile_size:256, buffer_size:0});
          // first we render a geotiff into an image tile
-@@ -2758,6 +2759,7 @@ describe('mapnik.VectorTile ', function(
+@@ -2765,6 +2766,7 @@ describe('mapnik.VectorTile ', function(
              });
          });
      });
diff --git a/debian/patches/use-packaged-dependencies.patch b/debian/patches/use-packaged-dependencies.patch
index ae82673..5ecd507 100644
--- a/debian/patches/use-packaged-dependencies.patch
+++ b/debian/patches/use-packaged-dependencies.patch
@@ -4,10 +4,14 @@ Forwarded: not-needed
 
 --- a/binding.gyp
 +++ b/binding.gyp
-@@ -57,8 +57,7 @@
-         './deps/clipper/',
+@@ -59,12 +59,7 @@
+         './mason_packages/.link/include/cairo',
          './src',
          "<!(nodejs -e \"require('nan')\")",
+-        # TODO: move these to mason packages once we have a minimal windows client for mason (@springmeyer)
+-        # https://github.com/mapbox/mason/issues/396
+-        "./deps/geometry/include/",
+-        "./deps/wagyu/include/",
 -        "<!(nodejs -e \"require('protozero')\")",
 -        "<!(nodejs -e \"require('mapnik-vector-tile')\")"
 +        '/usr/include'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-mapnik.git