Use electron from the AUR

4 files changed, 32 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e21ee7e7267..ba8fd05936d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = ghetto-skype
-	pkgdesc = skype-web in an electron wrapper, with an indicator and desktop notifications
+	pkgdesc = Web Skype + Tray Icon + Notifications
 	pkgver = 1.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/stanfieldr/ghetto-skype
 	install = ghetto-skype.install
 	arch = x86_64
 	license = GPLv3
 	makedepends = git
 	makedepends = npm
-	depends = libappindicator-gtk2
+	depends = electron
 	provides = skype
 	conflicts = skype
 	source = https://github.com/stanfieldr/ghetto-skype/archive/v1.0.1.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 4437368ae882..b8dacab031ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,15 @@
 
 pkgname=ghetto-skype
 pkgver=1.0.1
-pkgrel=1
-pkgdesc='skype-web in an electron wrapper, with an indicator and desktop notifications'
+pkgrel=2
+pkgdesc='Web Skype + Tray Icon + Notifications'
 arch=('x86_64')
 url='https://github.com/stanfieldr/ghetto-skype'
 license=('GPLv3')
 depends=('libappindicator-gtk2')
 provides=('skype')
 conflicts=('skype')
+depends=('electron')
 makedepends=('git' 'npm')
 install=ghetto-skype.install
 source=("https://github.com/stanfieldr/ghetto-skype/archive/v${pkgver}.tar.gz")
@@ -25,28 +26,23 @@ sha256sums=('191de6e42f16f6b4d90550073247f6745faa7626f3e09dd60821b5c48bec6892')
 prepare() {
   cd "ghetto-skype-$pkgver"
 
-  sed -i -e "s|^INSTALLDIR=.*\$|INSTALLDIR=$srcdir/ghetto-skype-build|gm" \
-         -e "s|^\s*ln -sfn.*$||gm" Makefile
-}
-
-build() {
-  cd "$srcdir/ghetto-skype-$pkgver"
+  echo "Patching browser-window dependency for use with electron-prebuilt..."
+  patch --silent main.js < ../../main.js.patch
 
-  make install
+  echo "Patching the desktop shortcut to use electron-prebuilt..."
+  sed -i 's|^Exec=npm --prefix /opt/ghetto-skype start$|Exec=/usr/bin/ghetto-skype|g' assets/skype.desktop
 }
 
 package() {
-  cd "$srcdir/ghetto-skype-build"
-
   mkdir -p "$pkgdir/opt/ghetto-skype"
-  cp -R . "$pkgdir/opt/ghetto-skype"
+  cp -a "$srcdir/ghetto-skype-$pkgver/." "$pkgdir/opt/ghetto-skype"
+
+  install -Dm644 "$srcdir/ghetto-skype-$pkgver/assets/skype.desktop" "$pkgdir/usr/share/applications/ghetto-skype.desktop"
+  install -Dm644 "$srcdir/ghetto-skype-$pkgver/assets/tray/skype.png" "$pkgdir/usr/share/pixmaps/ghetto-skype.png"
+  install -Dm644 "$srcdir/ghetto-skype-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-  rm "$pkgdir/opt/ghetto-skype/Makefile"
-  #TODO: There are still a bunch of references to $srcdir in the package because
-  #      of the node_modules directory. We should look into how other node apps
-  #      get packaged to prevent this warning.
+  find "${pkgdir}" -type d -exec chmod 755 {} +
+  find "${pkgdir}" -type f -exec chmod 644 {} +
 
-  install -Dm644 "$srcdir/ghetto-skype-build/assets/skype.desktop" "$pkgdir/usr/share/applications/ghetto-skype.desktop"
-  install -Dm644 "$srcdir/ghetto-skype-build/assets/tray/skype.png" "$pkgdir/usr/share/pixmaps/ghetto-skype.png"
-  install -Dm644 "$srcdir/ghetto-skype-build/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm777 "$srcdir/../ghetto-skype" "$pkgdir/usr/bin/ghetto-skype"
 }
diff --git a/ghetto-skype b/ghetto-skype
new file mode 100755
index 000000000000..1b4152582eda
--- /dev/null
+++ b/ghetto-skype
@@ -0,0 +1,2 @@
+#!/bin/bash
+cd /opt/ghetto-skype && /usr/bin/electron /opt/ghetto-skype
diff --git a/main.js.patch b/main.js.patch
new file mode 100644
index 000000000000..532656e38070
--- /dev/null
+++ b/main.js.patch
@@ -0,0 +1,12 @@
+diff --git a/main.js b/main.js
+index 2cad20c..ba710d9 100644
+--- a/main.js
++++ b/main.js
+@@ -1,6 +1,6 @@
+ const electron      = require('electron');
+ const app           = electron.app;
+-const BrowserWindow = require('browser-window');
++const BrowserWindow = electron.BrowserWindow;
+ const Settings      = require('./settings');
+ const TrayIcon      = require('./tray');
+