Update to version 0.9.0

4 files changed, 45 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab91d46d8bdb..88b21961c6be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,25 @@
 pkgbase = daedalus
 	pkgdesc = Cryptocurrency wallet
-	pkgver = 0.8.0
+	pkgver = 0.9.0
 	pkgrel = 1
 	url = https://github.com/input-output-hk/daedalus
 	arch = any
 	license = MIT
 	makedepends = asar
 	makedepends = git
-	makedepends = daedalus-bridge
 	makedepends = npm
 	makedepends = python2
 	depends = electron
-	source = git+https://github.com/input-output-hk/daedalus.git#commit=1490060fbcbaebba59fae5e10f9d96043c1c1309
+	source = git+https://github.com/input-output-hk/daedalus.git#commit=ba037d30491803500cca05829e6dce7533b1b021
 	source = daedalus.desktop
 	source = daedalus.js
+	source = no-check-dev-engines.patch
+	source = use-system-electron.patch
 	sha256sums = SKIP
 	sha256sums = 965733a8cdbd1f983ce66413908da6da1ebfaa9e73e5a949620aa6347d2db294
 	sha256sums = 8e2b172d2ebcf172135d9fffb25b8c2ab0319e9abbbba0f0827381e9bd043cab
+	sha256sums = 43195e9a8073dc9bbf6285d918b4e496d715a5cc5eb0991abb17871724e5358b
+	sha256sums = b91eda12b173fab3c2e0523a2c10556a63852f32c0fd6a4df3db5cb04d03b8ce
 
 pkgname = daedalus
 
diff --git a/PKGBUILD b/PKGBUILD
index 9626b9425beb..5fad878c5268 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,37 @@
 # Maintainer: Nicola Squartini <tensor5@gmail.com>
 
 pkgname=daedalus
-pkgver=0.8.0
-_commit=1490060fbcbaebba59fae5e10f9d96043c1c1309
+pkgver=0.9.0
+_commit=ba037d30491803500cca05829e6dce7533b1b021
 pkgrel=1
 pkgdesc='Cryptocurrency wallet'
 arch=('any')
 url='https://github.com/input-output-hk/daedalus'
 license=('MIT')
 depends=('electron')
-makedepends=('asar' 'git' 'daedalus-bridge' 'npm' 'python2')
+makedepends=('asar' 'git' 'npm' 'python2')
 source=("git+https://github.com/input-output-hk/daedalus.git#commit=${_commit}"
         "${pkgname}.desktop"
-        "${pkgname}.js")
+        "${pkgname}.js"
+        'no-check-dev-engines.patch'
+        'use-system-electron.patch')
 sha256sums=('SKIP'
             '965733a8cdbd1f983ce66413908da6da1ebfaa9e73e5a949620aa6347d2db294'
-            '8e2b172d2ebcf172135d9fffb25b8c2ab0319e9abbbba0f0827381e9bd043cab')
+            '8e2b172d2ebcf172135d9fffb25b8c2ab0319e9abbbba0f0827381e9bd043cab'
+            '43195e9a8073dc9bbf6285d918b4e496d715a5cc5eb0991abb17871724e5358b'
+            'b91eda12b173fab3c2e0523a2c10556a63852f32c0fd6a4df3db5cb04d03b8ce')
 
 prepare() {
     cd ${pkgname}
 
-    sed -e '/electron-inspector/d; /postinstall/d' -i package.json
+    patch -Np1 -i ../no-check-dev-engines.patch
+    patch -Np1 -i ../use-system-electron.patch
 }
 
 build() {
     cd ${pkgname}
 
     PYTHON=python2 npm install
-    npm link daedalus-client-api
     npm run build
 }
 
@@ -38,11 +42,12 @@ package() {
     install -Dm644 -t "${pkgdir}${appdir}" package.json
     install -Dm644 -t "${pkgdir}${appdir}/app" app/index.html
     install -Dm644 -t "${pkgdir}${appdir}/dist" dist/*
-    install -dm755 "${pkgdir}"${appdir}/node_modules/source-map{,-support}
-    cp -r node_modules/source-map/{LICENSE,lib,package.json,source-map.js} \
-        "${pkgdir}${appdir}/node_modules/source-map"
-    cp -r node_modules/source-map-support/{LICENSE.md,package.json,source-map-support.js} \
-        "${pkgdir}${appdir}/node_modules/source-map-support"
+
+    cd ${pkgdir}${appdir}
+    npm install electron-store source-map-support
+    rm package-lock.json
+    cd "${srcdir}/${pkgname}"
+
     asar pack "${pkgdir}${appdir}" "${pkgdir}/usr/lib/daedalus.asar"
     rm -r "${pkgdir}${appdir}"
 
diff --git a/no-check-dev-engines.patch b/no-check-dev-engines.patch
new file mode 100644
index 000000000000..46b06a416c66
--- /dev/null
+++ b/no-check-dev-engines.patch
@@ -0,0 +1,10 @@
+--- a/package.json
++++ b/package.json
+@@ -16,7 +16,6 @@
+     "start-debug-hot": "npm run start-hot -- --debug=5858",
+     "package": "cross-env NODE_ENV=production node -r babel-register -r babel-polyfill webpack/package.js",
+     "package-all": "npm run package -- --all",
+-    "postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json",
+     "preinstall": "which electron || npm install electron@1.7.11",
+     "dev": "npm run purge-translations && concurrently --kill-others \"npm run hot-server\" \"npm run start-hot\"",
+     "debug": "concurrently --kill-others \"npm run hot-server\" \"npm run start-debug-hot\" \"electron-inspector\"",
diff --git a/use-system-electron.patch b/use-system-electron.patch
new file mode 100644
index 000000000000..4122d6b268b1
--- /dev/null
+++ b/use-system-electron.patch
@@ -0,0 +1,12 @@
+--- a/package.json
++++ b/package.json
+@@ -67,9 +64,7 @@
+     "cucumber": "3.1.0",
+     "del": "2.2.2",
+     "devtron": "1.4.0",
+-    "electron": "1.7.11",
+     "electron-devtools-installer": "2.2.1",
+-    "electron-inspector": "0.1.4",
+     "electron-packager": "9.1.0",
+     "electron-rebuild": "1.6.0",
+     "eslint": "3.18.0",