summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlfredo Palhares2020-12-20 18:23:01 +0000
committerAlfredo Palhares2020-12-20 18:23:01 +0000
commit2c86bba5bb110f62689049bee0723779594c06a2 (patch)
treeadbc6def44921cfaf95299519c9275b408649d76
parent7f5850a3f246adac202a39bf2e2072e32249f760 (diff)
downloadaur-2c86bba5bb110f62689049bee0723779594c06a2.tar.gz
upgpkg: joplin 1.4.19-13
Add conflicts and descriptions
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD9
2 files changed, 26 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 07a3e9191e2f..80e4e8f57db1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = joplin
pkgdesc = A note taking and to-do application with synchronization capabilities - CLI and Desktop Version
pkgver = 1.4.19
- pkgrel = 12
+ pkgrel = 13
url = https://joplinapp.org/
install = joplin.install
arch = x86_64
@@ -43,6 +43,7 @@ pkgname = joplin-cli
pkgdesc = A note taking and to-do application with synchronization capabilities - CLI App
depends = nodejs
depends = rsync
+ conflicts = joplin
pkgname = joplin-desktop
pkgdesc = A note taking and to-do application with synchronization capabilities - Desktop
@@ -57,6 +58,22 @@ pkgname = joplin-desktop
depends = nss
depends = orc
optdepends = libappindicator-gtk3: for tray icon
+ conflicts = joplin
+ conflicts = 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
diff --git a/PKGBUILD b/PKGBUILD
index e29786d63d3d..27633f9b4678 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase="joplin"
pkgname=('joplin' 'joplin-cli' 'joplin-desktop' 'joplin-desktop-electron')
pkgver=1.4.19
groups=('joplin')
-pkgrel=12
+pkgrel=13
install="joplin.install"
depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
'nss' 'orc' 'rsync' )
@@ -55,6 +55,7 @@ package_joplin() {
package_joplin-cli() {
pkgdesc="A note taking and to-do application with synchronization capabilities - CLI App"
depends=('nodejs' 'rsync')
+ conflicts=('joplin')
msg2 "Building 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'
'nss' 'orc')
optdepends=('libappindicator-gtk3: for tray icon')
+ conflicts=('joplin' 'joplin-desktop-electron')
msg2 "Building Desktop with packaged Electron..."
mkdir -p "${pkgdir}/usr/share/joplin-desktop"
@@ -128,6 +130,11 @@ package_joplin-desktop() {
}
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
}