From f78ffdb9ce6fc130d4c95721179f8cf888bddffb Mon Sep 17 00:00:00 2001
From: Lovell Fuller <github@lovell.info>
Date: Sun, 21 May 2017 17:46:49 +0100
Subject: [PATCH] Upgrade to libvips v8.5.5

---
 binding.js             | 20 ++++++++++----------
 docs/changelog.md      |  2 +-
 package.json           |  6 +++---
 packaging/build/lin.sh | 14 +++++++-------
 src/common.h           |  4 ++--
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/binding.js b/binding.js
index 4695a2b5..6f00167a 100644
--- a/binding.js
+++ b/binding.js
@@ -3,7 +3,6 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const zlib = require('zlib');
 
 const caw = require('caw');
 const got = require('got');
@@ -29,15 +28,16 @@ const isFile = function (file) {
 };
 
 const unpack = function (tarPath, done) {
-  const extractor = tar.Extract({ path: path.join(__dirname, 'vendor') });
-  if (done) {
-    extractor.on('end', done);
-  }
-  extractor.on('error', error);
-  fs.createReadStream(tarPath)
-    .on('error', error)
-    .pipe(zlib.Unzip())
-    .pipe(extractor);
+  const vendorPath = path.join(__dirname, 'vendor');
+  fs.mkdirSync(vendorPath);
+  tar
+    .extract({
+      file: tarPath,
+      cwd: vendorPath,
+      strict: true
+    })
+    .then(done)
+    .catch(error);
 };
 
 const platformId = function () {
diff --git a/docs/changelog.md b/docs/changelog.md
index 7c4894ce..12ed2d64 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -2,7 +2,7 @@
 
 ### v0.18 - "*ridge*"
 
-Requires libvips v8.5.2.
+Requires libvips v8.5.5.
 
 #### v0.18.0 - TBD
 
diff --git a/package.json b/package.json
index 72d8b74d..a4919560 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "got": "^6.7.1",
     "nan": "^2.6.2",
     "semver": "^5.3.0",
-    "tar": "^2.2.1"
+    "tar": "^3.1.3"
   },
   "devDependencies": {
     "async": "^2.4.0",
@@ -78,7 +78,7 @@
     "documentation": "^4.0.0-rc.1",
     "exif-reader": "^1.0.2",
     "icc": "^1.0.0",
-    "mocha": "^3.3.0",
+    "mocha": "^3.4.1",
     "nyc": "^10.3.2",
     "rimraf": "^2.5.4",
     "semistandard": "^11.0.0",
@@ -86,7 +86,7 @@
   },
   "license": "Apache-2.0",
   "config": {
-    "libvips": "8.5.4"
+    "libvips": "8.5.5"
   },
   "engines": {
     "node": ">=4"
diff --git a/packaging/build/lin.sh b/packaging/build/lin.sh
index b52b8af8..2f559f7e 100755
--- a/packaging/build/lin.sh
+++ b/packaging/build/lin.sh
@@ -18,7 +18,7 @@ export CXXFLAGS="${FLAGS}"
 # Dependency version numbers
 VERSION_ZLIB=1.2.11
 VERSION_FFI=3.2.1
-VERSION_GLIB=2.52.0
+VERSION_GLIB=2.53.1
 VERSION_XML2=2.9.4
 VERSION_GSF=1.14.41
 VERSION_EXIF=0.6.21
@@ -29,15 +29,15 @@ VERSION_WEBP=0.6.0
 VERSION_TIFF=4.0.7
 VERSION_ORC=0.4.26
 VERSION_GDKPIXBUF=2.36.6
-VERSION_FREETYPE=2.7.1
+VERSION_FREETYPE=2.8
 VERSION_EXPAT=2.2.0
 VERSION_FONTCONFIG=2.12.1
-VERSION_HARFBUZZ=1.4.5
+VERSION_HARFBUZZ=1.4.6
 VERSION_PIXMAN=0.34.0
 VERSION_CAIRO=1.14.8
-VERSION_PANGO=1.40.4
-VERSION_CROCO=0.6.11
-VERSION_SVG=2.40.16
+VERSION_PANGO=1.40.5
+VERSION_CROCO=0.6.12
+VERSION_SVG=2.40.17
 VERSION_GIF=5.1.4
 
 # Least out-of-sync Sourceforge mirror
@@ -57,7 +57,7 @@ cd ${DEPS}/ffi
 make install-strip
 
 mkdir ${DEPS}/glib
-curl -Ls https://download.gnome.org/sources/glib/2.52/glib-${VERSION_GLIB}.tar.xz | tar xJC ${DEPS}/glib --strip-components=1
+curl -Ls https://download.gnome.org/sources/glib/2.53/glib-${VERSION_GLIB}.tar.xz | tar xJC ${DEPS}/glib --strip-components=1
 cd ${DEPS}/glib
 echo glib_cv_stack_grows=no >>glib.cache
 echo glib_cv_uscore=no >>glib.cache
diff --git a/src/common.h b/src/common.h
index 7779d69c..1bf3b41c 100644
--- a/src/common.h
+++ b/src/common.h
@@ -25,8 +25,8 @@
 
 // Verify platform and compiler compatibility
 
-#if (VIPS_MAJOR_VERSION < 8 || (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 4))
-#error libvips version 8.4.x required - see sharp.dimens.io/page/install
+#if (VIPS_MAJOR_VERSION < 8 || (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 5))
+#error libvips version 8.5.x required - see sharp.dimens.io/page/install
 #endif
 
 #if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))