From 1ef4cf5b8b60fe8be65ca1d4d0fb00d54d038074 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 11 Aug 2021 11:31:14 +0200
Subject: [PATCH] Update wlr_box includes to util/box.h

The wlroots header has been moved upstream.
---
 render.c    | 2 +-
 util.c      | 2 --
 util.h      | 2 +-
 view.c      | 1 -
 view.h      | 2 +-
 xdg_shell.c | 1 -
 xwayland.c  | 1 -
 7 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/render.c b/render.c
index e3ee038..05f287f 100644
--- a/render.c
+++ b/render.c
@@ -10,12 +10,12 @@
 #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>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_surface.h>
+#include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include <wlr/util/region.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/util.h b/util.h
index db6bc7d..b6281f3 100644
--- a/util.h
+++ b/util.h
@@ -1,7 +1,7 @@
 #ifndef CG_UTIL_H
 #define CG_UTIL_H
 
-#include <wlr/types/wlr_box.h>
+#include <wlr/util/box.h>
 
 /** Apply scale to a width or height. */
 int scale_length(int length, int offset, float scale);
diff --git a/view.c b/view.c
index 0454943..6e38a01 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>
 #include <wlr/types/wlr_scene.h>
diff --git a/view.h b/view.h
index c18ddf1..0945897 100644
--- a/view.h
+++ b/view.h
@@ -5,9 +5,9 @@
 
 #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>
+#include <wlr/util/box.h>
 #if CAGE_HAS_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
diff --git a/xdg_shell.c b/xdg_shell.c
index 1930723..29b14a7 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_scene.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
diff --git a/xwayland.c b/xwayland.c
index 6862271..47e1a2b 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>