Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-03-14 01:04:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

revert(electron): Downgrade to 1.1.3 to fix segfault

Browse source 
electron/electron/issues/5925
This commit is contained in:
Ben Gotow 2016-06-07 18:09:17 -07:00
parent 3492718609
commit 90abcd1bd7
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -11,7 +11,7 @@
"bugs": { "bugs": {
"url": "https://github.com/nylas/N1/issues" "url": "https://github.com/nylas/N1/issues"
}, },
"electronVersion": "1.2.1", "electronVersion": "1.1.3",
"dependencies": { "dependencies": {
"async": "^0.9", "async": "^0.9",
"babel-core": "6.8.0", "babel-core": "6.8.0",

2
script/bootstrap
View file

@ -48,7 +48,7 @@ function makeSqlite3Command() {
// Use our local version of npm (npm 3x) to build sqlite // Use our local version of npm (npm 3x) to build sqlite
var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"'; var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"';
return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/fts5.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/electron-v1.2-"+targetPlatform+"-"+targetArch return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/fts5.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/electron-v1.1-"+targetPlatform+"-"+targetArch
} }
function bootstrap() { function bootstrap() {

6
src/browser/application.es6
View file

@ -64,12 +64,6 @@ export default class Application extends EventEmitter {
this._databasePhase = 'setup'; this._databasePhase = 'setup';
this.perf = new PerformanceMonitor() this.perf = new PerformanceMonitor()
if (this.devMode) {
console.log("In Dev Mode: Installing React Developer Tools...");
const reactPath = path.resolve('./static/devtools-extensions/react-devtools-0.14.11');
BrowserWindow.addDevToolsExtension(reactPath);
}
this.setupJavaScriptArguments(); this.setupJavaScriptArguments();
this.handleEvents(); this.handleEvents();
this.handleLaunchOptions(options); this.handleLaunchOptions(options);