diff options
author | Caleb Maclennan | 2020-12-26 12:31:46 +0300 |
---|---|---|
committer | Caleb Maclennan | 2020-12-26 12:53:04 +0300 |
commit | 624d415a862a66c6b1b0d29437186d131234ee83 (patch) | |
tree | 6ec847cf95cb2e95bbe90a667dc16ecdf1952e81 | |
parent | 919fbfd4e059c450f353a061165e494231843839 (diff) | |
download | aur-624d415a862a66c6b1b0d29437186d131234ee83.tar.gz |
Update for build with newer Electron & Node
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 17 | ||||
-rw-r--r-- | marktext.sh | 2 |
3 files changed, 15 insertions, 14 deletions
@@ -1,27 +1,27 @@ pkgbase = marktext-git pkgdesc = A simple and elegant open-source markdown editor that focused on speed and usability - pkgver = 0.16.2.r0.g1e7ff90 + pkgver = 0.16.2.r38.gf725239 pkgrel = 1 url = https://marktext.app arch = x86_64 license = MIT makedepends = jq - makedepends = nodejs-lts-erbium + makedepends = nodejs makedepends = node-gyp makedepends = moreutils makedepends = yarn makedepends = yq - depends = electron7 + depends = electron depends = libxkbfile depends = libsecret depends = ripgrep - provides = marktext-0.16.2.r0.g1e7ff90 + provides = marktext-0.16.2.r38.gf725239 conflicts = marktext source = marktext-git::git+https://github.com/marktext/marktext.git source = marktext.sh source = marktext-arg-handling.patch sha256sums = SKIP - sha256sums = 15a964fcc3f6bd7bf1c03566d35201032aecde994446533cad1f810e9b880f14 + sha256sums = c5af6eabe525af458df2ccfac6098092746dd0ae23225c131100bb6e37170f86 sha256sums = c754a1cad52d10a38eeddb9293ce0a4540296c6adbb47eb5311eaaeded150a01 pkgname = marktext-git @@ -7,18 +7,18 @@ pkgname=marktext-git _pkgname=${pkgname%-git} -pkgver=0.16.2.r0.g1e7ff90 +pkgver=0.16.2.r38.gf725239 pkgrel=1 pkgdesc='A simple and elegant open-source markdown editor that focused on speed and usability' arch=('x86_64') url='https://marktext.app' license=('MIT') -depends=('electron7' +depends=('electron' 'libxkbfile' 'libsecret' 'ripgrep') makedepends=('jq' - 'nodejs-lts-erbium' + 'nodejs' 'node-gyp' 'moreutils' 'yarn' @@ -29,7 +29,7 @@ source=("$pkgname::git+https://github.com/$_pkgname/${pkgname/-/.}" "$_pkgname.sh" "$_pkgname-arg-handling.patch") sha256sums=('SKIP' - '15a964fcc3f6bd7bf1c03566d35201032aecde994446533cad1f810e9b880f14' + 'c5af6eabe525af458df2ccfac6098092746dd0ae23225c131100bb6e37170f86' 'c754a1cad52d10a38eeddb9293ce0a4540296c6adbb47eb5311eaaeded150a01') pkgver() { @@ -39,8 +39,8 @@ pkgver() { } prepare() { - local _electronDist=$(dirname $(realpath $(which electron7))) - local _electronVersion=$(electron7 --version | sed -e 's/^v//') + local _electronDist=$(dirname $(realpath $(which electron))) + local _electronVersion=$(electron --version | sed -e 's/^v//') cd "$pkgname" jq 'del(.devDependencies["electron"], .scripts["preinstall", "postinstall"])' \ package.json | sponge package.json @@ -54,10 +54,11 @@ prepare() { build() { cd "$pkgname" - yarn --cache-folder "$srcdir/node_modules" run electron-rebuild + yarn --cache-folder "$srcdir/node_modules" run \ + electron-rebuild node .electron-vue/build.js yarn --cache-folder "$srcdir/node_modules" run \ - electron-builder --linux --x64 --dir dist + electron-builder --linux --x64 --dir } package() { diff --git a/marktext.sh b/marktext.sh index 93fa48d9cc47..8bfc08fdf0ed 100644 --- a/marktext.sh +++ b/marktext.sh @@ -1,3 +1,3 @@ #!/usr/bin/env sh -exec electron7 /usr/lib/marktext/app.asar "$@" +exec electron /usr/lib/marktext/app.asar "$@" |