[Pkg-javascript-commits] [node-mapnik] 10/14: Add patch to use system mapnik-config.

[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 ffff387a0ad6e857b4debb5822923dfa3a9f3043
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 10 23:20:01 2017 +0200

    Add patch to use system mapnik-config.
---
 debian/changelog                   |  1 +
 debian/patches/mapnik-config.patch | 21 +++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0c07084..6fb25c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ node-mapnik (3.6.0+dfsg-1) UNRELEASED; urgency=medium
   * Bump minimum required libmapnik-dev version to 3.0.13.
   * Drop license & copyright for clipper, removed upstream.
   * Refresh patches.
+  * Add patch to use system mapnik-config.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 10 Jun 2017 22:52:20 +0200
 
diff --git a/debian/patches/mapnik-config.patch b/debian/patches/mapnik-config.patch
new file mode 100644
index 0000000..9e31030
--- /dev/null
+++ b/debian/patches/mapnik-config.patch
@@ -0,0 +1,21 @@
+Description: Use system mapnik-config.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/gen_settings.py
++++ b/gen_settings.py
+@@ -28,12 +28,12 @@ if __name__ == '__main__':
+     if ip:
+         settings_dict['input_plugins'] = ip
+     else:
+-        settings_dict['input_plugins'] = '\'%s\'' % os.popen("./mason_packages/.link/bin/mapnik-config --input-plugins").readline().strip()
++        settings_dict['input_plugins'] = '\'%s\'' % os.popen("/usr/bin/mapnik-config --input-plugins").readline().strip()
+     
+     mf = os.environ.get('MAPNIK_FONTS')
+     if mf:
+         settings_dict['fonts'] = mf
+     else:
+-        settings_dict['fonts'] = '\'%s\'' % os.popen("./mason_packages/.link/bin/mapnik-config --fonts").readline().strip()
++        settings_dict['fonts'] = '\'%s\'' % os.popen("/usr/bin/mapnik-config --fonts").readline().strip()
+ 
+     write_mapnik_settings(**settings_dict)
diff --git a/debian/patches/series b/debian/patches/series
index c07e03d..42a7096 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 test_disable_raster_layer.patch
 nodejs.patch
 use-packaged-dependencies.patch
+mapnik-config.patch

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