From 1d5387113e279cf87a66a1ced74fd0d091936c35 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Sun, 27 Dec 2020 16:42:24 +0000 Subject: [PATCH] upgpkg: joplin 1.4.19-14 * Remove meta package, just not worth the hassple * Do not run checks for now --- .SRCINFO | 26 +------------------------- PKGBUILD | 30 +++++++----------------------- joplin.install | 8 ++------ 3 files changed, 10 insertions(+), 54 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 80e4e8f..fb076e9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,6 @@ pkgbase = joplin - pkgdesc = A note taking and to-do application with synchronization capabilities - CLI and Desktop Version pkgver = 1.4.19 - pkgrel = 13 + pkgrel = 14 url = https://joplinapp.org/ install = joplin.install arch = x86_64 @@ -35,15 +34,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 depends = nodejs depends = rsync - conflicts = joplin pkgname = joplin-desktop pkgdesc = A note taking and to-do application with synchronization capabilities - Desktop @@ -58,22 +51,5 @@ 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 27633f9..c1b4129 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,15 +5,14 @@ # https://github.com/alfredopalhares/arch-pkgbuilds pkgbase="joplin" -pkgname=('joplin' 'joplin-cli' 'joplin-desktop' 'joplin-desktop-electron') +pkgname=('joplin' 'joplin-desktop') pkgver=1.4.19 groups=('joplin') -pkgrel=13 +pkgrel=14 install="joplin.install" 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/" @@ -36,26 +35,20 @@ build() { msg2 "Installing dependencies..." npm install + msg2 "Running Lerna Bootstrap..." ./node_modules/.bin/lerna bootstrap } check() { cd "${srcdir}/joplin-${pkgver}" - msg2 "Running Lerna Test Suite" - npm run test || exit 0 -} - -package_joplin() { - conflicts=('joplin-cli' 'joplin-desktop' 'joplin-desktop-electron') - package_joplin-cli - package_joplin-desktop + msg2 "Not Running any tests for now" + #npm run test || exit 0 } #TODO: A slimdown is needed -package_joplin-cli() { +package_joplin() { 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" @@ -105,7 +98,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') + conflicts=('joplin-desktop-electron') msg2 "Building Desktop with packaged Electron..." mkdir -p "${pkgdir}/usr/share/joplin-desktop" @@ -129,12 +122,3 @@ package_joplin-desktop() { 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 -} - diff --git a/joplin.install b/joplin.install index 487518a..ea9eee7 100644 --- a/joplin.install +++ b/joplin.install @@ -6,11 +6,9 @@ ## arg 1: the new package version post_install() { echo "This is now a split Package:" - echo "joplin: Contains Both CLI and Desktop" - echo "joplin-cli: for a CLI version" + echo "joplin: CLI and Desktop" echo "joplin-desktop: for a Desktop version" 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 @@ -23,11 +21,9 @@ post_install() { ## arg 2: the old package version post_upgrade() { echo "This is now a split Package:" - echo "joplin: Contains Both CLI and Desktop" - echo "joplin-cli: for a CLI version" + echo "joplin: CLI and Desktop" echo "joplin-desktop: for a Desktop version" 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