summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2020-04-23 15:31:25 +0300
committerCaleb Maclennan2020-04-23 16:00:19 +0300
commit1aa59c35bfc6a5d6d7efc4042aa057937cfe720a (patch)
tree3326aea2f32925e414c1afccec0dde31a2c3f6fc
parent3a6182b9050e792408b2b0a7cc1b270e0ce45876 (diff)
downloadaur-1aa59c35bfc6a5d6d7efc4042aa057937cfe720a.tar.gz
upgpkg: marktext 0.16.1-4
Fix issues with build on newer nodejs & search module not being included
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD18
2 files changed, 15 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 23e8bbd2d74..07a4575df13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
pkgbase = marktext
pkgdesc = A simple and elegant open-source markdown editor that focused on speed and usability
pkgver = 0.16.1
- pkgrel = 3
+ pkgrel = 4
url = https://marktext.app
arch = x86_64
license = MIT
- makedepends = nodejs
+ makedepends = nodejs-lts-erbium
makedepends = node-gyp
makedepends = yarn
depends = electron
depends = libxkbfile
depends = libsecret
+ depends = ripgrep
source = marktext-0.16.1.tar.gz::https://github.com/marktext/marktext/archive/v0.16.1.tar.gz
source = marktext.sh
sha256sums = a00aa0caf26ab6e24e6cd5fef2a2a03e2ef46d0bf185c6971d9f00207223633e
diff --git a/PKGBUILD b/PKGBUILD
index b57f1e4422a..9ea2ddcfbd0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,15 +6,16 @@
pkgname=marktext
pkgver=0.16.1
-pkgrel=3
+pkgrel=4
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=('electron'
'libxkbfile'
- 'libsecret')
-makedepends=('nodejs'
+ 'libsecret'
+ 'ripgrep')
+makedepends=('nodejs-lts-erbium'
'node-gyp'
'yarn')
source=("$pkgname-$pkgver.tar.gz::https://github.com/marktext/marktext/archive/v${pkgver}.tar.gz"
@@ -24,12 +25,14 @@ sha256sums=('a00aa0caf26ab6e24e6cd5fef2a2a03e2ef46d0bf185c6971d9f00207223633e'
prepare() {
cd "$pkgname-$pkgver"
- yarn --cache-folder "$srcdir" install --frozen-lockfile --ignore-scripts
+ mkdir -p "$srcdir/node_modules"
+ yarn --cache-folder "$srcdir/node_modules" install --frozen-lockfile --ignore-scripts
}
build() {
cd "$pkgname-$pkgver"
- yarn --cache-folder "$srcdir" run build:bin
+ yarn --cache-folder "$srcdir/node_modules" run rebuild
+ yarn --cache-folder "$srcdir/node_modules" run build:bin
}
package() {
@@ -37,11 +40,14 @@ package() {
install -Dm755 "../$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
install -Dm644 -t "$pkgdir/usr/lib/$pkgname/resources/" build/linux-unpacked/resources/app.asar
cp -a build/linux-unpacked/resources/{app.asar.unpacked,hunspell_dictionaries} "$pkgdir/usr/lib/$pkgname/resources/"
+ local _rg_path='usr/lib/marktext/resources/app.asar.unpacked/node_modules/vscode-ripgrep/bin/'
+ mkdir -p $_rg_path
+ ln -sf /usr/bin/rg "$pkgdir/$_rg_path/rg"
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
+ 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/{}" \;