From 84162c893f5c20ad15cb3418421f37263657cc4d Mon Sep 17 00:00:00 2001
From: Arti Zirk <arti.zirk@gmail.com>
Date: Fri, 9 Apr 2021 14:47:06 +0300
Subject: [PATCH] Use 1.6 instead of master

---
 PKGBUILD | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index a23e188..3b79f7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Antonin Décimo <antonin dot decimo at gmail dot com>
 # Contributor: Drew DeVault <sir@cmpwn.com>
-pkgname=sway-hidpi-git
-_pkgname=sway-hidpi
-pkgver=r6539.1dbb6990
-pkgrel=2
+pkgname=sway-hidpi
+pkgver=1.6
+pkgrel=1
 license=("MIT")
 pkgdesc="Tiling Wayland compositor and replacement for the i3 window manager, with XWayland HiDPI (git version)"
 makedepends=(
@@ -20,9 +19,8 @@ depends=(
 	"pango"
 	"polkit"
 	"pcre"
-	"swaybg-git"
 	"ttf-font"
-	"wlroots-hidpi-git"
+	"wlroots-hidpi"
 	"xorg-xwayland-hidpi-git"
         "xsettingsd"
 )
@@ -41,28 +39,23 @@ optdepends=(
 backup=(etc/sway/config)
 arch=("i686" "x86_64")
 url="https://swaywm.org"
-source=("${pkgname%-*}::git+https://github.com/swaywm/sway.git"
+source=("${pkgname}::git+https://github.com/swaywm/sway.git#tag=${pkgver}"
         "50-systemd-user.conf"
-        "xwayland_hidpi.diff::https://github.com/swaywm/sway/pull/5090.diff")
+        "xwayland_hidpi.diff::https://github.com/swaywm/sway/compare/${pkgver}...MisterDA:xwayland_hidpi.diff")
 sha512sums=('SKIP'
             '57590bc0d14c87289a4a9cd67991c6a841e54244d2a6186b5da5a08e633de2e8631959fa8c77ede211b0a5f315d920f2c1350951a53d6f2e9e81859056cb3c9e'
-            '813863fe8d391761770eb264b1c0a2d9442efde3e79fae6b78386ed7c041906eef60bbf9d9bc7d118494de8aba2cd4c45a13dcd2ca09f3f1cd1157e74f122667')
+            'c1786e978a63d0b6ca41ce78c508ab2541272bb9a8484c2f0c04ee463e3fe8cc318c9421e9381c391e40ccc7e45f116f6c73dc264aaaaf2809cd16d7a5db424e')
 provides=("sway")
 conflicts=("sway")
 options=(debug)
 
 prepare() {
-	cd "$_pkgname"
+	cd "$pkgname"
 	patch --forward --strip=1 --input="${srcdir}/xwayland_hidpi.diff"
 }
 
-pkgver() {
-	cd "$_pkgname"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
 build() {
-	cd "$_pkgname"
+	cd "$pkgname"
 	meson \
 		-Dwerror=false \
 		--prefix /usr \
@@ -73,7 +66,7 @@ build() {
 package() {
 	install -Dm644 50-systemd-user.conf -t "$pkgdir/etc/sway/config.d/"
 
-	cd "$_pkgname"
+	cd "$pkgname"
 	DESTDIR="$pkgdir" ninja -C "$srcdir/build" install
 
 	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"