[Pkg-javascript-commits] [Git][js-team/node-mapnik][master-3.7] 3 commits: Rebuild with mapnik-vector-tile 1.6.1+dfsg-6. (closes: #913708)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master-3.7 at Debian JavaScript Maintainers / node-mapnik


Commits:
cdf8fe9e by Bas Couwenberg at 2018-11-21T08:21:46Z
Rebuild with mapnik-vector-tile 1.6.1+dfsg-6. (closes: #913708)

- - - - -
8e4c4040 by Bas Couwenberg at 2018-11-21T08:21:47Z
Add patch by Jérémy Lal to support nodejs 10 / nan 2.11. (closes: #911344)

- - - - -
b5a2dd07 by Bas Couwenberg at 2018-11-21T08:21:57Z
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/new_instance.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+node-mapnik (3.7.2+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Rebuild with mapnik-vector-tile 1.6.1+dfsg-6.
+    (closes: #913708)
+  * Add patch by Jérémy Lal to support nodejs 10 / nan 2.11.
+    (closes: #911344)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 21 Nov 2018 09:21:49 +0100
+
 node-mapnik (3.7.2+dfsg-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9~),
                libmapnik-dev (>= 3.0.21),
                libprotozero-dev (>= 1.5.1),
                mapnik-utils,
-               mapnik-vector-tile (>= 1.6.1),
+               mapnik-vector-tile (>= 1.6.1+dfsg-6),
                node-gyp,
                node-mocha,
                node-nan (>= 2.4.0),


=====================================
debian/patches/new_instance.patch
=====================================
@@ -0,0 +1,20 @@
+Description: Port new instance call to match latest node/nan versions
+ this patch is backward compatible with previous node/nan versions.
+Author: Jérémy Lal <kapouer at melix.org>
+Last-Update: 2018-10-18
+Forwarded: not-needed, fixed in master
+
+--- a/src/mapnik_image.cpp
++++ b/src/mapnik_image.cpp
+@@ -3220,8 +3220,9 @@ void Image::EIO_AfterFromSVGBytes(uv_wor
+     {
+         Image* im = new Image(closure->im);
+         v8::Local<v8::Value> ext = Nan::New<v8::External>(im);
+-        v8::Local<v8::Object> image_obj = Nan::New(constructor)->GetFunction()->NewInstance(1, &ext);
+-        v8::Local<v8::Value> argv[2] = { Nan::Null(), image_obj };
++        Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
++        if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
++        v8::Local<v8::Value> argv[2] = { Nan::Null(), maybe_local.ToLocalChecked() };
+         Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 2, argv);
+     }
+     closure->cb.Reset();


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 test_disable_raster_layer.patch
 use-packaged-dependencies.patch
 no-mason.patch
+new_instance.patch



View it on GitLab: https://salsa.debian.org/js-team/node-mapnik/compare/7f153ce0db021bcd32dc5b3beb9ae033b99e55ee...b5a2dd074cb8df2e17d0dbeab17b79da1c014b11

-- 
View it on GitLab: https://salsa.debian.org/js-team/node-mapnik/compare/7f153ce0db021bcd32dc5b3beb9ae033b99e55ee...b5a2dd074cb8df2e17d0dbeab17b79da1c014b11
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-javascript-commits/attachments/20181121/129bf4bd/attachment-0001.html>