Fix rebuilds

2 files changed, 11 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7de81ffb75..540c909fcf7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = writeas-gtk
 	pkgdesc = Write.as GTK desktop app
 	pkgver = 1.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://write.as/apps/desktop
 	arch = x86_64
 	license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index 119199f1c65..6c7f6bb0d8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=writeas-gtk
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Write.as GTK desktop app"
 arch=('x86_64')
 url="https://write.as/apps/desktop"
@@ -17,15 +17,19 @@ makedepends=(
 	'ninja'
 	'vala'
 )
-source=(https://code.as/writeas/writeas-gtk/archive/v$pkgver.tar.gz)
+source=(https://code.as/writeas/writeas-gtk/archive/v${pkgver}.tar.gz)
 sha256sums=('c6487821b5fbeef38ee50082d42a89be97b2fdbd5c3205d8a9c961ca0c3c7fbf')
 
+prepare() {
+	mkdir -p build
+}
+
 build() {
-	cd "${srcdir}/${pkgname}"
-	meson build --prefix="${pkgdir}/usr" --reconfigure
-	ninja -C "build"
+	# Temporary workaround for https://github.com/mesonbuild/meson/issues/4247
+	arch-meson "${pkgname}" build || arch-meson "${pkgname}" build --reconfigure
+	ninja -C build
 }
 
 package() {
-	ninja install -C "${srcdir}/${pkgname}/build"
+	DESTDIR="${pkgdir}" ninja install -C build
 }