Fix build using marktext AUR PKGBUILD

3 files changed, 35 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7af8006e8077..69fe1b070cc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
-# Generated by mksrcinfo v8
-# Tue May  1 08:51:48 UTC 2018
 pkgbase = marktext-git
 	pkgdesc = Next generation markdown editor
-	pkgver = r461.8399cbe
+	pkgver = r1199.e5dc8f15
 	pkgrel = 1
 	url = https://marktext.github.io/website/
-	arch = x86
 	arch = x86_64
 	license = MIT
+	makedepends = python
+	makedepends = nodejs
 	makedepends = npm
-	depends = gconf
-	depends = gtk3
-	depends = libxss
-	depends = nss
+	makedepends = yarn
+	depends = electron
 	source = git+https://github.com/marktext/marktext
+	source = marktext.sh
 	sha512sums = SKIP
+	sha512sums = 8927cea6815420206982263d80fa54bbcfcc37623008b6a2f25d16782cfdff70ef44c3dbc142e2c45b474df52f216e7d58cf556a525df0683bc447481ab7b27d
 
 pkgname = marktext-git
 
diff --git a/PKGBUILD b/PKGBUILD
index fef3fdd79a81..15bb402f891c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,50 @@
-# Maintainer: Simon Doppler (dopsi) <dop.simon@gmail.com>
+# Contributor: David Birks <david@tellus.space>
+# Contributor: Simon Doppler (dopsi) <dop.simon@gmail.com>
+# Contributor: dpeukert
 _gitname=marktext
 pkgname=marktext-git
-pkgver=r461.8399cbe
+pkgver=r1199.e5dc8f15
 pkgrel=1
 pkgdesc='Next generation markdown editor'
-arch=('x86' 'x86_64')
+arch=('x86_64')
 url='https://marktext.github.io/website/'
 license=('MIT')
-depends=('gconf' 'gtk3' 'libxss' 'nss')
-makedepends=('npm')
-source=("git+https://github.com/${_gitname}/${_gitname}")
-sha512sums=('SKIP')
+depends=('electron')
+makedepends=('python' 'nodejs' 'npm' 'yarn')
+source=("git+https://github.com/${_gitname}/${_gitname}"
+        'marktext.sh')
+sha512sums=('SKIP'
+            '8927cea6815420206982263d80fa54bbcfcc37623008b6a2f25d16782cfdff70ef44c3dbc142e2c45b474df52f216e7d58cf556a525df0683bc447481ab7b27d')
 
 pkgver() {
     cd "${srcdir}/${_gitname}"
     printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+    cd "${srcdir}/${_gitname}"
+    yarn upgrade # temporary: we need node-gyp >= 5.0.5
+    yarn install
+}
+
 build() {
     cd "${srcdir}/${_gitname}"
-    npm install --cache "${srcdir}/npm-cache"
-    npm run release:linux
+    yarn run build
 }
 
 package() {
     cd "${srcdir}/${_gitname}"
 
-    install -D "build/linux-unpacked/snapshot_blob.bin" "$pkgdir/usr/lib/$pkgname/snapshot_blob.bin"
-    install -D "build/linux-unpacked/content_resources_200_percent.pak" "$pkgdir/usr/lib/$pkgname/content_resources_200_percent.pak"
-    install -D "build/linux-unpacked/content_shell.pak" "$pkgdir/usr/lib/$pkgname/content_shell.pak"
-    install -D "build/linux-unpacked/icudtl.dat" "$pkgdir/usr/lib/$pkgname/icudtl.dat"
-    install -D "build/linux-unpacked/libffmpeg.so" "$pkgdir/usr/lib/$pkgname/libffmpeg.so"
-    install -D "build/linux-unpacked/libnode.so" "$pkgdir/usr/lib/$pkgname/libnode.so"
-    cp -r "build/linux-unpacked/locales" "$pkgdir/usr/lib/$pkgname/locales"
-    install -D "build/linux-unpacked/marktext" "$pkgdir/usr/lib/$pkgname/marktext"
-    install -D "build/linux-unpacked/natives_blob.bin" "$pkgdir/usr/lib/$pkgname/natives_blob.bin"
-    install -D "build/linux-unpacked/pdf_viewer_resources.pak" "$pkgdir/usr/lib/$pkgname/pdf_viewer_resources.pak"
-    cp -r "build/linux-unpacked/resources" "$pkgdir/usr/lib/$pkgname/resources"
-    install -D "build/linux-unpacked/ui_resources_200_percent.pak" "$pkgdir/usr/lib/$pkgname/ui_resources_200_percent.pak"
-    install -D "build/linux-unpacked/blink_image_resources_200_percent.pak" "$pkgdir/usr/lib/$pkgname/blink_image_resources_200_percent.pak"
-    install -D "build/linux-unpacked/views_resources_200_percent.pak" "$pkgdir/usr/lib/$pkgname/views_resources_200_percent.pak"
+    # Install app.asar and launcher script
+    install -D build/linux-unpacked/resources/app.asar "${pkgdir}/usr/share/marktext/app.asar"
+    install -D "${srcdir}/marktext.sh" "${pkgdir}/usr/bin/$pkgname"
 
-    # Symlink main binary
-    install -d "${pkgdir}/usr/bin"
-    ln -s "/usr/lib/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+    # Install desktop file and icon
+    install -D resources/linux/marktext.desktop "${pkgdir}/usr/share/applications/marktext.desktop"
+    install -D resources/icons/icon.png "${pkgdir}/usr/share/pixmaps/marktext.png"
 
     # Install license file
     install -D LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-    install -D build/linux-unpacked/LICENSE.electron.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.electron.txt"
-    install -D build/linux-unpacked/LICENSES.chromium.html "$pkgdir/usr/share/licenses/$pkgname/LICENSES.chromium.html"
+    install -D build/linux-unpacked/LICENSE.electron.txt "${pkgdir}/usr/share/licenses/$pkgname/LICENSE.electron.txt"
+    install -D build/linux-unpacked/LICENSES.chromium.html "${pkgdir}/usr/share/licenses/$pkgname/LICENSES.chromium.html"
 }
-
-# vim:ts=4:sw=4:expandtab
diff --git a/marktext.sh b/marktext.sh
new file mode 100644
index 000000000000..02d1f6c36a45
--- /dev/null
+++ b/marktext.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+electron /usr/share/marktext/app.asar $@