From d0279e60eba9cc26b5ffa5afb9dd5d4f45f6d249 Mon Sep 17 00:00:00 2001
From: Gerben Jan Dijkman <gjdijkman@gjdwebserver.nl>
Date: Thu, 1 Sep 2022 14:12:25 +0200
Subject: [PATCH] Version bump

---
 x11-wm/phoc/Manifest                          |  3 +--
 ...{phoc-0.21.0.ebuild => phoc-0.21.1.ebuild} | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 9 deletions(-)
 rename x11-wm/phoc/{phoc-0.21.0.ebuild => phoc-0.21.1.ebuild} (71%)

diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest
index 926336a..5486578 100644
--- a/x11-wm/phoc/Manifest
+++ b/x11-wm/phoc/Manifest
@@ -1,5 +1,4 @@
 DIST phoc-v0.13.1.tar.gz 166867 BLAKE2B 6606855efe7099d12c8be3ee16c401bbcc618aaed2f264abe982cc4a49ccbc0e65fac1b7d8da62de4261bdf3a322f4313a15723c7b7cb7a9ce279957dbf89c78 SHA512 0da68ac4d0601e91ed5f59eeb0beea64180b546f58b300631495084d366fe515c26fe9d58d0ca20687032f6824ae98dcc82edd8a6c80caa95178d24d27ee2650
-DIST phoc-v0.20.0.tar.gz 202787 BLAKE2B 88ddf67905282fb8a9fc0f1cfce048ed837abb159a250c2a28ac5a0da33e1a4f0ba5a5ef3a49e089073d123039dbac7296c4c1f5bf5454324d2fab47d7a0e4a3 SHA512 ae3e50822a822c34a66df339af21cf8aacfafcb0872b05c15c6cff9c356c0dcb9e051d55b103ad636b182bf98898c2b30c2c66ca080a0e0ae6a1fa2b56578b41
-DIST phoc-v0.21.0.tar.gz 220208 BLAKE2B 60edd638c91944af29d2c1cb1a63911190fdc4e4eb745f0df52fb3b6ee82f9c994b38b338ae2eb974a6c7b8e28762c2230dae93a5a922addc490111d9441c256 SHA512 d214ca7309960976fbe55fe8e83ea62f78f71792919fc02c913939b588ab206da690dd55fce22d9989bb595e6a3275430c17e1839cad2c1a2a00979af125c35d
+DIST phoc-v0.21.1.tar.gz 221289 BLAKE2B 15978d12217517791c36e2511704210dd79a3b413fd215a6be4a644d222ae1b09c5f0e845cf67cc4c1f4849ba0db051fab8f61edd5ffcc991cbe9d0e74578d89 SHA512 94b93fa524e5be953851764b19f0da5deed11ede988fed8757b66649e4700d2f659d4dc32226c73055f63d69d7f9c066d84f23c6338c9b5998217fd2fed2bedd
 DIST wlroots-1f8bb9e0e3058fc31a14866dc52e8f83c1287a09.tar.gz 587020 BLAKE2B 86054b70b1006102b9da2ab4b5f8a63460add2cbfedfa73d66beff6fe3b114e2021a617196f620e2d758b7801c66844c48619cd4d7243a695b1a05448f2f434d SHA512 8f2c5c39c51e76984b85954291fff19a071901550e4e7f226661a4ae59d28486939bd4e05a59a6c24a623cc1aa9b1f97c3ebaafa5901d1893a485385b5d88e50
 DIST wlroots-c9cd3502ba6113070020de50e41f0af72e0f5031.tar.gz 506612 BLAKE2B 70589e63cf223aa5b3634e057cc8c9d1f52d0f6c0fd3bbf66739bc1c934036bab0e8fc8337f51b1d4bb0d73c008b16421c354194cf215741e84ad88345465870 SHA512 af610233ec2343a3baefbb30db4b9a3f30dac4f8656293849be603fbcad0cdd65e91d80702c35e4aaf47437e8c301229c4933b7c8b5df3a7128979c94bcfcddc
diff --git a/x11-wm/phoc/phoc-0.21.0.ebuild b/x11-wm/phoc/phoc-0.21.1.ebuild
similarity index 71%
rename from x11-wm/phoc/phoc-0.21.0.ebuild
rename to x11-wm/phoc/phoc-0.21.1.ebuild
index 5a7f9fd..61059fa 100755
--- a/x11-wm/phoc/phoc-0.21.0.ebuild
+++ b/x11-wm/phoc/phoc-0.21.1.ebuild
@@ -8,11 +8,16 @@ inherit meson xdg gnome2-utils
 MY_PV="v${PV}"
 MY_P="${PN}-${MY_PV}"
 
+#WL_COMMIT="9b77a484d9581fb6ce4b0afcd44dd728709d8ba7"
+WL_COMMIT="1f8bb9e0e3058fc31a14866dc52e8f83c1287a09"
+WL_P="wlroots-${WL_COMMIT}"
+
 DESCRIPTION="Wlroots based Phone compositor"
 HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc"
 
 SRC_URI="
 	https://gitlab.gnome.org/World/Phosh/phoc/-/archive/${MY_PV}/${MY_P}.tar.gz
+	https://source.puri.sm/Librem5/wlroots/-/archive/${WL_COMMIT}/${WL_P}.tar.gz
 "
 
 LICENSE="GPL-3"
@@ -27,20 +32,23 @@ RDEPEND="
 	dev-libs/libinput
 	dev-libs/wayland
 	dev-libs/wayland-protocols
+	gnome-base/dconf
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gnome-settings-daemon
 	gnome-base/gnome-desktop
+	dev-util/vulkan-headers
 	sys-apps/systemd
 	x11-libs/libdrm
 	x11-libs/pixman
+	x11-libs/libxcb
 	x11-libs/xcb-util
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-renderutil
 	x11-wm/mutter
 	sys-auth/seatd
-	=gui-libs/wlroots-0.15.1
-	dev-util/vulkan-headers
+	!gui-libs/wlroots
 	sys-auth/seatd
-	x11-libs/libxkbcommon
-	gui-libs/egl-gbm
+	x11-apps/xkbcomp
 	x11-libs/libdrm
 "
 
@@ -56,13 +64,13 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 	rm -r "${S}"/subprojects/wlroots || die "Failed to remove bundled wlroots"
+	cp -r "${WORKDIR}/${WL_P}" "${S}"/subprojects/wlroots || die "Failed to copy right version of wlroots"
 }
 
 src_configure() {
 	local emesonargs=(
-		#-Dembed-wlroots=enabled 
-		#-Ddefault-library=dynamic
-		#-Ddefault_library=static
+		-Dembed-wlroots=enabled 
+		-Ddefault_library=static
 		-Dtests=false
 	)
 	meson_src_configure