[Pkg-javascript-commits] [node-mapnik] 11/14: Add patch to use packaged dependencies instead of mason.

Bas Couwenberg sebastic at debian.org
Sun Jun 11 16:26:49 UTC 2017


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

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

commit 5e874e71f83283f0c9ac2f3418c3b9d6eb5cf07b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 10 23:28:44 2017 +0200

    Add patch to use packaged dependencies instead of mason.
---
 debian/changelog              |  1 +
 debian/patches/no-mason.patch | 19 +++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6fb25c2..dd666d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ node-mapnik (3.6.0+dfsg-1) UNRELEASED; urgency=medium
   * Drop license & copyright for clipper, removed upstream.
   * Refresh patches.
   * Add patch to use system mapnik-config.
+  * Add patch to use packaged dependencies instead of mason.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 10 Jun 2017 22:52:20 +0200
 
diff --git a/debian/patches/no-mason.patch b/debian/patches/no-mason.patch
new file mode 100644
index 0000000..1b02895
--- /dev/null
+++ b/debian/patches/no-mason.patch
@@ -0,0 +1,19 @@
+Description: Disable mason, dependencies are packaged.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/binding.gyp
++++ b/binding.gyp
+@@ -54,9 +54,9 @@
+         4267
+       ],
+       'include_dirs': [
+-        './mason_packages/.link/include/',
+-        './mason_packages/.link/include/freetype2',
+-        './mason_packages/.link/include/cairo',
++        '/usr/include',
++        '/usr/include/freetype2',
++        '/usr/include/cairo',
+         './src',
+         "<!(nodejs -e \"require('nan')\")",
+         '/usr/include'
diff --git a/debian/patches/series b/debian/patches/series
index 42a7096..a615dc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ test_disable_raster_layer.patch
 nodejs.patch
 use-packaged-dependencies.patch
 mapnik-config.patch
+no-mason.patch

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



More information about the Pkg-javascript-commits mailing list