From 3273bb0adedfd320e87d7c6acd9ce762281de789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Maria=C5=84ski?= <lmarianski@protonmail.com>
Date: Wed, 17 May 2023 13:44:43 +0200
Subject: [PATCH 1/2] Update PKGBUILD

---
 PKGBUILD-git | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/PKGBUILD-git b/PKGBUILD-git
index 3bbdd13..08ad5ef 100644
--- a/PKGBUILD-git
+++ b/PKGBUILD-git
@@ -52,35 +52,35 @@ source=("${_pkgname}::git+https://github.com/hyprwm/Hyprland.git")
 conflicts=("${_pkgname}")
 provides=(hyprland)
 sha256sums=('SKIP')
-options=(!makeflags !buildflags !strip)
 
 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)"
-  )
+	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)"
+	)
+}
+
+prepare() {
+	cd "$srcdir/$_pkgname"
+	git submodule init
+
+	git config submodule."subprojects/hyprland-protocols".url "$srcdir/hyprland-protocols"
+	git config submodule."subprojects/udis86".url "$srcdir/udis86"
+	git config submodule.wlroots.url "$srcdir/wlroots"
+	git -c protocol.file.allow=always submodule update
 }
 
 build() {
-	cd "${srcdir}/${_pkgname}"
-	git submodule update --init
-	make fixwlr
-	cd "./subprojects/wlroots/" && meson build/ --prefix="${srcdir}/tmpwlr" --buildtype=release && ninja -C build/ && mkdir -p "${srcdir}/tmpwlr" && ninja -C build/ install && cd ../../
-	make protocols
-    make release
-	cd ./hyprctl && make all && cd ..
+	cmake -B build -S "$_pkgname" \
+		-DCMAKE_BUILD_TYPE='None' \
+		-DCMAKE_INSTALL_PREFIX='/usr' \
+		-Wno-dev
+
+	cmake --build build
 }
 
 package() {
-	cd "${srcdir}/${_pkgname}"
-	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 -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"
-	install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${_pkgname}"
-	install -Dm755 ../tmpwlr/lib/libwlroots.so.11032 -t "${pkgdir}/usr/lib"
+	install -Dm644 "$srcdir/$_pkgname/LICENSE" -t "$pkgdir/usr/share/licenses/$_pkgname"
+	DESTDIR="$pkgdir" cmake --install build
 }

From 5e0fce6d9454d8ffe7e3e9ac50b37854ccec1b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Maria=C5=84ski?= <lmarianski@protonmail.com>
Date: Wed, 17 May 2023 14:26:42 +0200
Subject: [PATCH 2/2] sources

---
 PKGBUILD-git | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/PKGBUILD-git b/PKGBUILD-git
index 08ad5ef..f674494 100644
--- a/PKGBUILD-git
+++ b/PKGBUILD-git
@@ -2,10 +2,10 @@
 
 _pkgname="hyprland"
 pkgname="${_pkgname}-git"
-pkgver=r1181.gee15ad1
+pkgver=r2910.642030f9
 pkgrel=1
 pkgdesc="A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks."
-arch=(any)
+arch=(x86_64)
 url="https://github.com/hyprwm/Hyprland"
 license=('BSD')
 depends=(
@@ -48,16 +48,23 @@ makedepends=(
 	vulkan-headers
 	wayland-protocols
 	xorgproto)
-source=("${_pkgname}::git+https://github.com/hyprwm/Hyprland.git")
+source=("${_pkgname}::git+https://github.com/hyprwm/Hyprland.git"
+	"git+https://github.com/hyprwm/hyprland-protocols.git"
+	"git+https://github.com/canihavesomecoffee/udis86.git"
+	"git+https://gitlab.freedesktop.org/wlroots/wlroots.git")
 conflicts=("${_pkgname}")
 provides=(hyprland)
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+	'SKIP'
+	'SKIP'
+	'SKIP')
 
 pkgver() {
 	cd "$_pkgname"
-	( set -o pipefail
+	(
+		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)"
+			printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 	)
 }