upgpkg: joplin 1.4.19-13

Add conflicts and descriptions
main
Alfredo Palhares 2020-12-20 18:23:01 +00:00
parent 7f5850a3f2
commit 2c86bba5bb
2 changed files with 26 additions and 2 deletions

View File

@ -1,7 +1,7 @@
pkgbase = joplin pkgbase = joplin
pkgdesc = A note taking and to-do application with synchronization capabilities - CLI and Desktop Version pkgdesc = A note taking and to-do application with synchronization capabilities - CLI and Desktop Version
pkgver = 1.4.19 pkgver = 1.4.19
pkgrel = 12 pkgrel = 13
url = https://joplinapp.org/ url = https://joplinapp.org/
install = joplin.install install = joplin.install
arch = x86_64 arch = x86_64
@ -43,6 +43,7 @@ pkgname = joplin-cli
pkgdesc = A note taking and to-do application with synchronization capabilities - CLI App pkgdesc = A note taking and to-do application with synchronization capabilities - CLI App
depends = nodejs depends = nodejs
depends = rsync depends = rsync
conflicts = joplin
pkgname = joplin-desktop pkgname = joplin-desktop
pkgdesc = A note taking and to-do application with synchronization capabilities - Desktop pkgdesc = A note taking and to-do application with synchronization capabilities - Desktop
@ -57,6 +58,22 @@ pkgname = joplin-desktop
depends = nss depends = nss
depends = orc depends = orc
optdepends = libappindicator-gtk3: for tray icon optdepends = libappindicator-gtk3: for tray icon
conflicts = joplin
conflicts = joplin-desktop-electron
pkgname = joplin-desktop-electron pkgname = joplin-desktop-electron
pkgdesc = DEPRECATED: A note taking and to-do application with synchronization capabilities - Desktop
depends = electron
depends = gtk3
depends = libexif
depends = libgsf
depends = libjpeg-turbo
depends = libwebp
depends = libxss
depends = nodejs
depends = nss
depends = orc
optdepends = libappindicator-gtk3: for tray icon
conflicts = joplin
conflicts = joplin-desktop

View File

@ -8,7 +8,7 @@ pkgbase="joplin"
pkgname=('joplin' 'joplin-cli' 'joplin-desktop' 'joplin-desktop-electron') pkgname=('joplin' 'joplin-cli' 'joplin-desktop' 'joplin-desktop-electron')
pkgver=1.4.19 pkgver=1.4.19
groups=('joplin') groups=('joplin')
pkgrel=12 pkgrel=13
install="joplin.install" install="joplin.install"
depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs' depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
'nss' 'orc' 'rsync' ) 'nss' 'orc' 'rsync' )
@ -55,6 +55,7 @@ package_joplin() {
package_joplin-cli() { package_joplin-cli() {
pkgdesc="A note taking and to-do application with synchronization capabilities - CLI App" pkgdesc="A note taking and to-do application with synchronization capabilities - CLI App"
depends=('nodejs' 'rsync') depends=('nodejs' 'rsync')
conflicts=('joplin')
msg2 "Building CLI..." msg2 "Building CLI..."
mkdir -p "${pkgdir}/usr/share/joplin-cli/app-cli" mkdir -p "${pkgdir}/usr/share/joplin-cli/app-cli"
@ -104,6 +105,7 @@ package_joplin-desktop() {
depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs' depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
'nss' 'orc') 'nss' 'orc')
optdepends=('libappindicator-gtk3: for tray icon') optdepends=('libappindicator-gtk3: for tray icon')
conflicts=('joplin' 'joplin-desktop-electron')
msg2 "Building Desktop with packaged Electron..." msg2 "Building Desktop with packaged Electron..."
mkdir -p "${pkgdir}/usr/share/joplin-desktop" mkdir -p "${pkgdir}/usr/share/joplin-desktop"
@ -128,6 +130,11 @@ package_joplin-desktop() {
} }
package_joplin-desktop-electron() { package_joplin-desktop-electron() {
pkgdesc="DEPRECATED: A note taking and to-do application with synchronization capabilities - Desktop"
depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
'nss' 'orc')
optdepends=('libappindicator-gtk3: for tray icon')
conflicts=('joplin' 'joplin-desktop')
package_joplin-desktop package_joplin-desktop
} }