From 711b20658dc3f1b893bcbaf5026b7e3a1917a195 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Sun, 6 Aug 2023 07:52:41 +0200
Subject: [PATCH] sway: adjust after contrib scripts were outsourced

- add sway-contrib recipe
---
 .../sway-contrib/sway-contrib_git.bb          | 22 +++++++++++++++++++
 recipes-wlroots/sway/sway_git.bb              | 12 +++-------
 2 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 recipes-support/sway-contrib/sway-contrib_git.bb

diff --git a/recipes-support/sway-contrib/sway-contrib_git.bb b/recipes-support/sway-contrib/sway-contrib_git.bb
new file mode 100644
index 0000000..833a39a
--- /dev/null
+++ b/recipes-support/sway-contrib/sway-contrib_git.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Sway Contribution Scripts"
+HOMEPAGE = "https:/github.com/OctopusET/sway-contrib"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1640a047991fe3cbc70d68830888e863"
+
+SRC_URI = "git://github.com/OctopusET/sway-contrib.git;protocol=https;branch=master"
+
+S = "${WORKDIR}/git"
+SRCREV = "7e138bfc112872b79ac9fd766bc57c0f125b96d4"
+
+RDEPENDS:${PN} = "python3"
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 755 ${S}/grimshot ${D}${bindir}
+	install -m 755 ${S}/autoname-workspaces.py ${D}${bindir}
+	install -m 755 ${S}/inactive-windows-transparency.py ${D}${bindir}
+	install -m 755 ${S}/switch-top-level.py ${D}${bindir}
+}
+
+FILES:${PN} = "${bindir}"
diff --git a/recipes-wlroots/sway/sway_git.bb b/recipes-wlroots/sway/sway_git.bb
index e5d178d..d35a795 100644
--- a/recipes-wlroots/sway/sway_git.bb
+++ b/recipes-wlroots/sway/sway_git.bb
@@ -14,7 +14,6 @@ DEPENDS += " \
 	cairo \
 	libevdev \
 	json-c \
-	libdisplay-info \
 	libdrm \
 	libinput \
 	libxkbcommon \
@@ -27,7 +26,7 @@ DEPENDS += " \
 	wayland-protocols \
 "
 
-RDEPENDS:${PN} ?= "swaybg python3 python-i3ipc"
+RDEPENDS:${PN} = "swaybg python3 python-i3ipc"
 
 RRECOMMENDS:${PN} ?= " \
 	foot \
@@ -35,11 +34,12 @@ RRECOMMENDS:${PN} ?= " \
 	grim \
 	slurp \
 	wl-clipboard \
+	sway-contrib \
 "
 
 SRC_URI = "git://github.com/swaywm/sway.git;protocol=https;branch=master"
 
-SRCREV = "eebbecc7801ea520dd5644b08e884fbe27c2eeda"
+SRCREV = "bb91b7f5fa7fddb582b8dddf208cc335d39da9e7"
 PV = "1.9-dev"
 S = "${WORKDIR}/git"
 
@@ -63,12 +63,6 @@ PACKAGECONFIG ?= " \
 
 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} \
 "