dany/meta-wayland
1
0
Fork 0
mirror of https://codeberg.org/flk/meta-wayland.git synced 2024-12-26 13:38:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

foot: add backport patch to fix build for x11

Browse Source
This commit is contained in:
Markus Volk 2023-09-02 08:44:58 +02:00
parent 181cad568b
commit e2d141488e
2 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
recipes-support/foot/foot/0001-wayland-handle-enum-value-XDG_TOPLEVEL_STATE_SUSPEND.patch Normal file
View File

@ -0,0 +1,70 @@
From 72bc0acfbd4b002ebf26d65368bb65601452353e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Mon, 3 Jul 2023 14:36:03 +0200
Subject: [PATCH 001/117] wayland: handle enum value
XDG_TOPLEVEL_STATE_SUSPENDED
Added in wayland-protocols-1.32
---
wayland.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/wayland.c b/wayland.c
index 406aba6d..5160240b 100644
--- a/wayland.c
+++ b/wayland.c
@@ -651,6 +651,7 @@ xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
bool is_tiled_bottom = false;
bool is_tiled_left = false;
bool is_tiled_right = false;
+ bool is_suspended UNUSED = false;
#if defined(LOG_ENABLE_DBG) && LOG_ENABLE_DBG
char state_str[2048];
@@ -665,29 +666,35 @@ xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
[XDG_TOPLEVEL_STATE_TILED_RIGHT] = "tiled:right",
[XDG_TOPLEVEL_STATE_TILED_TOP] = "tiled:top",
[XDG_TOPLEVEL_STATE_TILED_BOTTOM] = "tiled:bottom",
+#if defined(XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION) /* wayland-protocols >= 1.32 */
+ [XDG_TOPLEVEL_STATE_SUSPENDED] = "suspended",
+#endif
};
#endif
enum xdg_toplevel_state *state;
wl_array_for_each(state, states) {
switch (*state) {
- case XDG_TOPLEVEL_STATE_ACTIVATED: is_activated = true; break;
- case XDG_TOPLEVEL_STATE_FULLSCREEN: is_fullscreen = true; break;
case XDG_TOPLEVEL_STATE_MAXIMIZED: is_maximized = true; break;
+ case XDG_TOPLEVEL_STATE_FULLSCREEN: is_fullscreen = true; break;
+ case XDG_TOPLEVEL_STATE_RESIZING: is_resizing = true; break;
+ case XDG_TOPLEVEL_STATE_ACTIVATED: is_activated = true; break;
case XDG_TOPLEVEL_STATE_TILED_LEFT: is_tiled_left = true; break;
case XDG_TOPLEVEL_STATE_TILED_RIGHT: is_tiled_right = true; break;
case XDG_TOPLEVEL_STATE_TILED_TOP: is_tiled_top = true; break;
case XDG_TOPLEVEL_STATE_TILED_BOTTOM: is_tiled_bottom = true; break;
- case XDG_TOPLEVEL_STATE_RESIZING: is_resizing = true; break;
- }
+
+#if defined(XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION)
+ case XDG_TOPLEVEL_STATE_SUSPENDED: is_suspended = true; break;
+#endif
+ }
#if defined(LOG_ENABLE_DBG) && LOG_ENABLE_DBG
- if (*state >= XDG_TOPLEVEL_STATE_MAXIMIZED &&
- *state <= XDG_TOPLEVEL_STATE_TILED_BOTTOM)
- {
+ if (*state >= 0 && *state < ALEN(strings)) {
state_chars += snprintf(
&state_str[state_chars], sizeof(state_str) - state_chars,
- "%s, ", strings[*state]);
+ "%s, ",
+ strings[*state] != NULL ? strings[*state] : "<unknown>");
}
#endif
}
--
2.41.0

1
recipes-support/foot/foot_git.bb
View File

@ -21,6 +21,7 @@ RRECOMMENDS:${PN} = "ncurses-terminfo"
SRC_URI = " \ SRC_URI = " \
git://codeberg.org/dnkl/foot.git;protocol=https;branch=master \ git://codeberg.org/dnkl/foot.git;protocol=https;branch=master \
file://0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch \ file://0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch \
file://0001-wayland-handle-enum-value-XDG_TOPLEVEL_STATE_SUSPEND.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"