diff options
author | Caleb Maclennan | 2024-02-27 17:44:26 +0300 |
---|---|---|
committer | Caleb Maclennan | 2024-02-27 17:44:26 +0300 |
commit | 976b148bdd5b2032d603588a2a9beaaa81eaa456 (patch) | |
tree | 02563693434be4ffa6f6d6e1a6f30339776b90cb | |
parent | 9d68ef97a482706b523ac856c978b8ee8743ef2b (diff) | |
download | aur-976b148bdd5b2032d603588a2a9beaaa81eaa456.tar.gz |
upgpkg: zettlr-git 3.0.3.r240.g4d93ef8-1
Re-sync with stable [extra] package
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 34 |
2 files changed, 28 insertions, 20 deletions
@@ -1,21 +1,23 @@ pkgbase = zettlr-git pkgdesc = A Markdown Editor for the 21st century - pkgver = 2.3.0.r206.ga1b78bb + pkgver = 3.0.3.r240.g4d93ef8 pkgrel = 1 url = https://www.zettlr.com arch = x86_64 - license = GPL + license = GPL-3.0-only makedepends = gendesk makedepends = git - makedepends = nodejs-lts-gallium + makedepends = nodejs-lts-iron + makedepends = node-gyp makedepends = yarn + makedepends = jq depends = crimson-font - depends = electron17 - depends = pandoc + depends = electron28 + depends = pandoc-cli depends = ttf-inconsolata depends = ttf-liberation optdepends = texlive-bin: For Latex support - provides = zettlr=2.3.0.r206.ga1b78bb + provides = zettlr=3.0.3.r240.g4d93ef8 conflicts = zettlr source = zettlr-git::git+https://github.com/Zettlr/Zettlr.git source = zettlr.sh @@ -1,25 +1,28 @@ # Maintainer: Caleb Maclennan <caleb@alerque.com> # Contributor: BrLi <brli at chakralinux dot org> +# Contributor: loqs <bugs-archlinux@entropy-collector.net> pkgname=zettlr-git _pkgname=Zettlr -pkgver=2.3.0.r206.ga1b78bb +pkgver=3.0.3.r240.g4d93ef8 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) -_electron=electron17 +license=(GPL-3.0-only) +_electron=electron28 depends=(crimson-font $_electron - pandoc + pandoc-cli ttf-inconsolata ttf-liberation) makedepends=(gendesk git - nodejs-lts-gallium # grep NODE_VERSION .github/workflows/build.yml - yarn) + nodejs-lts-iron # grep NODE_VERSION: .github/workflows/build.yml + node-gyp + yarn + jq) optdepends=('texlive-bin: For Latex support') provides=("${pkgname%-git}=$pkgver") conflicts=("${pkgname%-git}") @@ -30,10 +33,12 @@ sha256sums=('SKIP' 'e300f2cac217f98ab5c365dccc7581410bc296f2842d52f7f1520dd6679d20cf' 'c3ecbb490a1d4fa5bc42f7166cc375e5629a452d25bb1d4facb5541938681292') -_yarnargs="--cache-folder '$srcdir/cache' --link-folder '$srcdir/link'" +# _yarnargs="--cache-folder '$srcdir/cache' --link-folder '$srcdir/link'" prepare() { - local _electronVersion=$($_electron --version | sed -e 's/^v//') + # 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" \ @@ -42,15 +47,15 @@ prepare() { --mimetypes 'text/markdown' \ --custom StartupWMClass="$_pkgname" cd "$pkgname" + 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 -i -e '/"electron"/d' package.json sed -e "s/@ELECTRON@/$_electron/" "../${source[1]}" > $pkgname.sh - yarn $_yarnargs install --frozen-lockfile --ignore-scripts - yarn $_yarnargs add --dev --no-lockfile electron@$_electronVersion - yarn $_yarnargs install --pure-lockfile # postinstall script installs electron-builder deps + yarn $_yarnargs 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 + # yarn $_yarnargs lang:refresh + # yarn $_yarnargs csl:refresh } pkgver() { @@ -72,6 +77,7 @@ package() { local _destdir="usr/lib/${pkgname%-git}" install -Dm0644 -t "$pkgdir/$_destdir/" \ "out/$_pkgname-linux-x64/resources/"{app.asar,icon.code.icns} + cp -a out/$_pkgname-linux-x64/resources/app.asar.unpacked "$pkgdir/$_destdir/" for px in 16 24 32 48 64 96 128 256 512 1024; do install -Dm0644 "resources/icons/png/${px}x${px}.png" \ "$pkgdir/usr/share/icons/hicolor/${px}x${px}/apps/${pkgname%-git}.png" |