From 114216e80a4ce31b1794d03e28d6f252fdaaa617 Mon Sep 17 00:00:00 2001
From: Jean Lucas <jean@4ray.co>
Date: Wed, 29 Aug 2018 16:54:52 -0400
Subject: [PATCH] Modify dependencies

- Add 'git' to makedepends as its required during build
- 'npm' is a makedepend to prevent yarn from arbitrarily changing the
working directory and causing build failures by being unable to find
'.yarnclean'. See https://github.com/tootsuite/mastodon/issues/6809
- Change 'yarn' to be a full dependency so database migrations and asset
precompilations don't fail
---
 .SRCINFO | 8 +++++---
 PKGBUILD | 9 +++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index eccffb0..31a624b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 # Generated by mksrcinfo v8
-# Mon Aug 27 17:14:57 UTC 2018
+# Wed Aug 29 20:53:07 UTC 2018
 pkgbase = mastodon
 	pkgdesc = Free software social-network server based on ActivityPub and OStatus
 	pkgver = 2.4.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://joinmastodon.org
 	install = mastodon.install
 	arch = i686
 	arch = x86_64
 	license = AGPL3
-	makedepends = yarn
+	makedepends = git
+	makedepends = npm
 	makedepends = python2
 	depends = ffmpeg
 	depends = imagemagick
@@ -21,6 +22,7 @@ pkgbase = mastodon
 	depends = redis
 	depends = ruby-bundler
 	depends = protobuf
+	depends = yarn
 	conflicts = mastodon-git
 	backup = etc/mastodon/environment
 	source = https://github.com/tootsuite/mastodon/archive/v2.4.5.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index d205b71..3ce9759 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mastodon
 pkgver=2.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Free software social-network server based on ActivityPub and OStatus'
 arch=(i686 x86_64)
 url=https://joinmastodon.org
@@ -16,8 +16,9 @@ depends=(ffmpeg
          postgresql
          redis
          ruby-bundler
-         protobuf)
-makedepends=(yarn python2)
+         protobuf
+         yarn)
+makedepends=(git npm python2)
 conflicts=(mastodon-git)
 backup=(etc/mastodon/environment)
 install=mastodon.install
@@ -39,7 +40,7 @@ build() {
 }
 
 package() {
-  install -d "$pkgdir"{/var/lib,/etc/mastodon}
+  install -d "$pkgdir"/{var/lib,etc/mastodon}
   cp -a mastodon-$pkgver "$pkgdir"/var/lib/mastodon
   ln -s /etc/mastodon/environment "$pkgdir"/var/lib/mastodon/.env
   touch "$pkgdir"/etc/mastodon/environment