upgpkg: joplin 1.4.19-14

* Remove meta package, just not worth the hassple
* Do not run checks for now
main
Alfredo Palhares 2020-12-27 16:42:24 +00:00
parent 2c86bba5bb
commit 1d5387113e
3 changed files with 10 additions and 54 deletions

View File

@ -1,7 +1,6 @@
pkgbase = joplin pkgbase = joplin
pkgdesc = A note taking and to-do application with synchronization capabilities - CLI and Desktop Version
pkgver = 1.4.19 pkgver = 1.4.19
pkgrel = 13 pkgrel = 14
url = https://joplinapp.org/ url = https://joplinapp.org/
install = joplin.install install = joplin.install
arch = x86_64 arch = x86_64
@ -35,15 +34,9 @@ pkgbase = joplin
sha256sums = 55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916 sha256sums = 55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
pkgname = joplin 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 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
@ -58,22 +51,5 @@ 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 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

View File

@ -5,15 +5,14 @@
# https://github.com/alfredopalhares/arch-pkgbuilds # https://github.com/alfredopalhares/arch-pkgbuilds
pkgbase="joplin" pkgbase="joplin"
pkgname=('joplin' 'joplin-cli' 'joplin-desktop' 'joplin-desktop-electron') pkgname=('joplin' 'joplin-desktop')
pkgver=1.4.19 pkgver=1.4.19
groups=('joplin') groups=('joplin')
pkgrel=13 pkgrel=14
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' )
optdepends=('libappindicator-gtk3: for tray icon') 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') arch=('x86_64' 'i686')
makedepends=('git' 'npm' 'python' 'rsync' 'electron') makedepends=('git' 'npm' 'python' 'rsync' 'electron')
url="https://joplinapp.org/" url="https://joplinapp.org/"
@ -36,26 +35,20 @@ build() {
msg2 "Installing dependencies..." msg2 "Installing dependencies..."
npm install npm install
msg2 "Running Lerna Bootstrap..."
./node_modules/.bin/lerna bootstrap ./node_modules/.bin/lerna bootstrap
} }
check() { check() {
cd "${srcdir}/joplin-${pkgver}" cd "${srcdir}/joplin-${pkgver}"
msg2 "Running Lerna Test Suite" msg2 "Not Running any tests for now"
npm run test || exit 0 #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 #TODO: A slimdown is needed
package_joplin-cli() { package_joplin() {
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"
@ -105,7 +98,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') conflicts=('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"
@ -129,12 +122,3 @@ package_joplin-desktop() {
install -Dm644 ${srcdir}/joplin.desktop -t "${pkgdir}/usr/share/applications" install -Dm644 ${srcdir}/joplin.desktop -t "${pkgdir}/usr/share/applications"
} }
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
}

View File

@ -6,11 +6,9 @@
## arg 1: the new package version ## arg 1: the new package version
post_install() { post_install() {
echo "This is now a split Package:" echo "This is now a split Package:"
echo "joplin: Contains Both CLI and Desktop" echo "joplin: CLI and Desktop"
echo "joplin-cli: for a CLI version"
echo "joplin-desktop: for a Desktop version" echo "joplin-desktop: for a Desktop version"
echo "You may need to install them explicity on some AUR helpers" echo "You may need to install them explicity on some AUR helpers"
echo "The joplin-desktop-electron package will be DEPRECATED!!"
} }
## arg 1: the new package version ## arg 1: the new package version
@ -23,11 +21,9 @@ post_install() {
## arg 2: the old package version ## arg 2: the old package version
post_upgrade() { post_upgrade() {
echo "This is now a split Package:" echo "This is now a split Package:"
echo "joplin: Contains Both CLI and Desktop" echo "joplin: CLI and Desktop"
echo "joplin-cli: for a CLI version"
echo "joplin-desktop: for a Desktop version" echo "joplin-desktop: for a Desktop version"
echo "You may need to install them explicity on some AUR helpers" echo "You may need to install them explicity on some AUR helpers"
echo "The joplin-desktop-electron package will be DEPRECATED!!"
} }
## arg 1: the old package version ## arg 1: the old package version