upgpkg: marktext-git 0.16.3.r2.gf501ef4-1

3 files changed, 52 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8bb5de4b0967..897802d126fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,15 +7,16 @@ pkgbase = marktext-git
 	license = MIT
 	makedepends = git
 	makedepends = jq
-	makedepends = nodejs
-	makedepends = npm
-	makedepends = node-gyp
 	makedepends = moreutils
+	makedepends = node-gyp
+	makedepends = nodejs-lts-hydrogen
+	makedepends = npm
 	makedepends = yarn
 	makedepends = yq
-	depends = electron11
+	depends = electron17
 	depends = libxkbfile
 	depends = libsecret
+	depends = openssl
 	depends = ripgrep
 	provides = marktext-0.16.3.r2.gf501ef4
 	conflicts = marktext
@@ -23,7 +24,7 @@ pkgbase = marktext-git
 	source = marktext.sh
 	source = marktext-arg-handling.patch
 	sha256sums = SKIP
-	sha256sums = c5af6eabe525af458df2ccfac6098092746dd0ae23225c131100bb6e37170f86
+	sha256sums = 8f37f164a642a536b75f54b49e7c7a7c1e4d355a91dd8ece4cab6a95b42d369e
 	sha256sums = c754a1cad52d10a38eeddb9293ce0a4540296c6adbb47eb5311eaaeded150a01
 
 pkgname = marktext-git
diff --git a/PKGBUILD b/PKGBUILD
index 9743029c8423..97aed7fd8eb8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,18 +12,20 @@ pkgrel=1
 pkgdesc='A simple and elegant open-source markdown editor that focused on speed and usability'
 arch=(x86_64)
 url='https://marktext.app'
+_url="https://github.com/$_pkgname/$_pkgname"
 license=(MIT)
-_electron=electron11
+_electron=electron17
 depends=("$_electron"
          libxkbfile
          libsecret
+         openssl
          ripgrep)
 makedepends=(git
              jq
-             nodejs
-             npm
-             node-gyp
              moreutils
+             node-gyp
+             nodejs-lts-hydrogen
+             npm
              yarn
              yq)
 provides=("$_pkgname-$pkgver")
@@ -32,54 +34,55 @@ source=("$pkgname::git+https://github.com/$_pkgname/${pkgname/-/.}"
         "$_pkgname.sh"
         "$_pkgname-arg-handling.patch")
 sha256sums=('SKIP'
-            'c5af6eabe525af458df2ccfac6098092746dd0ae23225c131100bb6e37170f86'
+            '8f37f164a642a536b75f54b49e7c7a7c1e4d355a91dd8ece4cab6a95b42d369e'
             'c754a1cad52d10a38eeddb9293ce0a4540296c6adbb47eb5311eaaeded150a01')
 
 pkgver() {
-    cd "$pkgname"
-    git describe --long --tags --abbrev=7 --match="v*" HEAD |
-        sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+	cd "$pkgname"
+	git describe --long --tags --abbrev=7 --match="v*" HEAD |
+		sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-    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
-    yq -y ". + {\"electronDist\": \"$_electronDist\", \"electronVersion\": \"$_electronVersion\"}" \
-        electron-builder.yml | sponge electron-builder.yml
-    mkdir -p "$srcdir/node_modules"
-    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"
+	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
+	yq -y ". + {\"electronDist\": \"$_electronDist\", \"electronVersion\": \"$_electronVersion\"}" \
+		electron-builder.yml | sponge electron-builder.yml
+	mkdir -p "$srcdir/node_modules"
+	yarn --cache-folder "$srcdir/node_modules" install --frozen-lockfile
+	yarn --cache-folder "$srcdir/node_modules" add -D --no-lockfile --ignore-scripts electron@$_electronVersion
+	patch -p1 < "$srcdir/$_pkgname-arg-handling.patch"
 }
 
 build() {
-    cd "$pkgname"
-    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
+	cd "$pkgname"
+	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
+	sed -e "s/@ELECTRON@/$_electron/" "../$pkgname.sh" > "$pkgname"
 }
 
 package() {
-    cd "$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/"
-    local _rg_path="$pkgdir/usr/lib/marktext/app.asar.unpacked/node_modules/vscode-ripgrep/bin/"
-    mkdir -p $_rg_path
-    ln -sf /usr/bin/rg "$_rg_path"
-    install -Dm755 -t "${pkgdir}/usr/share/applications/" resources/linux/marktext.desktop
-    install -Dm755 -t "${pkgdir}/usr/share/metainfo/" resources/linux/marktext.appdata.xml
-    install -Dm644 resources/icons/icon.png "${pkgdir}/usr/share/pixmaps/marktext.png"
-    install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE
-    install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" README.md CONTRIBUTING.md
-    cp -a docs "$pkgdir/usr/share/doc/$pkgname/"
-    pushd "resources/icons"
-    find -name maktext.png -exec install -Dm644 {} "$pkgdir/usr/share/icons/hicolor/{}" \;
+	cd "$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/"
+	local _rg_path="$pkgdir/usr/lib/marktext/app.asar.unpacked/node_modules/vscode-ripgrep/bin/"
+	mkdir -p $_rg_path
+	ln -sf /usr/bin/rg "$_rg_path"
+	install -Dm0755 -t "${pkgdir}/usr/share/applications/" resources/linux/marktext.desktop
+	install -Dm0755 -t "${pkgdir}/usr/share/metainfo/" resources/linux/marktext.appdata.xml
+	install -Dm0644 resources/icons/icon.png "${pkgdir}/usr/share/pixmaps/marktext.png"
+	install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE
+	install -Dm0644 -t "$pkgdir/usr/share/doc/$pkgname/" README.md CONTRIBUTING.md
+	cp -a docs "$pkgdir/usr/share/doc/$pkgname/"
+	pushd "resources/icons"
+	find -name maktext.png -exec \
+		install -Dm644 {} "$pkgdir/usr/share/icons/hicolor/{}" \;
 }
diff --git a/marktext.sh b/marktext.sh
index 8bfc08fdf0ed..ce8042151a2f 100644
--- a/marktext.sh
+++ b/marktext.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-exec electron /usr/lib/marktext/app.asar "$@"
+exec @ELECTRON@ /usr/lib/marktext/app.asar "$@"