From 73dbb5c9005bef5589e11c02d858215a5fc1c04e Mon Sep 17 00:00:00 2001
From: David McKinney <mckinney@subgraph.com>
Date: Sun, 11 Nov 2018 11:37:10 -0500
Subject: [PATCH] Updated Sway recipe to 1.0-beta.1 and wlroots recipe to 0.1.0

---
 .../recipes-sway/sway/sway_1.0-beta.1.bb      | 25 +++++++++++++++++++
 ...g-meson-version-to-match-what-we-use.patch | 22 ++++++++++++++++
 .../recipes-sway/wlroots/wlroots_git.bb       |  8 +++---
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 meta-citadel/recipes-sway/sway/sway_1.0-beta.1.bb
 create mode 100644 meta-citadel/recipes-sway/wlroots/wlroots/0001-Reverting-meson-version-to-match-what-we-use.patch

diff --git a/meta-citadel/recipes-sway/sway/sway_1.0-beta.1.bb b/meta-citadel/recipes-sway/sway/sway_1.0-beta.1.bb
new file mode 100644
index 0000000..911b1dd
--- /dev/null
+++ b/meta-citadel/recipes-sway/sway/sway_1.0-beta.1.bb
@@ -0,0 +1,25 @@
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=dfc67e5b1fa10ebb4b70eb0c0ca67bea"
+
+SRC_URI = "https://github.com/swaywm/sway/archive/${PV}.tar.gz \
+		   file://config \
+		   "
+
+SRC_URI[md5sum] = "680ed07c0ce401af645a99e42ea459be"
+SRC_URI[sha256sum] = "382955b9373219b2be6e2899a9f204383fe7ab9808ee28e56735b431bfbd81e2"
+
+DEPENDS = "dbus cairo pango wlroots libinput libxkbcommon wayland wayland-native libpam libcap json-c libpcre gdk-pixbuf"
+
+inherit meson 
+
+FILES_${PN} += "\
+	${datadir}/wayland-sessions/sway.desktop \
+"
+
+do_install_append() {
+    rm ${D}${sysconfdir}/sway/config
+    install -m 644 ${WORKDIR}/config ${D}${sysconfdir}/sway/config
+}
+
+EXTRA_OEMESON += "-Ddefault-wallpaper=false -Dzsh-completions=false -Dbash-completions=false -Dfish-completions=false" 
+
diff --git a/meta-citadel/recipes-sway/wlroots/wlroots/0001-Reverting-meson-version-to-match-what-we-use.patch b/meta-citadel/recipes-sway/wlroots/wlroots/0001-Reverting-meson-version-to-match-what-we-use.patch
new file mode 100644
index 0000000..6913d8c
--- /dev/null
+++ b/meta-citadel/recipes-sway/wlroots/wlroots/0001-Reverting-meson-version-to-match-what-we-use.patch
@@ -0,0 +1,22 @@
+From f5fe7f06fd90fb4472a55f708d5ed56dbc7312eb Mon Sep 17 00:00:00 2001
+From: David McKinney <mckinney@subgraph>
+Date: Sat, 10 Nov 2018 23:16:24 +0000
+Subject: [PATCH] Reverting meson version to match what we use
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 9517168a..f75c9816 100644
+--- a/meson.build
++++ b/meson.build
+@@ -3,7 +3,7 @@ project(
+ 	'c',
+ 	version: '0.1.0',
+ 	license: 'MIT',
+-	meson_version: '>=0.48.0',
++	meson_version: '>=0.47.1',
+ 	default_options: [
+ 		'c_std=c11',
+ 		'warning_level=2',
diff --git a/meta-citadel/recipes-sway/wlroots/wlroots_git.bb b/meta-citadel/recipes-sway/wlroots/wlroots_git.bb
index cd4b0e6..7412ed1 100644
--- a/meta-citadel/recipes-sway/wlroots/wlroots_git.bb
+++ b/meta-citadel/recipes-sway/wlroots/wlroots_git.bb
@@ -5,13 +5,15 @@ inherit meson pkgconfig
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818"
 
-SRC_URI = "gitsm://github.com/swaywm/wlroots"
-PV = "0.1+git${SRCPV}"
+SRC_URI = "gitsm://github.com/swaywm/wlroots \
+           file://0001-Reverting-meson-version-to-match-what-we-use.patch \
+           "
+PV = "0.1.0+git${SRCPV}"
 PR = "r0"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "2a58d4467f83c5660bbee6733a73cc1ed92ca478"
+SRCREV = "be6210cf8216c08a91e085dac0ec11d0e34fb217"
 
 S = "${WORKDIR}/git"