Hold back to electron11, upstream abi fails on 12

2 files changed, 26 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa18b82910d5..8bb5de4b0967 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,23 @@
 pkgbase = marktext-git
 	pkgdesc = A simple and elegant open-source markdown editor that focused on speed and usability
-	pkgver = 0.16.2.r38.gf725239
+	pkgver = 0.16.3.r2.gf501ef4
 	pkgrel = 1
 	url = https://marktext.app
 	arch = x86_64
 	license = MIT
+	makedepends = git
 	makedepends = jq
 	makedepends = nodejs
+	makedepends = npm
 	makedepends = node-gyp
 	makedepends = moreutils
 	makedepends = yarn
 	makedepends = yq
-	depends = electron
+	depends = electron11
 	depends = libxkbfile
 	depends = libsecret
 	depends = ripgrep
-	provides = marktext-0.16.2.r38.gf725239
+	provides = marktext-0.16.3.r2.gf501ef4
 	conflicts = marktext
 	source = marktext-git::git+https://github.com/marktext/marktext.git
 	source = marktext.sh
@@ -25,4 +27,3 @@ pkgbase = marktext-git
 	sha256sums = c754a1cad52d10a38eeddb9293ce0a4540296c6adbb47eb5311eaaeded150a01
 
 pkgname = marktext-git
-
diff --git a/PKGBUILD b/PKGBUILD
index d45f9af28c20..9743029c8423 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,24 +7,27 @@
 
 pkgname=marktext-git
 _pkgname=${pkgname%-git}
-pkgver=0.16.2.r38.gf725239
+pkgver=0.16.3.r2.gf501ef4
 pkgrel=1
 pkgdesc='A simple and elegant open-source markdown editor that focused on speed and usability'
-arch=('x86_64')
+arch=(x86_64)
 url='https://marktext.app'
-license=('MIT')
-depends=('electron'
-         'libxkbfile'
-         'libsecret'
-         'ripgrep')
-makedepends=('jq'
-             'nodejs'
-             'node-gyp'
-             'moreutils'
-             'yarn'
-             'yq')
-conflicts=("$_pkgname")
+license=(MIT)
+_electron=electron11
+depends=("$_electron"
+         libxkbfile
+         libsecret
+         ripgrep)
+makedepends=(git
+             jq
+             nodejs
+             npm
+             node-gyp
+             moreutils
+             yarn
+             yq)
 provides=("$_pkgname-$pkgver")
+conflicts=("$_pkgname")
 source=("$pkgname::git+https://github.com/$_pkgname/${pkgname/-/.}"
         "$_pkgname.sh"
         "$_pkgname-arg-handling.patch")
@@ -39,8 +42,8 @@ pkgver() {
 }
 
 prepare() {
-    local _electronDist=$(dirname $(realpath $(which electron)))
-    local _electronVersion=$(electron --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
@@ -50,6 +53,7 @@ prepare() {
     yarn --cache-folder "$srcdir/node_modules" install --frozen-lockfile
     yarn --cache-folder "$srcdir/node_modules" add -D -E --no-lockfile --ignore-scripts electron@$_electronVersion
     patch -p1 < "$srcdir/$_pkgname-arg-handling.patch"
+    sed -e "s/\belectron\b/$_electron/" "../$_pkgname.sh" > "$_pkgname.sh"
 }
 
 build() {
@@ -63,7 +67,7 @@ build() {
 
 package() {
     cd "$pkgname"
-    install -Dm755 "../$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
+    install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
     local _dist=build/linux-unpacked/resources
     install -Dm644 -t "$pkgdir/usr/lib/$_pkgname/" "$_dist/app.asar"
     cp -a "$_dist"/{app.asar.unpacked,hunspell_dictionaries} "$pkgdir/usr/lib/$_pkgname/"