From 462ce9bbaa12398f9fbb311f62ee6e38f2e39260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20R=C3=B8dseth?= <xyproto@archlinux.org>
Date: Thu, 14 Mar 2019 08:42:24 +0000
Subject: [PATCH] upgpkg: 1.0-4

---
 PKGBUILD | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 7be47ed..b6bce39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,15 @@
 # Maintainer: Jerome Leclanche <jerome@leclan.ch>
+# Contributor: Alexander F. Rødseth <xyproto@archlinux.org>
+
 pkgname=sway
 pkgver=1.0
-pkgrel=3
-pkgdesc="Tiling Wayland compositor and replacement for the i3 window manager"
-arch=("x86_64")
-url="https://swaywm.org/"
-license=("MIT")
-depends=(
-	"cairo"
-	"json-c"
-	"pango"
-	"pcre"
-	"wlroots"
-)
-makedepends=("meson" "ninja" "gdk-pixbuf2" "scdoc" "wayland-protocols")
+pkgrel=4
+pkgdesc='Tiling Wayland compositor and replacement for the i3 window manager'
+arch=(x86_64)
+url='https://swaywm.org/'
+license=(MIT)
+depends=(cairo gdk-pixbuf2 json-c pango pcre wlroots)
+makedepends=(meson ninja scdoc wayland-protocols)
 optdepends=(
 	"dmenu: Default for launching applications."
 	"ffmpeg: For recording screencasts."
@@ -29,20 +25,18 @@ source=(
 	"$pkgname-$pkgver.tar.gz::https://github.com/swaywm/$pkgname/archive/$pkgver.tar.gz"
 	"https://github.com/swaywm/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz.sig"
 )
-sha256sums=(
-	"24dafd0f1e630e97a5dd47233841adf856b665e2321d6207acfe6b3002d1bc56"
-	"SKIP"
-)
+sha256sums=('24dafd0f1e630e97a5dd47233841adf856b665e2321d6207acfe6b3002d1bc56'
+            'SKIP')
 
 build() {
-	cd "$pkgname-$pkgver"
-	mkdir "build"
-	cd "build"
-	meson -Dwerror=false --prefix /usr ".."
-	ninja
+	mkdir -p build
+	arch-meson build $pkgname-$pkgver -Dwerror=false
+	ninja -C build
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C "$pkgname-$pkgver/build" install
+	DESTDIR="$pkgdir" ninja -C build install
 	install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim: ts=2 sw=2 et