diff options
| author | Caleb Maclennan | 2024-05-04 13:17:24 +0300 |
|---|---|---|
| committer | Caleb Maclennan | 2024-05-04 13:17:24 +0300 |
| commit | a00bb86f4f96429459013e4c39cadb4906d4a883 (patch) | |
| tree | 86e8e86127338899754576f984f6e94a2ba67144 | |
| parent | 92db3c282ce2a038df0036510afc3803ffcec58e (diff) | |
| download | aur-zettlr-git.tar.gz | |
upgpkg: zettlr-git 3.1.0.beta.3.r18.g60600cd-1
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 20 |
2 files changed, 11 insertions, 17 deletions
@@ -1,6 +1,6 @@ pkgbase = zettlr-git pkgdesc = A Markdown Editor for the 21st century - pkgver = 3.0.3.r240.g4d93ef8 + pkgver = 3.1.0.beta.3.r18.g60600cd pkgrel = 1 url = https://www.zettlr.com arch = x86_64 @@ -12,12 +12,12 @@ pkgbase = zettlr-git makedepends = yarn makedepends = jq depends = crimson-font - depends = electron28 + depends = electron30 depends = pandoc-cli depends = ttf-inconsolata depends = ttf-liberation - optdepends = texlive-bin: For Latex support - provides = zettlr=3.0.3.r240.g4d93ef8 + optdepends = texlive-latex: For Latex support + provides = zettlr=3.1.0.beta.3.r18.g60600cd conflicts = zettlr source = zettlr-git::git+https://github.com/Zettlr/Zettlr.git source = zettlr.sh @@ -4,16 +4,16 @@ pkgname=zettlr-git _pkgname=Zettlr -pkgver=3.0.3.r240.g4d93ef8 +pkgver=3.1.0.beta.3.r18.g60600cd pkgrel=1 pkgdesc='A Markdown Editor for the 21st century' arch=(x86_64) url=https://www.zettlr.com _url="https://github.com/$_pkgname/$_pkgname" license=(GPL-3.0-only) -_electron=electron28 +_electron=electron30 depends=(crimson-font - $_electron + "$_electron" pandoc-cli ttf-inconsolata ttf-liberation) @@ -23,7 +23,7 @@ makedepends=(gendesk node-gyp yarn jq) -optdepends=('texlive-bin: For Latex support') +optdepends=('texlive-latex: For Latex support') provides=("${pkgname%-git}=$pkgver") conflicts=("${pkgname%-git}") source=("$pkgname::git+$_url.git" @@ -33,12 +33,7 @@ sha256sums=('SKIP' 'e300f2cac217f98ab5c365dccc7581410bc296f2842d52f7f1520dd6679d20cf' 'c3ecbb490a1d4fa5bc42f7166cc375e5629a452d25bb1d4facb5541938681292') -# _yarnargs="--cache-folder '$srcdir/cache' --link-folder '$srcdir/link'" - prepare() { - # Arch Electron package missing dependencies, revert when it actually runs on it's own power again - # local _electronVersion="$($_electron --version | sed -e 's/^v//')" - local _electronVersion="$(cat /usr/lib/$_electron/version)" gendesk -q -f -n \ --pkgname "$pkgname" \ --pkgdesc "$pkgdesc" \ @@ -47,15 +42,14 @@ prepare() { --mimetypes 'text/markdown' \ --custom StartupWMClass="$_pkgname" cd "$pkgname" + local _electronVersion="$(cat /usr/lib/$_electron/version)" readarray -t _oldElectron < <(yarn info --cache --json 'electron' | jq -r '.children | .Version,.Cache.Checksum') sed -i "/${_oldElectron[1]:3}/d" yarn.lock sed -i "s/\([\^ :]\)${_oldElectron[0]}/\1$_electronVersion/" package.json yarn.lock echo -ne '#!/usr/bin/env bash\n\nexit 0' > scripts/get-pandoc.sh sed -e "s/@ELECTRON@/$_electron/" "../${source[1]}" > $pkgname.sh - yarn $_yarnargs install --immutable # postinstall script installs electron-builder deps + yarn install --immutable # postinstall script installs electron-builder deps ln -sf /usr/bin/pandoc resources/pandoc-linux-x64 - # yarn $_yarnargs lang:refresh - # yarn $_yarnargs csl:refresh } pkgver() { @@ -67,7 +61,7 @@ pkgver() { build() { cd "$pkgname" local NODE_ENV='' - yarn $_yarnargs package:linux-x64 + yarn package:linux-x64 } package() { |