From fe84e92359c80a09b31e6964c3b72d8e816623fa Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Thu, 2 Aug 2018 12:25:00 -0700 Subject: [PATCH] node-sqlcipher update: always build, statically link openssl --- .yarnclean | 1 - package.json | 5 +++-- yarn.lock | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.yarnclean b/.yarnclean index 2988772da44c..73649a14aab8 100644 --- a/.yarnclean +++ b/.yarnclean @@ -36,7 +36,6 @@ Gruntfile.js .*.yml # misc -*.gz *.md # asset directories diff --git a/package.json b/package.json index 2b85a405957e..9b4848fe0cb8 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "electron-config": "^1.0.0", "electron-editor-context-menu": "^1.1.1", "electron-is-dev": "^0.3.0", - "@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#ba2e16aef2a0b513135fc9857ca7be28052c4f88", + "@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#782b5bb1e9468df811287a4a4c8a97803e4fcefe", "electron-unhandled": "https://github.com/scottnonnenberg-signal/electron-unhandled.git#7496187472aa561d39fcd4c843a54ffbef0a388c", "electron-updater": "^2.21.10", "emoji-datasource": "4.0.0", @@ -255,7 +255,8 @@ "!**/._*", "!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,__pycache__,thumbs.db,.gitignore,.gitattributes,.editorconfig,.flowconfig,.yarn-metadata.json,.idea,appveyor.yml,.travis.yml,circle.yml,npm-debug.log,.nyc_output,yarn.lock,.yarn-integrity}", "node_modules/spellchecker/build/Release/*.node", - "node_modules/websocket/build/Release/*.node" + "node_modules/websocket/build/Release/*.node", + "!node_modules/@journeyapps/sqlcipher/deps/*" ] } } diff --git a/yarn.lock b/yarn.lock index ab335a8eccea..7e829fe5c747 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,9 +22,9 @@ "7zip-bin-mac" "~1.0.1" "7zip-bin-win" "~2.2.0" -"@journeyapps/sqlcipher@https://github.com/scottnonnenberg-signal/node-sqlcipher.git#ba2e16aef2a0b513135fc9857ca7be28052c4f88": +"@journeyapps/sqlcipher@https://github.com/scottnonnenberg-signal/node-sqlcipher.git#782b5bb1e9468df811287a4a4c8a97803e4fcefe": version "3.2.1" - resolved "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#ba2e16aef2a0b513135fc9857ca7be28052c4f88" + resolved "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#782b5bb1e9468df811287a4a4c8a97803e4fcefe" dependencies: nan "^2.10.0" node-pre-gyp "^0.10.0"