upgpkg: joplin 2.14.20-1

Remove temporary fix for 2.9.17

2 files changed, 4 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee9ccecbf733..0d7e73f97c9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = joplin
-	pkgver = 2.12.18
+	pkgver = 2.14.20
 	pkgrel = 1
 	url = https://joplinapp.org/
 	install = joplin.install
@@ -34,11 +34,11 @@ pkgbase = joplin
 	source = joplin.desktop
 	source = joplin-desktop.sh
 	source = joplin.sh
-	source = joplin-2.12.18.tar.gz::https://github.com/laurent22/joplin/archive/v2.12.18.tar.gz
+	source = joplin-2.14.20.tar.gz::https://github.com/laurent22/joplin/archive/v2.14.20.tar.gz
 	sha256sums = c7c5d8b0ff9edb810ed901ea21352c9830bfa286f3c18b1292deca5b2f8febd2
 	sha256sums = a450284fe66d89aa463d129ce8fff3a0a1a783a64209e4227ee47449d5737be8
 	sha256sums = 16aed6c4881efcef3fd86f7c07afb4c743e24d9da342438a8167346a015629e0
-	sha256sums = a85f2133e5b71d829fbc9438d2e3191172f8af2e270906745203a8fa36aac307
+	sha256sums = 919e9300e66bc6c24a282cbf93c43c228cdfe3227bdb1eaa50fdadef4734901b
 
 pkgname = joplin
 	pkgdesc = A note taking and to-do application with synchronization capabilities - CLI App
diff --git a/PKGBUILD b/PKGBUILD
index 3a06e48503a0..9ed6fea3b65a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -72,19 +72,7 @@ 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
+    rm -r "${srcdir}/joplin-${pkgver}/packages/server"
 }