Use electron2

4 files changed, 24 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a814f33f4938..c145a4d24d72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = webtorrent-desktop
 	pkgdesc = Streaming torrent client.
 	pkgver = 0.20.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://webtorrent.io/desktop
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = npm
 	depends = gconf
-	depends = electron
+	depends = electron2
 	depends = libnotify
 	conflicts = webtorrent-desktop-git
 	conflicts = webtorrent-desktop-bin
@@ -18,9 +18,9 @@ pkgbase = webtorrent-desktop
 	source = webtorrent-desktop.desktop
 	source = traysupport.patch
 	sha256sums = 2eec644337f2e8a47187c54d702491e3b4c1f1236dae48cb494c4e99ba0a9796
-	sha256sums = 4ebe403535a6552333f56e6087355c85fbb1904b06908d62127337c7c593135c
+	sha256sums = 2c5e3e19b9bb3899fe244df0d285876beeee0b0dc6bf587febd698a50ccc277a
 	sha256sums = 6af365f47ca47b33cca65f62c3a662218ba38af7d3d52bb891ce3e73bbb60539
-	sha256sums = 111d9eea78a64932b0c0d20e07bca39ccbf372fbe59977255c7a9ae1b39f7d79
+	sha256sums = dbeff65a109489ce8ce4e89d0b4ad3bc1768d03707bc1a0845db852049296deb
 
 pkgname = webtorrent-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index 2adbd73f2dfe..4c16f3d27d35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
 
 pkgname=webtorrent-desktop
 pkgver=0.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Streaming torrent client."
 arch=('i686' 'x86_64')
 url="https://webtorrent.io/desktop"
 license=('MIT')
-depends=('gconf' 'electron' 'libnotify')
+depends=('gconf' 'electron2' 'libnotify')
 makedepends=('npm')
 conflicts=('webtorrent-desktop-git' 'webtorrent-desktop-bin')
 options=(!strip)
@@ -16,9 +16,9 @@ source=("https://github.com/feross/${pkgname}/archive/v${pkgver}.tar.gz"
         "${pkgname}.desktop"
         "traysupport.patch")
 sha256sums=('2eec644337f2e8a47187c54d702491e3b4c1f1236dae48cb494c4e99ba0a9796'
-            '4ebe403535a6552333f56e6087355c85fbb1904b06908d62127337c7c593135c'
+            '2c5e3e19b9bb3899fe244df0d285876beeee0b0dc6bf587febd698a50ccc277a'
             '6af365f47ca47b33cca65f62c3a662218ba38af7d3d52bb891ce3e73bbb60539'
-            '111d9eea78a64932b0c0d20e07bca39ccbf372fbe59977255c7a9ae1b39f7d79')
+            'dbeff65a109489ce8ce4e89d0b4ad3bc1768d03707bc1a0845db852049296deb')
 
 [ "$CARCH" = "i686" ]   && _platform=ia32
 [ "$CARCH" = "x86_64" ] && _platform=x64
diff --git a/traysupport.patch b/traysupport.patch
index 8891f6b1f78f..4a03e6d6e069 100644
--- a/traysupport.patch
+++ b/traysupport.patch
@@ -1,15 +1,15 @@
-diff --git a/src/main/tray.js b/src/main/tray.js

-index 889d1c8..cea1081 100644

---- a/src/main/tray.js

-+++ b/src/main/tray.js

-@@ -36,9 +36,7 @@ function setWindowFocus (flag) {

- }

- 

- function initLinux () {

--  checkLinuxTraySupport(function (err) {

--    if (!err) createTray()

--  })

-+  createTray()

- }

- 

- function initWin32 () {
\ No newline at end of file
+diff --git a/src/main/tray.js b/src/main/tray.js
+index 889d1c8..cea1081 100644
+--- a/src/main/tray.js
++++ b/src/main/tray.js
+@@ -36,9 +36,7 @@ function setWindowFocus (flag) {
+ }
+ 
+ function initLinux () {
+-  checkLinuxTraySupport(function (err) {
+-    if (!err) createTray()
+-  })
++  createTray()
+ }
+ 
+ function initWin32 () {
diff --git a/webtorrent-desktop b/webtorrent-desktop
index 65bb430d5039..c45d1f3ee62c 100755
--- a/webtorrent-desktop
+++ b/webtorrent-desktop
@@ -1,2 +1,2 @@
 #!/usr/bin/sh
-exec electron /usr/lib/webtorrent-desktop "$@"
+exec /usr/bin/electron2 /usr/lib/webtorrent-desktop "$@"