diff options
| author |  Simon Ser <contact@emersion.fr> | 2022-12-03 17:48:41 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-12-03 17:48:41 +0100 |
| commit | 194fdc6c35ea53152547242141168d1f0f2f8b8a (patch) | |
| tree | 296872adf4257f34656646797005a575e50c8f9f | |
| parent | Fix build on Debian Stable (diff) | |
| download | sway-194fdc6c35ea53152547242141168d1f0f2f8b8a.tar.gz sway-194fdc6c35ea53152547242141168d1f0f2f8b8a.tar.zst sway-194fdc6c35ea53152547242141168d1f0f2f8b8a.zip | |
build: fix have_xwayland when xcb-icccm is not found
xcb-icccm is required to build Xwayland support.
Backported from commit d41f11e6bd8cef80f02dda4c66d4a31611aed753.
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 5215aada..ce25cfa0 100644 --- a/meson.build +++ b/meson.build | |||
| @@ -83,7 +83,7 @@ endforeach | |||
| 83 | if get_option('xwayland').enabled() and not wlroots_features['xwayland'] | 83 | if get_option('xwayland').enabled() and not wlroots_features['xwayland'] |
| 84 | error('Cannot enable Xwayland in sway: wlroots has been built without Xwayland support') | 84 | error('Cannot enable Xwayland in sway: wlroots has been built without Xwayland support') |
| 85 | endif | 85 | endif |
| 86 | have_xwayland = xcb.found() and wlroots_features['xwayland'] | 86 | have_xwayland = xcb.found() and xcb_icccm.found() and wlroots_features['xwayland'] |
| 87 | 87 | ||
| 88 | if get_option('sd-bus-provider') == 'auto' | 88 | if get_option('sd-bus-provider') == 'auto' |
| 89 | if not get_option('tray').disabled() | 89 | if not get_option('tray').disabled() |