upgpkg: marktext-bin 0.17.1-1

upstream release

upgpkg: marktext 0.17.1-1

upstream release

3 files changed, 56 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 214d1e1810b1..ace13ada3fb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,28 @@
 pkgbase = marktext
 	pkgdesc = A simple and elegant open-source markdown editor that focused on speed and usability
-	pkgver = 0.16.3
-	pkgrel = 3
+	pkgver = 0.17.1
+	pkgrel = 1
 	url = https://marktext.app
 	arch = x86_64
 	license = MIT
 	makedepends = jq
-	makedepends = nodejs-lts-gallium
+	makedepends = git
+	makedepends = nodejs
 	makedepends = npm
 	makedepends = node-gyp
 	makedepends = moreutils
 	makedepends = yarn
 	makedepends = yq
-	depends = electron11
+	depends = electron15
 	depends = libxkbfile
 	depends = libsecret
 	depends = openssl
 	depends = ripgrep
-	source = marktext-0.16.3.tar.gz::https://github.com/marktext/marktext/archive/v0.16.3.tar.gz
+	source = https://github.com/marktext/marktext/archive/v0.17.1/marktext-0.17.1.tar.gz
 	source = marktext.sh
 	source = marktext-arg-handling.patch
-	sha256sums = ab7702558a09f9be5326a03ad56249378fad67138dd21261458b60d4b37191ce
-	sha256sums = c5af6eabe525af458df2ccfac6098092746dd0ae23225c131100bb6e37170f86
+	sha256sums = d94433ee167cd2fcddd5ccbffd3e17f2933f7dee1e2346f3a6aaa2e8d9052581
+	sha256sums = 8f37f164a642a536b75f54b49e7c7a7c1e4d355a91dd8ece4cab6a95b42d369e
 	sha256sums = c754a1cad52d10a38eeddb9293ce0a4540296c6adbb47eb5311eaaeded150a01
 
 pkgname = marktext
diff --git a/PKGBUILD b/PKGBUILD
index df890d08216e..f47b5d41e890 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,76 +1,79 @@
-# Maintainer: Gabriel Saillard (GitSquared) <gabriel@saillard.dev>
 # Maintainer: Caleb Maclennan <caleb@alerque.com>
+# Contributor: Gabriel Saillard (GitSquared) <gabriel@saillard.dev>
 # Contributor: David Birks <david@tellus.space>
 # Contributor: Simon Doppler (dopsi) <dop.simon@gmail.com>
 # Contributor: dpeukert
 
 pkgname=marktext
-pkgver=0.16.3
-pkgrel=3
+pkgver=0.17.0
+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://marktext.app
+_url="https://github.com/$pkgname/$pkgname"
 license=(MIT)
-_electron=electron11
+_electron=electron15
 depends=("$_electron"
          libxkbfile
          libsecret
          openssl
          ripgrep)
 makedepends=(jq
-             nodejs-lts-gallium
+             git
+             nodejs
              npm
              node-gyp
              moreutils
              yarn
              yq)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/marktext/marktext/archive/v${pkgver}.tar.gz"
+_archive="$pkgname-$pkgver"
+source=("$_url/archive/v$pkgver/$_archive.tar.gz"
         "$pkgname.sh"
         "$pkgname-arg-handling.patch")
-sha256sums=('ab7702558a09f9be5326a03ad56249378fad67138dd21261458b60d4b37191ce'
-            'c5af6eabe525af458df2ccfac6098092746dd0ae23225c131100bb6e37170f86'
+sha256sums=('b4aabb50063e3cade1b1495cdfe63a7f6ecc130a84f528b6bc36a3d52f16a146'
+            '8f37f164a642a536b75f54b49e7c7a7c1e4d355a91dd8ece4cab6a95b42d369e'
             'c754a1cad52d10a38eeddb9293ce0a4540296c6adbb47eb5311eaaeded150a01')
 
-
 prepare() {
-    local _electronDist=$(dirname $(realpath $(which $_electron)))
-    local _electronVersion=$($_electron --version | sed -e 's/^v//')
-    cd "$pkgname-$pkgver"
-    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"
-    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 "$_archive"
+	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-$pkgver"
-    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 "$_archive"
+	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/\b@ELECTRON@\b/$_electron/" "../$pkgname.sh" > "$pkgname"
 }
 
 package() {
-    cd "$pkgname-$pkgver"
-    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 "$_archive"
+	install -Dm0755 -t "$pkgdir/usr/bin/" "$pkgname"
+	local _dist=build/linux-unpacked/resources
+	install -Dm0644 -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/$pkgname/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/$pkgname.desktop"
+	install -Dm0755 -t "$pkgdir/usr/share/metainfo/" "resources/linux/$pkgname.appdata.xml"
+	install -Dm0644 resources/icons/icon.png "$pkgdir/usr/share/pixmaps/$pkgname.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 -Dm0644 {} "$pkgdir/usr/share/icons/hicolor/{}" \;
 }
diff --git a/marktext.sh b/marktext.sh
index 8bfc08fdf0ed..ce8042151a2f 100755
--- 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 "$@"