Hi Diederik,
On Fri, Dec 15, 2023 at 04:59:40PM +0100, Diederik de Haas wrote:
> On dinsdag 12 december 2023 18:44:25 CET you wrote:
> > Please update sway to work with wlroots 0.17. 0.17.0 is currently in
> > experimental an will be uploaded to unstable by the end of December 2023.
> 
> FYI: I looked a bit into this issue and after having applied 1 upstream 
> commit 
> and backported a second, I got the following compile error:
> 
> ```
> ../sway/lock.c: In function ‘handle_output_commit’:
> ../sway/lock.c:53:18: error: ‘struct wlr_output_event_commit’ has no member 
> named ‘committed’
>    53 |         if (event->committed & (
>       |                  ^~
> ../sway/lock.c: In function ‘destroy_lock_surface’:
> ../sway/lock.c:69:65: error: ‘struct wlr_session_lock_surface_v1’ has no 
> member named ‘mapped’
>    69 |                         if (other != surf->lock_surface && other-
> >mapped) {
>       |                                                                 ^~
> ../sway/lock.c: In function ‘handle_new_surface’:
> ../sway/lock.c:114:44: error: ‘struct <anonymous>’ has no member named ‘map’
>   114 |         wl_signal_add(&lock_surface->events.map, &surf->map);
>       |                                            ^
> ../sway/lock.c:120:50: error: ‘struct <anonymous>’ has no member named ‘mode’
>   120 |         wl_signal_add(&output->wlr_output->events.mode, &surf-
> >output_mode);
> ```
> 
> After backporting the second I got a bad _feeling_ that this strategy may be 
> used to get it to compile, but would that still make it run (properly)?
> 
> The 'map' issue may be fixed by backporting the following commit:
> https://github.com/swaywm/sway/commit/c9e1dab3187d22ada0232d699e759a628e0ed185
> but this is quite an extensive one.
> 
> While researching this I also noticed several commits titled
> "chase wlroots ..." like commit 6f6b82793d95e3c10d54bcf21ca3f0c76c44b882 
> referencing an upstream wlroots MR with the 'breaking' label attached to it.

There's a larger amount of API changes that are needed for the 0.16 ->
0.17 switch, see

    
https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3527#breaking-changes-for-compositors

so I agree: trying to backport that is a considerable amount
f work. I'd either look at packaging a 1.9 git snapshot and maybe check
with upstream if they intend to release a 0.17 based version.

AFAIK sway's development branch tracks the current (in development)
0.18.x already (which will be another soname bump).

Cheers,
 -- Guido

Reply via email to