pull in improvements from #308

Author: Dane Springmeyer

.travis.yml

@@ -11,6 +11,7 @@ env:
    - NODE_VERSION="0.10"
    - NODE_VERSION="0.11"
    - NODE_WEBKIT="0.8.6"
+   - NODE_WEBKIT="0.10.0-rc1"
   global:
     - secure: QhuP5E/kYL1j1KDkHGJtk6DSJr1RH4DR/JrC62Viuf5Du8jE+i0kPWfF2MxtuEmKo35orhpu8t8mzKygWfuO63WPuuIE9qd/+V/y99Lqcj0tEN6wJ5RnywktbTJWg23zphjhmYq3Xj8DLVEikCZBwHtlbygkO9Q60cn1PK+bnPg=
     - secure: HxCS2dQAWI0KmCFnFNNZoucG4FeAW+itG7+Hp0dNtwmxZzGOZYFO2bZcGvTAMNfVN++oqLxTebYQI1oB5yUl5mPJjrjthaGS6Zq3S6rfJcXiv+icYgEXlR6ejQ97dsHw1Jeg8nedCQlI4kHfvG6pgBLhq9hnugxH1Cjhdt14E9U=

package.json

@@ -36,9 +36,8 @@
         "url": "git://github.com/mapbox/node-sqlite3.git"
     },
     "dependencies": {
-        "node-pre-gyp": "0.5.13",
         "nan": "1.1.2",
-        "node-pre-gyp": "0.5.18",
+        "node-pre-gyp": "0.5.19",
         "set-immediate": "0.1.1"
     },
     "bundledDependencies": [

scripts/build_against_node_webkit.sh

@@ -61,6 +61,8 @@ rm -rf ${NW_DOWNLOAD}
 node-pre-gyp rebuild --runtime=node-webkit --target=$NODE_WEBKIT
 # on Linux 32 bit: install 32 bit stuff necessary for node-webkit 32 bit
 sudo apt-get -y install libx11-6:i386
+sudo apt-get -y install libxtst6:i386
+sudo apt-get -y install libcap2:i386
 sudo apt-get -y install libglib2.0-0:i386
 sudo apt-get -y install libgtk2.0-0:i386
 sudo apt-get -y install libatk1.0-0:i386