From c6da94708a4d94e609c9c180bc9c3fce5366a5b7 Mon Sep 17 00:00:00 2001
From: Moon Sungjoon <sumoon@seoulsaram.org>
Date: Sun, 31 Oct 2021 05:12:33 +0900
Subject: [PATCH] Fix build error with 0.15.0 wlroots

- wlr_subsurface.parent_link is now wlr_subsurface.current.link.
  wlr_surface.subsurfaces_{above,below} is moved to wlr_surface_state.
  Reference: https://github.com/swaywm/wlroots/pull/3169

- Unnecessary to include "wlr_box.h"
  Reference: https://github.com/swaywm/wlroots/pull/3011
---
 render.c    | 1 -
 util.c      | 2 --
 view.c      | 5 ++---
 view.h      | 1 -
 xdg_shell.c | 1 -
 xwayland.c  | 1 -
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/render.c b/render.c
index 166a088..a0d4e59 100644
--- a/render.c
+++ b/render.c
@@ -10,7 +10,6 @@
 #include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
diff --git a/util.c b/util.c
index 95de499..714c7e3 100644
--- a/util.c
+++ b/util.c
@@ -6,8 +6,6 @@
  * See the LICENSE file accompanying this file.
  */
 
-#include <wlr/types/wlr_box.h>
-
 #include "util.h"
 
 int
diff --git a/view.c b/view.c
index 3f3b0ed..33b59b4 100644
--- a/view.c
+++ b/view.c
@@ -12,7 +12,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_surface.h>
 
@@ -235,10 +234,10 @@ view_map(struct cg_view *view, struct wlr_surface *surface)
 	view->wlr_surface = surface;
 
 	struct wlr_subsurface *subsurface;
-	wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_below, parent_link) {
+	wl_list_for_each (subsurface, &view->wlr_surface->current.subsurfaces_below, current.link) {
 		subsurface_create(view, subsurface);
 	}
-	wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_above, parent_link) {
+	wl_list_for_each (subsurface, &view->wlr_surface->current.subsurfaces_above, current.link) {
 		subsurface_create(view, subsurface);
 	}
 
diff --git a/view.h b/view.h
index cd16e42..224f4a6 100644
--- a/view.h
+++ b/view.h
@@ -5,7 +5,6 @@
 
 #include <stdbool.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #if CAGE_HAS_XWAYLAND
diff --git a/xdg_shell.c b/xdg_shell.c
index 5bac6de..72ae43a 100644
--- a/xdg_shell.c
+++ b/xdg_shell.c
@@ -9,7 +9,6 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
 
diff --git a/xwayland.c b/xwayland.c
index 2aae0f9..ebd8e54 100644
--- a/xwayland.c
+++ b/xwayland.c
@@ -9,7 +9,6 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/util/log.h>
 #include <wlr/xwayland.h>