From 392d54a35d34ff08baaffdd50b9d11072481706e Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Tue, 13 Feb 2018 23:48:46 +0100
Subject: Wrap wl_resource_get_user_data into safer helper functions

This ensures we're not incorrectly casting a resource.

Fixes #628
---
 xwayland/xwm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xwayland')

diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index 10bc2e30..94dfdaab 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -742,7 +742,7 @@ static void xwm_handle_surface_id_message(struct wlr_xwm *xwm,
 	struct wl_resource *resource =
 		wl_client_get_object(xwm->xwayland->client, id);
 	if (resource) {
-		struct wlr_surface *surface = wl_resource_get_user_data(resource);
+		struct wlr_surface *surface = wlr_surface_from_resource(resource);
 		xsurface->surface_id = 0;
 		xwm_map_shell_surface(xwm, xsurface, surface);
 	} else {
-- 
cgit v1.2.3


From 168e26489a0e6301ce6c383413ff9cc415d4f8ed Mon Sep 17 00:00:00 2001
From: Rodrigo Lourenço <rodrigo.z.lourenco@tecnico.ulisboa.pt>
Date: Wed, 14 Feb 2018 18:27:31 +0000
Subject: Add missing dependencies

---
 backend/meson.build  | 9 +++++----
 render/meson.build   | 2 +-
 types/meson.build    | 2 +-
 xwayland/meson.build | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'xwayland')

diff --git a/backend/meson.build b/backend/meson.build
index bac43063..c0ed76f1 100644
--- a/backend/meson.build
+++ b/backend/meson.build
@@ -28,14 +28,15 @@ backend_files = files(
 )
 
 backend_deps = [
-	wayland_server,
+	drm,
 	egl,
 	gbm,
 	libinput,
-	wlr_render,
-	wlr_protos,
-	drm,
 	pixman,
+	xkbcommon,
+	wayland_server,
+	wlr_protos,
+	wlr_render,
 ]
 
 if host_machine.system().startswith('freebsd')
diff --git a/render/meson.build b/render/meson.build
index 1a5a85b8..8aa70cea 100644
--- a/render/meson.build
+++ b/render/meson.build
@@ -22,7 +22,7 @@ lib_wlr_render = static_library(
 	glapi[0],
 	glapi[1],
 	include_directories: wlr_inc,
-	dependencies: [glesv2, egl, pixman],
+	dependencies: [egl, glesv2, pixman, wayland_server],
 )
 
 wlr_render = declare_dependency(
diff --git a/types/meson.build b/types/meson.build
index 2731f9bc..329009bf 100644
--- a/types/meson.build
+++ b/types/meson.build
@@ -28,5 +28,5 @@ lib_wlr_types = static_library(
 		'wlr_xdg_shell_v6.c',
 	),
 	include_directories: wlr_inc,
-	dependencies: [wayland_server, pixman, wlr_protos],
+	dependencies: [pixman, xkbcommon, wayland_server, wlr_protos],
 )
diff --git a/xwayland/meson.build b/xwayland/meson.build
index de05cfaa..2ccdf4cb 100644
--- a/xwayland/meson.build
+++ b/xwayland/meson.build
@@ -15,6 +15,7 @@ lib_wlr_xwayland = static_library(
 		xcb_image,
 		xcb_render,
 		xcb_icccm,
+		xkbcommon,
 		pixman,
 	],
 )
-- 
cgit v1.2.3