git: fe9f17097989 - 2023Q3 - x11-wm/swayfx: unbreak with wlroots/X11=off after e83c39ced11e
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 29 Jul 2023 17:46:41 UTC
The branch 2023Q3 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fe9f170979898ca9d0c39e4760c0d54af2c2f849
commit fe9f170979898ca9d0c39e4760c0d54af2c2f849
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-07-29 17:43:19 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-07-29 17:46:36 +0000
x11-wm/swayfx: unbreak with wlroots/X11=off after e83c39ced11e
../sway/tree/root.c:63:7: error: implicit declaration of function 'wlr_surface_is_xwayland_surface' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
if (wlr_surface_is_xwayland_surface(con->view->surface)) {
^
../sway/tree/root.c:63:7: note: did you mean 'wlr_surface_is_layer_surface'?
/usr/local/include/wlr/types/wlr_layer_shell_v1.h:144:6: note: 'wlr_surface_is_layer_surface' declared here
bool wlr_surface_is_layer_surface(struct wlr_surface *surface);
^
../sway/tree/root.c:64:44: error: implicit declaration of function 'wlr_xwayland_surface_from_wlr_surface' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
struct wlr_xwayland_surface *xsurface = wlr_xwayland_surface_from_wlr_surface(con->view->surface);
^
../sway/tree/root.c:64:44: note: did you mean 'wlr_xdg_surface_from_wlr_surface'?
/usr/local/include/wlr/types/wlr_xdg_shell.h:494:25: note: 'wlr_xdg_surface_from_wlr_surface' declared here
struct wlr_xdg_surface *wlr_xdg_surface_from_wlr_surface(
^
../sway/tree/root.c:64:33: error: incompatible integer to pointer conversion initializing 'struct wlr_xwayland_surface *' with an expression of type 'int' [-Werror,-Wint-conversion]
struct wlr_xwayland_surface *xsurface = wlr_xwayland_surface_from_wlr_surface(con->view->surface);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../sway/tree/root.c:65:4: error: implicit declaration of function 'wlr_xwayland_surface_set_minimized' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
wlr_xwayland_surface_set_minimized(xsurface, minimize);
^
(cherry picked from commit af7f9d91cd35e4dbdce78c18734b073bcd435368)
---
x11-wm/swayfx/Makefile | 2 ++
x11-wm/swayfx/distinfo | 2 ++
2 files changed, 4 insertions(+)
diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile
index cfdcc406e212..e368f3c454b2 100644
--- a/x11-wm/swayfx/Makefile
+++ b/x11-wm/swayfx/Makefile
@@ -2,6 +2,8 @@ DISTVERSION= 0.3.2
PORTREVISION= 0
PKGNAMESUFFIX= ${GH_PROJECT:S/${PORTNAME}//}
+PATCHFILES+= c47aa61c6492.patch:-p1 # https://github.com/WillPower3309/swayfx/pull/209
+
COMMENT= Sway, but with eye candy!
WWW= https://github.com/WillPower3309/swayfx
diff --git a/x11-wm/swayfx/distinfo b/x11-wm/swayfx/distinfo
index 7f0ff13f9f32..4c90c0c52c6c 100644
--- a/x11-wm/swayfx/distinfo
+++ b/x11-wm/swayfx/distinfo
@@ -1,6 +1,8 @@
TIMESTAMP = 1688699880
SHA256 (WillPower3309-swayfx-0.3.2_GH0.tar.gz) = 05b5cdc2d25e9f05817556d7053c02f8b89c9ef629405fcba5b4d240d4fd0545
SIZE (WillPower3309-swayfx-0.3.2_GH0.tar.gz) = 5684837
+SHA256 (c47aa61c6492.patch) = 243ae11c1c80ab428ca04c62e79ea140dd8d4cb9eb7e6c45dbb307ea8181d38b
+SIZE (c47aa61c6492.patch) = 1422
SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d
SIZE (cd9d1038a822.patch) = 8968
SHA256 (f98ca3ab7ca1.patch) = b3a427b6edbf1c89bbf5fdeb5e3fc4c6708478e6d2031fcead87d29bf5c409fa