update to 1.8.6, use electron10

1 files changed, 10 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1353c70e3996..40043d3fe445 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: BrLi <brli at chakralinux dot org>
 
 pkgname=zettlr
-pkgver=1.8.5
-pkgrel=4
+pkgver=1.8.6
+pkgrel=1
 pkgdesc="A markdown editor for writing academic texts and taking notes"
 arch=('x86_64')
 url='https://www.zettlr.com'
 license=('GPL' 'custom') # Noted that the icon and name are copyrighted
-depends=(electron)
-makedepends=(yarn git)
+depends=(electron10)
+makedepends=(pandoc yarn git)
 optdepends=('pandoc: For exporting to various format'
             'texlive-bin: For Latex support'
             'ttf-lato: Display output in a more comfortable way')
-_csl_locale_commit=ecb8e70233e9a68e8b1dda4586061be8f8611a38 # Dec 11, 2020
+_csl_locale_commit=ecb8e70233e9a68e8b1dda4586061be8f8611a38 # Dec 12, 2020
 _csl_style_commit=a7899732910f5e69aae7799bf4e61505716c211b
 options=(!strip)
 install=install
@@ -20,7 +20,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/Zettlr/Zettlr/archive/v$pkg
         # citation style
         "locales-$pkgrel-$pkgver.zip::https://github.com/citation-style-language/locales/archive/$_csl_locale_commit.zip"
         "chicago-author-date-$pkgver-$pkgrel.csl::https://github.com/citation-style-language/styles/raw/$_csl_style_commit/chicago-author-date.csl")
-sha256sums=('59a89ea4c86cf64920b540c0734566dbf737f08c6f48256fc8de124f65aebade'
+sha256sums=('97b037b352070695bb4d9b91eda05ea9f03292eb8f91c2d23ed9c0e99642cc3d'
             '24503a6cd5b3651a7003353811ae82d3ed707ec8ff932d341668c2ad377434b6'
             '2b7cd6c1c9be4add8c660fb9c6ca54f1b6c3c4f49d6ed9fa39c9f9b10fcca6f4')
 
@@ -34,7 +34,7 @@ prepare() {
     cp "$srcdir/chicago-author-date-$pkgver-$pkgrel.csl" source/app/service-providers/assets/csl-styles/chicago-author-date.csl
 
     # fake Pandoc
-    ln -sf /dev/null resources/pandoc
+    ln -sf /usr/bin/pandoc resources/pandoc
 }
 
 build() {
@@ -46,7 +46,7 @@ build() {
     yarn reveal:build
 
     rm -rf node_modules/electron
-    yarn add -D electron@11.1.0 --cache-folder "$srcdir/cache" --link-folder "$srcdir/link"
+    yarn add -D electron@11.1.1 --cache-folder "$srcdir/cache" --link-folder "$srcdir/link"
 
     node node_modules/.bin/electron-forge package
 
@@ -77,12 +77,13 @@ package() {
 
     # Copy the generated electron project
     cp -r --no-preserve=ownership --preserve=mode ./.webpack "$pkgdir/$_destdir/"
+    cp -r --no-preserve=ownership --preserve=mode ./resources "$pkgdir/$_destdir/"
     cp -r --no-preserve=ownership --preserve=mode ./package.json "$pkgdir/$_destdir/"
 
     # Install start script to /usr/bin
    install -Dm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END
 #!/bin/sh
-exec electron /${_destdir} "\$@"
+exec electron10 /${_destdir} "\$@"
 END
 
     # install icons of various sizes to hi-color theme