From c6d38992e3510a4cc8d843163da4f502a9a7b815 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Tue, 6 Dec 2022 18:47:25 +0100
Subject: [PATCH] sway: update; add recipe for v0.8

---
 recipes-wlroots/sway/sway_0.8-rc2.bb | 76 ++++++++++++++++++++++++++++
 recipes-wlroots/sway/sway_git.bb     |  8 +--
 2 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 recipes-wlroots/sway/sway_0.8-rc2.bb

diff --git a/recipes-wlroots/sway/sway_0.8-rc2.bb b/recipes-wlroots/sway/sway_0.8-rc2.bb
new file mode 100644
index 0000000..16d49de
--- /dev/null
+++ b/recipes-wlroots/sway/sway_0.8-rc2.bb
@@ -0,0 +1,76 @@
+
+SUMMARY = "A Wayland WM"
+HOMEPAGE = "https://github.com/swaywm/sway"
+BUGTRACKER = "https://github.com/swaywm/sway/issues"
+SECTION = "graphics"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=dfc67e5b1fa10ebb4b70eb0c0ca67bea"
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+DEPENDS += " \
+	wlroots \
+	cairo \
+	libevdev \
+	json-c \
+	libdrm \
+	libinput \
+	libxkbcommon \
+	pango \
+	pcre2 \
+	pixman \
+	virtual/libgles2 \
+	wayland \
+	wayland-native \
+	wayland-protocols \
+"
+
+RDEPENDS:${PN} ?= "swaybg python3 python-i3ipc"
+
+RRECOMMENDS:${PN} ?= " \
+	foot \
+	jq \
+	grim \
+	slurp \
+	wl-clipboard \
+"
+
+SRC_URI = "git://github.com/swaywm/sway.git;protocol=https;branch=v1.8"
+
+SRCREV = "fb1cb0aa3ac20e62de9cc49cf4196f5d2715a309"
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig features_check
+
+PACKAGECONFIG[basu] = "-Dsd-bus-provider=basu,,basu"
+PACKAGECONFIG[default-wallpaper] = "-Ddefault-wallpaper=true,-Ddefault-wallpaper=false"
+PACKAGECONFIG[elogind] = "-Dsd-bus-provider=libelogind,,elogind"
+PACKAGECONFIG[gdk-pixbuf] = "-Dgdk-pixbuf=enabled,-Dgdk-pixbuf=disabled,gdk-pixbuf"
+PACKAGECONFIG[swaybar] = "-Dswaybar=true,-Dswaybar=false"
+PACKAGECONFIG[swaynag] = "-Dswaynag=true,-Dswaynag=false"
+PACKAGECONFIG[systemd] = "-Dsd-bus-provider=libsystemd,,systemd"
+PACKAGECONFIG[tray] = "-Dtray=enabled,-Dtray=disabled"
+PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm"
+
+PACKAGECONFIG ?= " \
+	${@bb.utils.filter('DISTRO_FEATURES', 'systemd xwayland', d)} \
+	default-wallpaper \
+	gdk-pixbuf \
+"
+
+# Reproducibility issue. Fix me!
+CFLAGS:append = " -Wno-error=date-time"
+EXTRA_OEMESON += "--buildtype release"
+
+do_install:append() {
+	install -m 755 ${S}/contrib/grimshot ${D}${bindir}
+	install -m 755 ${S}/contrib/autoname-workspaces.py ${D}${bindir}
+	install -m 755 ${S}/contrib/inactive-windows-transparency.py ${D}${bindir}
+}
+
+FILES:${PN}:append = " \
+	${datadir} \
+"
+
+BBCLASSEXTEND = ""
diff --git a/recipes-wlroots/sway/sway_git.bb b/recipes-wlroots/sway/sway_git.bb
index c0b79fd..fb9d25c 100644
--- a/recipes-wlroots/sway/sway_git.bb
+++ b/recipes-wlroots/sway/sway_git.bb
@@ -40,8 +40,8 @@ SRC_URI = " \
 	git://github.com/swaywm/sway.git;protocol=https;branch=master \
 "
 
-SRCREV = "7623292734d6ba48bbfef1c32da28d02118dac38"
-PV = "1.7"
+SRCREV = "e1b268af98edeb09e570e8855ef64f0719cbafe2"
+PV = "1.9-dev"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
@@ -54,10 +54,10 @@ PACKAGECONFIG[swaybar] = "-Dswaybar=true,-Dswaybar=false"
 PACKAGECONFIG[swaynag] = "-Dswaynag=true,-Dswaynag=false"
 PACKAGECONFIG[systemd] = "-Dsd-bus-provider=libsystemd,,systemd"
 PACKAGECONFIG[tray] = "-Dtray=enabled,-Dtray=disabled"
-PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb"
+PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm"
 
 PACKAGECONFIG ?= " \
-	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+	${@bb.utils.filter('DISTRO_FEATURES', 'systemd xwayland', d)} \
 	default-wallpaper \
 	gdk-pixbuf \
 "