From 433e4a0eefcdbf9609ca54d3758019efb0e0769d Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com>
Date: Mon, 6 Jun 2022 15:05:00 -0700
Subject: [PATCH 1/5] Update PKGBUILD

---
 aur/PKGBUILD | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/aur/PKGBUILD b/aur/PKGBUILD
index a0ecfdfa..deab5a93 100644
--- a/aur/PKGBUILD
+++ b/aur/PKGBUILD
@@ -2,9 +2,9 @@
 
 _pkgname="hyprland"
 pkgname="${_pkgname}"
-pkgver="0.3.0beta"
+pkgver="0.4.0beta"
 pkgrel=2
-pkgdesc="Hyprland is a dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks."
+pkgdesc="A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks."
 arch=(any)
 url="https://github.com/vaxerski/Hyprland"
 license=('BSD')
@@ -48,8 +48,9 @@ makedepends=(
 	wayland-protocols
 	xorgproto)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/vaxerski/hyprland/archive/v${pkgver}.tar.gz")
-sha256sums=('46ba9b61570f3385673dfd27a3d1dc5a084236f138bca1c2537335e0cdce9e78')
-conflicts=("${_pkgname}-git" "${_pkgname}" "${_pkgname}-bin")
+sha256sums=('5969e5f88426f90acdfb5958644733d8a9409389c2d345514c58a66cf74d2f91')
+conflicts=("${_pkgname}")
+provides=(hyprland)
 options=(!makeflags !buildflags)
 
 build() {

From 92da453d4de3c6aeeaad5500b62c72c252fa1f77 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com>
Date: Mon, 6 Jun 2022 15:05:16 -0700
Subject: [PATCH 2/5] Update PKGBUILD-git

---
 aur/PKGBUILD-git | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/aur/PKGBUILD-git b/aur/PKGBUILD-git
index c17ec25a..b6443a2c 100644
--- a/aur/PKGBUILD-git
+++ b/aur/PKGBUILD-git
@@ -2,9 +2,9 @@
 
 _pkgname="hyprland"
 pkgname="${_pkgname}-git"
-pkgver=r655.gef85544
-pkgrel=1
-pkgdesc="Hyprland is a dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks."
+pkgver=r673.gb62e530
+pkgrel=2
+pkgdesc="A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks."
 arch=(any)
 url="https://github.com/vaxerski/Hyprland"
 license=('BSD')
@@ -48,7 +48,8 @@ makedepends=(
 	wayland-protocols
 	xorgproto)
 source=("${_pkgname}::git+https://github.com/vaxerski/Hyprland.git")
-conflicts=("${_pkgname}-git" "${_pkgname}" "${_pkgname}-bin")
+conflicts=("${_pkgname}")
+provides=(hyprland)
 sha256sums=('SKIP')
 options=(!makeflags !buildflags)
 

From d0ca0431228dd1e859891f40cdcb801ea2b522b5 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com>
Date: Mon, 6 Jun 2022 15:05:29 -0700
Subject: [PATCH 3/5] Update PKGBUILD-git

---
 aur/PKGBUILD-git | 42 +++++++++---------------------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/aur/PKGBUILD-git b/aur/PKGBUILD-git
index b6443a2c..62c3a9fa 100644
--- a/aur/PKGBUILD-git
+++ b/aur/PKGBUILD-git
@@ -1,8 +1,8 @@
-# Maintainer: ThatOneCalculator <kainoa@t1c.dev>, Sander van Kasteel <info@sandervankasteel.nl>
+# Maintainer: ThatOneCalculator <kainoa@t1c.dev>
 
 _pkgname="hyprland"
-pkgname="${_pkgname}-git"
-pkgver=r673.gb62e530
+pkgname="${_pkgname}-bin"
+pkgver="0.4.0beta"
 pkgrel=2
 pkgdesc="A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks."
 arch=(any)
@@ -37,42 +37,18 @@ depends=(
 	vulkan-icd-loader
 	vulkan-validation-layers
 	xorg-xwayland)
-makedepends=(
-	git
-	cmake
-	ninja
-	gcc
-	gdb
-	meson
-	vulkan-headers
-	wayland-protocols
-	xorgproto)
-source=("${_pkgname}::git+https://github.com/vaxerski/Hyprland.git")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/vaxerski/Hyprland/releases/download/v${pkgver}/v${pkgver}.tar.gz")
+sha256sums=('5969e5f88426f90acdfb5958644733d8a9409389c2d345514c58a66cf74d2f91')
 conflicts=("${_pkgname}")
 provides=(hyprland)
-sha256sums=('SKIP')
-options=(!makeflags !buildflags)
-
-pkgver() {
-  cd "$_pkgname"
-  ( set -o pipefail
-    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
-}
-
-build() {
-	cd "${srcdir}/${_pkgname}"
-	git submodule update --init
-	make all
-}
 
 package() {
-	cd "${srcdir}/${_pkgname}"
+	cd "$srcdir/Hyprland-$pkgver"
 	mkdir -p "${pkgdir}/usr/share/wayland-sessions"
 	mkdir -p "${pkgdir}/usr/share/hyprland"
-	install -Dm755 build/Hyprland -t "${pkgdir}/usr/bin"
-	install -Dm755 hyprctl/hyprctl -t "${pkgdir}/usr/bin"
+	install -Dm755 ./Hyprland -t "${pkgdir}/usr/bin"
+	install -Dm755 ./hyprctl -t "${pkgdir}/usr/bin"
+	install -Dm755 ./libwlroots.so.11032 -t "${pkgdir}/usr/lib"
 	install -Dm644 assets/*.png -t "${pkgdir}/usr/share/hyprland"
 	install -Dm644 example/hyprland.desktop -t "${pkgdir}/usr/share/wayland-sessions"
 	install -Dm644 example/hyprland.conf -t "${pkgdir}/usr/share/hyprland"

From d80c90233b1fff7afb584d242bddc6f3cc91bcf3 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com>
Date: Mon, 6 Jun 2022 15:07:35 -0700
Subject: [PATCH 4/5] Update PKGBUILD-bin

---
 aur/PKGBUILD-bin | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/aur/PKGBUILD-bin b/aur/PKGBUILD-bin
index 0a330fed..62c3a9fa 100644
--- a/aur/PKGBUILD-bin
+++ b/aur/PKGBUILD-bin
@@ -2,9 +2,9 @@
 
 _pkgname="hyprland"
 pkgname="${_pkgname}-bin"
-pkgver="0.3.0beta"
+pkgver="0.4.0beta"
 pkgrel=2
-pkgdesc="Hyprland is a dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks."
+pkgdesc="A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks."
 arch=(any)
 url="https://github.com/vaxerski/Hyprland"
 license=('BSD')
@@ -38,8 +38,9 @@ depends=(
 	vulkan-validation-layers
 	xorg-xwayland)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/vaxerski/Hyprland/releases/download/v${pkgver}/v${pkgver}.tar.gz")
-sha256sums=('46ba9b61570f3385673dfd27a3d1dc5a084236f138bca1c2537335e0cdce9e78')
-conflicts=("${_pkgname}-git" "${_pkgname}" "${_pkgname}-bin")
+sha256sums=('5969e5f88426f90acdfb5958644733d8a9409389c2d345514c58a66cf74d2f91')
+conflicts=("${_pkgname}")
+provides=(hyprland)
 
 package() {
 	cd "$srcdir/Hyprland-$pkgver"

From 85d91c3d3cd2c8a5a9f399e2adbcfcdb9486232a Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com>
Date: Mon, 6 Jun 2022 15:07:48 -0700
Subject: [PATCH 5/5] Update PKGBUILD-git

---
 aur/PKGBUILD-git | 42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/aur/PKGBUILD-git b/aur/PKGBUILD-git
index 62c3a9fa..b6443a2c 100644
--- a/aur/PKGBUILD-git
+++ b/aur/PKGBUILD-git
@@ -1,8 +1,8 @@
-# Maintainer: ThatOneCalculator <kainoa@t1c.dev>
+# Maintainer: ThatOneCalculator <kainoa@t1c.dev>, Sander van Kasteel <info@sandervankasteel.nl>
 
 _pkgname="hyprland"
-pkgname="${_pkgname}-bin"
-pkgver="0.4.0beta"
+pkgname="${_pkgname}-git"
+pkgver=r673.gb62e530
 pkgrel=2
 pkgdesc="A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks."
 arch=(any)
@@ -37,18 +37,42 @@ depends=(
 	vulkan-icd-loader
 	vulkan-validation-layers
 	xorg-xwayland)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/vaxerski/Hyprland/releases/download/v${pkgver}/v${pkgver}.tar.gz")
-sha256sums=('5969e5f88426f90acdfb5958644733d8a9409389c2d345514c58a66cf74d2f91')
+makedepends=(
+	git
+	cmake
+	ninja
+	gcc
+	gdb
+	meson
+	vulkan-headers
+	wayland-protocols
+	xorgproto)
+source=("${_pkgname}::git+https://github.com/vaxerski/Hyprland.git")
 conflicts=("${_pkgname}")
 provides=(hyprland)
+sha256sums=('SKIP')
+options=(!makeflags !buildflags)
+
+pkgver() {
+  cd "$_pkgname"
+  ( set -o pipefail
+    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
+}
+
+build() {
+	cd "${srcdir}/${_pkgname}"
+	git submodule update --init
+	make all
+}
 
 package() {
-	cd "$srcdir/Hyprland-$pkgver"
+	cd "${srcdir}/${_pkgname}"
 	mkdir -p "${pkgdir}/usr/share/wayland-sessions"
 	mkdir -p "${pkgdir}/usr/share/hyprland"
-	install -Dm755 ./Hyprland -t "${pkgdir}/usr/bin"
-	install -Dm755 ./hyprctl -t "${pkgdir}/usr/bin"
-	install -Dm755 ./libwlroots.so.11032 -t "${pkgdir}/usr/lib"
+	install -Dm755 build/Hyprland -t "${pkgdir}/usr/bin"
+	install -Dm755 hyprctl/hyprctl -t "${pkgdir}/usr/bin"
 	install -Dm644 assets/*.png -t "${pkgdir}/usr/share/hyprland"
 	install -Dm644 example/hyprland.desktop -t "${pkgdir}/usr/share/wayland-sessions"
 	install -Dm644 example/hyprland.conf -t "${pkgdir}/usr/share/hyprland"