commit: ae8130ca588d08497b9a593f3ef8131b58e4a011 Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com> AuthorDate: Mon Apr 22 23:51:51 2024 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Mon Apr 22 23:54:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae8130ca
gui-wm/swayfx: Compile fix for USE="-X" Closes: https://bugs.gentoo.org/907342 Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com> ...ng-able-to-build-without-xwayland-support.patch | 37 ++++++++++++++++++++++ gui-wm/swayfx/swayfx-0.3.2.ebuild | 4 +++ 2 files changed, 41 insertions(+) diff --git a/gui-wm/swayfx/files/swayfx-0.3.2-fix-not-being-able-to-build-without-xwayland-support.patch b/gui-wm/swayfx/files/swayfx-0.3.2-fix-not-being-able-to-build-without-xwayland-support.patch new file mode 100644 index 0000000000..4b7d4f3a95 --- /dev/null +++ b/gui-wm/swayfx/files/swayfx-0.3.2-fix-not-being-able-to-build-without-xwayland-support.patch @@ -0,0 +1,37 @@ +From c47aa61c64925c72722dfbfa01cd47643a92c7d9 Mon Sep 17 00:00:00 2001 +From: Erik Reider <[email protected]> +Date: Sat, 29 Jul 2023 19:13:26 +0200 +Subject: [PATCH] fix: not being able to build without xwayland support (#209) + +--- + sway/tree/root.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/sway/tree/root.c b/sway/tree/root.c +index 2c1b96b8..9df6f002 100644 +--- a/sway/tree/root.c ++++ b/sway/tree/root.c +@@ -58,12 +58,16 @@ void root_destroy(struct sway_root *root) { + /* Set minimized state from scratchpad container `show` state */ + static void root_scratchpad_set_minimize(struct sway_container *con, bool minimize) { + if (con->view) { +- struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel = con->view->foreign_toplevel; +- ++#if HAVE_XWAYLAND + if (wlr_surface_is_xwayland_surface(con->view->surface)) { +- struct wlr_xwayland_surface *xsurface = wlr_xwayland_surface_from_wlr_surface(con->view->surface); ++ struct wlr_xwayland_surface *xsurface ++ = wlr_xwayland_surface_from_wlr_surface(con->view->surface); + wlr_xwayland_surface_set_minimized(xsurface, minimize); +- } else if (foreign_toplevel) { ++ return; ++ } ++#endif ++ struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel = NULL; ++ if ((foreign_toplevel = con->view->foreign_toplevel)) { + wlr_foreign_toplevel_handle_v1_set_minimized(foreign_toplevel, minimize); + } + } +-- +2.43.2 + diff --git a/gui-wm/swayfx/swayfx-0.3.2.ebuild b/gui-wm/swayfx/swayfx-0.3.2.ebuild index 7f2e37cb98..4f68c26819 100644 --- a/gui-wm/swayfx/swayfx-0.3.2.ebuild +++ b/gui-wm/swayfx/swayfx-0.3.2.ebuild @@ -62,6 +62,10 @@ BDEPEND=" BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )" REQUIRED_USE="tray? ( swaybar )" +PATCHES=( + "${FILESDIR}/${PN}-0.3.2-fix-not-being-able-to-build-without-xwayland-support.patch" + ) + src_configure() { local emesonargs=( $(meson_feature man man-pages)
