Skip to content

Commit

Permalink
Release version 2.9.17 (closes #119)
Browse files Browse the repository at this point in the history
  • Loading branch information
mixin82 committed Dec 17, 2022
1 parent b514bfd commit f61a991
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .SRCINFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = joplin
pkgver = 2.8.8
pkgrel = 2
pkgver = 2.9.17
pkgrel = 1
url = https://joplinapp.org/
install = joplin.install
arch = x86_64
Expand All @@ -10,7 +10,7 @@ pkgbase = joplin
makedepends = git
makedepends = npm
makedepends = yarn
makedepends = python2
makedepends = python
makedepends = rsync
makedepends = jq
makedepends = yq
Expand All @@ -34,11 +34,11 @@ pkgbase = joplin
source = joplin.desktop
source = joplin-desktop.sh
source = joplin.sh
source = joplin-2.8.8.tar.gz::https://github.com/laurent22/joplin/archive/v2.8.8.tar.gz
source = joplin-2.9.17.tar.gz::https://github.com/laurent22/joplin/archive/v2.9.17.tar.gz
sha256sums = c7c5d8b0ff9edb810ed901ea21352c9830bfa286f3c18b1292deca5b2f8febd2
sha256sums = a450284fe66d89aa463d129ce8fff3a0a1a783a64209e4227ee47449d5737be8
sha256sums = 16aed6c4881efcef3fd86f7c07afb4c743e24d9da342438a8167346a015629e0
sha256sums = b6e0a3a5d59882de37494c0b3b1d28df407e86d06e81bc8201cb912e2711949b
sha256sums = 5a1d205bd52b86182b281f7c83b8a7b463941f5043729b4408490b249dfa0af8

pkgname = joplin
pkgdesc = A note taking and to-do application with synchronization capabilities - CLI App
Expand Down
21 changes: 17 additions & 4 deletions PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@

pkgbase="joplin"
pkgname=('joplin' 'joplin-desktop')
pkgver=2.8.8
pkgver=2.9.17
groups=('joplin')
pkgrel=2
pkgrel=1
install="joplin.install"
depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs>=17.3'
'nss' 'orc' 'rsync' 'libvips')
optdepends=('libappindicator-gtk3: for tray icon')
arch=('x86_64' 'i686')
makedepends=('git' 'npm' 'yarn' 'python2' 'rsync' 'jq' 'yq' 'electron' 'libgsf' 'node-gyp>=8.4.1' 'libvips')
makedepends=('git' 'npm' 'yarn' 'python' 'rsync' 'jq' 'yq' 'electron' 'libgsf' 'node-gyp>=8.4.1' 'libvips')
url="https://joplinapp.org/"
license=('MIT')
source=("joplin.desktop" "joplin-desktop.sh" "joplin.sh"
"joplin-${pkgver}.tar.gz::https://github.com/laurent22/joplin/archive/v${pkgver}.tar.gz")
sha256sums=('c7c5d8b0ff9edb810ed901ea21352c9830bfa286f3c18b1292deca5b2f8febd2'
'a450284fe66d89aa463d129ce8fff3a0a1a783a64209e4227ee47449d5737be8'
'16aed6c4881efcef3fd86f7c07afb4c743e24d9da342438a8167346a015629e0'
'b6e0a3a5d59882de37494c0b3b1d28df407e86d06e81bc8201cb912e2711949b')
'5a1d205bd52b86182b281f7c83b8a7b463941f5043729b4408490b249dfa0af8')

# local npm cache directory
_yarn_cache="yarn-cache"
Expand Down Expand Up @@ -72,6 +72,19 @@ prepare() {
msg2 "Deleting app-mobile"
rm -r "${srcdir}/joplin-${pkgver}/packages/app-mobile"
rm -r "${srcdir}/joplin-${pkgver}/packages/app-clipper"

if [[ ${pkgver} == 2.9.17 ]]; then

msg2 "******************* BEGIN: TEMPORARY FIX FOR VERSION 2.9.17 ONLY **********************"

# Let yarn resolve version ^2.12.1 of nan package to 2.17.0 instead of 2.15.0 (https://github.com/nodejs/nan/pull/943)
local package_json=${srcdir}/joplin-${pkgver}/package.json
cp $package_json $package_json.bak
jq '. + {"resolutions": {"nan@^2.12.1": "2.17.0"}}' $package_json.bak > $package_json

msg2 "******************* END: TEMPORARY FIX FOR VERSION 2.9.17 ONLY ************************"

fi
}


Expand Down

0 comments on commit f61a991

Please sign in to comment.