From fed920f476b0367ef88a57d2f1596372efb4f074 Mon Sep 17 00:00:00 2001
From: Alfredo Palhares <alfredo@palhares.me>
Date: Tue, 8 Dec 2020 12:17:44 +0000
Subject: [PATCH] upgpkg: joplin 1.4.19-2 Use packaged electron

---
 .SRCINFO |  3 ++-
 PKGBUILD | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index d499610..e2a7f1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = joplin
 	pkgdesc = A note taking and to-do application with synchronization capabilities - Split Package
 	pkgver = 1.4.19
-	pkgrel = 1
+	pkgrel = 2
 	url = https://joplinapp.org/
 	arch = x86_64
 	arch = i686
@@ -28,6 +28,7 @@ pkgname = joplin
 
 pkgname = joplin-desktop-electron
 	pkgdesc = A note taking and to-do application with synchronization capabilities - Desktop
+	depends = electron
 	depends = gtk3
 	depends = libexif
 	depends = libgsf
diff --git a/PKGBUILD b/PKGBUILD
index de5d3ad..d03ce41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase="joplin"
 pkgname=('joplin' 'joplin-desktop-electron')
 pkgver=1.4.19
-pkgrel=1
+pkgrel=2
 pkgdesc="A note taking and to-do application with synchronization capabilities - Split Package"
 arch=('x86_64' 'i686')
 conflicts=('joplin-cli' 'joplin-desktop')
@@ -89,14 +89,19 @@ package_joplin() {
 #TODO: Check for slimdown
 package_joplin-desktop-electron() {
   pkgdesc="A note taking and to-do application with synchronization capabilities - Desktop"
-  depends=('gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
+  depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
          'nss' 'orc')
   optdepends=('libappindicator-gtk3: for tray icon')
 
-  msg2 "Building Desktop..."
+  msg2 "Building Desktop with packaged Electron..."
   mkdir -p "${pkgdir}/usr/share/joplin-desktop"
   cd "${srcdir}/joplin-${pkgver}/packages/app-desktop"
-  USE_HARD_LINKS=false npm run dist -- --publish=never
+  electron_dir="/usr/lib/electron"
+  electron_version=$(cat /usr/lib/electron/version)
+
+  USE_HARD_LINKS=false npm run dist -- --publish=never  --linux tar.xz --x64 \
+    --dir -c.electronDist=$electron_dir -c.electronVersion=$electron_version
+
   cd dist/linux-unpacked/
   cp -R "." "${pkgdir}/usr/share/joplin-desktop"