From 1e466a24bafdcc5cb87b64c2ae7d665ff407dd8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Tue, 12 Feb 2019 19:59:24 +0100
Subject: [PATCH] Pull in wlr-protocols instead of wlroots

We're not interested in anything in wlroots, except the wlr protocols.
---
 .gitmodules            | 7 ++++---
 bar/CMakeLists.txt     | 2 +-
 external/wlr-protocols | 1 +
 external/wlroots       | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 160000 external/wlr-protocols
 delete mode 160000 external/wlroots

diff --git a/.gitmodules b/.gitmodules
index 887b1f9..0235ef9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
-[submodule "external/wlroots"]
-	path = external/wlroots
-	url = https://github.com/swaywm/wlroots.git
+[submodule "external/wlr-protocols"]
+	path = external/wlr-protocols
+	url = https://github.com/swaywm/wlr-protocols.git
+	branch = master
diff --git a/bar/CMakeLists.txt b/bar/CMakeLists.txt
index e57442b..9ee2d33 100644
--- a/bar/CMakeLists.txt
+++ b/bar/CMakeLists.txt
@@ -43,7 +43,7 @@ if (ENABLE_WAYLAND)
 
   wayland_protocol(
     wayland_protos
-    ${PROJECT_SOURCE_DIR}/external/wlroots/protocol/wlr-layer-shell-unstable-v1.xml
+    ${PROJECT_SOURCE_DIR}/external/wlr-protocols/unstable/wlr-layer-shell-unstable-v1.xml
     ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml
     ${WAYLAND_PROTOCOLS}/unstable/xdg-output/xdg-output-unstable-v1.xml
     )
diff --git a/external/wlr-protocols b/external/wlr-protocols
new file mode 160000
index 0000000..4ff1cda
--- /dev/null
+++ b/external/wlr-protocols
@@ -0,0 +1 @@
+Subproject commit 4ff1cda832e46fa4c433bbfebb8179f095e60150
diff --git a/external/wlroots b/external/wlroots
deleted file mode 160000
index 59d1b67..0000000
--- a/external/wlroots
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 59d1b6790dd187c2e110e98a2fa17c1fbfee40ca