From 3a1db53d5aa50716e18ccf8a7395094985e9469a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 18 Dec 2016 09:57:50 +0100
Subject: [PATCH 1/2] Simpler expression for finding vips-cpp libdir (#656)

Fixes: #655
---
 binding.gyp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/binding.gyp b/binding.gyp
index 878c0b25..f38c5215 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -107,7 +107,7 @@
           ['OS == "linux"', {
             'defines': [
               # Inspect libvips-cpp.so to determine which C++11 ABI version was used and set _GLIBCXX_USE_CXX11_ABI accordingly. This is quite horrible.
-              '_GLIBCXX_USE_CXX11_ABI=<!(if readelf -Ws "$(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs-only-L vips-cpp | cut -c 3- | sed -e "s/[[:space:]]*$//" | sed -e "s/^$/\/usr\/lib/")/libvips-cpp.so" | c++filt | grep -qF __cxx11;then echo "1";else echo "0";fi)'
+              '_GLIBCXX_USE_CXX11_ABI=<!(if readelf -Ws "$(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --variable libdir vips-cpp)/libvips-cpp.so" | c++filt | grep -qF __cxx11;then echo "1";else echo "0";fi)'
             ]
           }]
         ]

From d9b667e3461dda42412bfe90d6e64203d02b9f3b Mon Sep 17 00:00:00 2001
From: Adam Coyne <github@mail2.coyne.nu>
Date: Sat, 31 Dec 2016 13:32:18 -0600
Subject: [PATCH 2/2] Docs: remove parentheses from sharp.format (#663)

---
 docs/api-constructor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-constructor.md b/docs/api-constructor.md
index 9c6371fb..fd0c38ba 100644
--- a/docs/api-constructor.md
+++ b/docs/api-constructor.md
@@ -50,7 +50,7 @@ An Object containing nested boolean values representing the available input and
 **Examples**
 
 ```javascript
-console.log(sharp.format());
+console.log(sharp.format);
 ```
 
 Returns **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)**