sway

commit 4b1eaaf731b0e29497edc4c85153f2cf417fb5ce
parent c040defd5f5cf5beed264dd057097625d9c0d423
Author: M Stoeckl <code@mstoeckl.com>
Date:   Mon, 21 Jan 2019 13:01:09 -0500

Removed unused wlroots dependency for sway(bg|bar|msg|nag)

Also remove direct libm dependency where unused.

Diffstat:
M
client/meson.build
 | 
3
+--
M
common/meson.build
 | 
3
+--
M
include/cairo.h
 | 
2
+-
M
swaybar/meson.build
 | 
3
+--
M
swaybg/meson.build
 | 
4
+---
M
swaymsg/meson.build
 | 
2
+-
M
swaynag/meson.build
 | 
2
--

7 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/client/meson.build b/client/meson.build
@@ -8,8 +8,7 @@ lib_sway_client = static_library(
 		gdk_pixbuf,
 		pango,
 		pangocairo,
-		wlroots,
-		wayland_client,
+		wayland_client
 	],
 	link_with: [lib_sway_common],
 	include_directories: sway_inc
diff --git a/common/meson.build b/common/meson.build
@@ -15,8 +15,7 @@ lib_sway_common = static_library(
 		cairo,
 		gdk_pixbuf,
 		pango,
-		pangocairo,
-		wlroots
+		pangocairo
 	],
 	include_directories: sway_inc
 )
diff --git a/include/cairo.h b/include/cairo.h
@@ -4,7 +4,7 @@
 #include "config.h"
 #include <stdint.h>
 #include <cairo/cairo.h>
-#include <wlr/types/wlr_output.h>
+#include <wayland-client-protocol.h>
 #if HAVE_GDK_PIXBUF
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #endif
diff --git a/swaybar/meson.build b/swaybar/meson.build
@@ -16,8 +16,7 @@ swaybar_deps = [
 	pangocairo,
 	rt,
 	wayland_client,
-	wayland_cursor,
-	wlroots,
+	wayland_cursor
 ]
 if have_tray
 	if systemd.found()
diff --git a/swaybg/meson.build b/swaybg/meson.build
@@ -7,11 +7,9 @@ executable(
 		client_protos,
 		gdk_pixbuf,
 		jsonc,
-		math,
 		pango,
 		pangocairo,
-		wayland_client,
-		wlroots,
+		wayland_client
 	],
 	link_with: [lib_sway_common, lib_sway_client],
 	install: true
diff --git a/swaymsg/meson.build b/swaymsg/meson.build
@@ -2,7 +2,7 @@ executable(
 	'swaymsg',
 	'main.c',
 	include_directories: [sway_inc],
-	dependencies: [jsonc, wlroots],
+	dependencies: [jsonc],
 	link_with: [lib_sway_common],
 	install: true
 )
diff --git a/swaynag/meson.build b/swaynag/meson.build
@@ -11,12 +11,10 @@ executable(
 		cairo,
 		client_protos,
 		gdk_pixbuf,
-		math,
 		pango,
 		pangocairo,
 		wayland_client,
 		wayland_cursor,
-		wlroots,
 	],
 	link_with: [lib_sway_common, lib_sway_client],
 	install: true