From 7f5850a3f246adac202a39bf2e2072e32249f760 Mon Sep 17 00:00:00 2001
From: Alfredo Palhares <alfredo@palhares.me>
Date: Sun, 20 Dec 2020 18:00:38 +0000
Subject: [PATCH] upgpkg: joplin 1.4.19-12

Add Joplin Combined package
---
 .SRCINFO       | 19 +++++++++++++++++--
 PKGBUILD       | 18 +++++++++++-------
 joplin.install | 14 ++++++++------
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 269d8e5..07a3e91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = joplin
-	pkgdesc = A note taking and to-do application with synchronization capabilities - Split Package
+	pkgdesc = A note taking and to-do application with synchronization capabilities - CLI and Desktop Version
 	pkgver = 1.4.19
-	pkgrel = 11
+	pkgrel = 12
 	url = https://joplinapp.org/
 	install = joplin.install
 	arch = x86_64
@@ -13,6 +13,18 @@ pkgbase = joplin
 	makedepends = python
 	makedepends = rsync
 	makedepends = electron
+	depends = electron
+	depends = gtk3
+	depends = libexif
+	depends = libgsf
+	depends = libjpeg-turbo
+	depends = libwebp
+	depends = libxss
+	depends = nodejs
+	depends = nss
+	depends = orc
+	depends = rsync
+	optdepends = libappindicator-gtk3: for tray icon
 	source = joplin.desktop
 	source = joplin-desktop.sh
 	source = joplin.sh
@@ -23,6 +35,9 @@ pkgbase = joplin
 	sha256sums = 55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
 
 pkgname = joplin
+	conflicts = joplin-cli
+	conflicts = joplin-desktop
+	conflicts = joplin-desktop-electron
 
 pkgname = joplin-cli
 	pkgdesc = A note taking and to-do application with synchronization capabilities - CLI App
diff --git a/PKGBUILD b/PKGBUILD
index b79cb28..e29786d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,9 +8,12 @@ pkgbase="joplin"
 pkgname=('joplin' 'joplin-cli' 'joplin-desktop' 'joplin-desktop-electron')
 pkgver=1.4.19
 groups=('joplin')
-pkgrel=11
+pkgrel=12
 install="joplin.install"
-pkgdesc="A note taking and to-do application with synchronization capabilities - Split Package"
+depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
+         'nss' 'orc' 'rsync' )
+optdepends=('libappindicator-gtk3: for tray icon')
+pkgdesc="A note taking and to-do application with synchronization capabilities - CLI and Desktop Version"
 arch=('x86_64' 'i686')
 makedepends=('git' 'npm' 'python' 'rsync' 'electron')
 url="https://joplinapp.org/"
@@ -22,7 +25,6 @@ sha256sums=('c7c5d8b0ff9edb810ed901ea21352c9830bfa286f3c18b1292deca5b2f8febd2'
             '5b6f8847ec0c3848375755213c3009c273f478b4b80ed2c5f0af8f67ee0e94fb'
             '55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916')
 
-
 build() {
   cd "${srcdir}/joplin-${pkgver}"
   msg2 "Disabling husky (git hooks)"
@@ -43,6 +45,12 @@ check() {
   npm run test || exit 0
 }
 
+package_joplin() {
+  conflicts=('joplin-cli' 'joplin-desktop' 'joplin-desktop-electron')
+  package_joplin-cli
+  package_joplin-desktop
+}
+
 #TODO: A slimdown is needed
 package_joplin-cli() {
   pkgdesc="A note taking and to-do application with synchronization capabilities - CLI App"
@@ -79,7 +87,6 @@ package_joplin-cli() {
     ln -s "../../../lib" "lib"
     ln -s "../../../renderer" "renderer"
     ln -s "../../../tools" "tools"
-
   done
 
   msg2 "Installing LICENSE..."
@@ -91,9 +98,6 @@ package_joplin-cli() {
   install -Dm755 joplin.sh "${pkgdir}/usr/bin/joplin-cli"
 }
 
-package_joplin() {
-  package_joplin-cli
-}
 
 package_joplin-desktop() {
   pkgdesc="A note taking and to-do application with synchronization capabilities - Desktop"
diff --git a/joplin.install b/joplin.install
index d564568..487518a 100644
--- a/joplin.install
+++ b/joplin.install
@@ -6,10 +6,11 @@
 ## arg 1:  the new package version
 post_install() {
    echo "This is now a split Package:"
-   echo "joplin-cli for a CLI version"
-   echo "joplin-desktop for a Desktop version"
+   echo "joplin: Contains Both CLI and Desktop"
+   echo "joplin-cli: for a CLI version"
+   echo "joplin-desktop: for a Desktop version"
    echo "You may need to install them explicity on some AUR helpers"
-   echo "The joplin and joplin-desktop-electron will be DEPRECATED!!"
+   echo "The joplin-desktop-electron package will be DEPRECATED!!"
 }
 
 ## arg 1:  the new package version
@@ -22,10 +23,11 @@ post_install() {
 ## arg 2:  the old package version
 post_upgrade() {
    echo "This is now a split Package:"
-   echo "joplin-cli for a CLI version"
-   echo "joplin-desktop for a Desktop version"
+   echo "joplin: Contains Both CLI and Desktop"
+   echo "joplin-cli: for a CLI version"
+   echo "joplin-desktop: for a Desktop version"
    echo "You may need to install them explicity on some AUR helpers"
-   echo "The joplin and joplin-desktop-electron will be DEPRECATED!!"
+   echo "The joplin-desktop-electron package will be DEPRECATED!!"
 }
 
 ## arg 1:  the old package version