layer.conf: add langdale

wlroots: libdrm is a hard dependency
foot: ignore warning for clang
2025-07-13 14:34:34 +02:00 · 2022-10-05 13:48:53 +02:00 · 2022-09-29 10:35:19 +02:00 · 2022-09-29 10:32:53 +02:00 · 2022-09-29 10:32:06 +02:00 · 2022-09-25 16:56:43 +02:00
129 changed files with 3083 additions and 737 deletions
--- a/README.md
+++ b/README.md
@ -5,17 +5,17 @@ Main layer maintainer: Markus Volk <f_l_k@t-online.de>
 Description

 This layer adds recipes to build wlroots based compositors under wayland.
-It contains wlroots, sway, wayfire, nwg-shell and some additional recipes that might come useful.
+It contains wlroots, sway, wayfire, cage, phosh, nwg-shell and some additional recipes that might come useful.

 Dependencies

 This layer depends on:

    URI: git://github.com/openembedded/openembedded-core
-        branch: hardknott
+        branch: master
        revision: HEAD
    URI: git://github.com/openembedded/meta-openembedded
-        branch: hardknott
+        branch: master
        revision: HEAD

 Building
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -6,12 +6,11 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"

 BBFILE_COLLECTIONS += "wayland"
 BBFILE_PATTERN_wayland = "^${LAYERDIR}/"
-BBFILE_PRIORITY_wayland = "5"
+BBFILE_PRIORITY_wayland = "8"

-LAYERSERIES_COMPAT_wayland = "hardknott"
+LAYERSERIES_COMPAT_wayland = "kirkstone langdale"

 LAYERDEPENDS_wayland = " \
 	core \
 	openembedded-layer \
 "
-
--- a/recipes-core/basu/basu_git.bb
+++ b/recipes-core/basu/basu_git.bb
@ -1,18 +1,18 @@
 SUMMARY = "The sd-bus library, extracted from systemd."
-HOMEPAGE = "https://github.com/emersion/basu.git"
+HOMEPAGE = "https://sr.ht/~emersion/basu"
 SECTION = "base"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"

-SRC_URI = "git://github.com/emersion/basu.git;protocol=https"
+SRC_URI = "git://git.sr.ht/~emersion/basu;protocol=https;branch=master"

 DEPENDS += "gperf-native libcap"

 S = "${WORKDIR}/git"
 PV = "0.2.0"
-SRCREV = "v${PV}"
+SRCREV = "5fa970e868f25ebc79ccca9b1d9df4c030d97661"

-inherit meson
+inherit meson pkgconfig

 EXTRA_OEMESON += "--buildtype release"

--- a/recipes-core/elogind/elogind_git.bb
+++ b/recipes-core/elogind/elogind_git.bb
@ -2,20 +2,36 @@ SUMMARY = "Elogind User, Seat and Session Manager."
 DESCRIPTION = "Elogind is the systemd project's "logind", extracted out to be a standalone daemon. It integrates with PAM to know the set of users that are logged in to a system and whether they are logged in graphically, on the console, or remotely."
 HOMEPAGE = "https://github.com/elogind"
 SECTION = "base/shell"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"

-SRC_URI = "git://github.com/elogind/elogind.git;protocol=https;branch=v246-stable"
+SRC_URI = "git://github.com/elogind/elogind.git;protocol=https;nobranch=1"
+
+DEPENDS += " \
+	acl dbus \
+	eudev \
+	gperf-native \
+	libcap \
+	libpam \
+	polkit \
+	python3-jinja2-native \
+	python3-native \
+	util-linux \
+"

-DEPENDS += "gperf-native libcap eudev"

 S = "${WORKDIR}/git"
-PV = "246.10"
-SRCREV = "${PV}"
+PV = "249-pre"
+SRCREV = "06e702c9dafa3ea1dd6df8ee8cb4dcf417a0d442"

-inherit meson
+inherit meson pkgconfig

-EXTRA_OEMESON += "--buildtype release"
+EXTRA_OEMESON += "--buildtype release -Dtranslations=false"

-FILES_${PN} += "/usr"
+do_install:prepend() {
+	install -d ${D}${libdir}/elogind/system-shutdown
+	install -d ${D}${libdir}/elogind/system-sleep
+}
+
+FILES:${PN} += "/usr"

--- a/recipes-core/seatd/seatd_git.bb
+++ b/recipes-core/seatd/seatd_git.bb
@ -1,32 +0,0 @@
-SUMMARY = "A minimal seat management daemon, and a universal seat management library."
-DESCRIPTION = "Seat management takes care of mediating access to shared devices (graphics, input), without requiring the applications needing access to be root."
-AUTHOR = "kennylevinsen"
-HOMEPAGE = "https://git.sr.ht/~kennylevinsen/seatd"
-SECTION = "libs"
-LICENSE = "BSD-0-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
-
-SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https"
-
-PACKAGECONFIG[systemd] = ",,systemd"
-PACKAGECONFIG[sysvinit] = ",,elogind"
-
-# On systems without logind/elogind, you need to use libseat-builtin.
-# You have to suid the sway binary. Sway will drop root permissions shortly after startup.
-PACKAGECONFIG[libseat-builtin] = "-Dlibseat-builtin=enabled -Dlibseat-logind=disabled,-Dlibseat-builtin=disabled"
-
-PACKAGECONFIG[man-pages] = ",,scdoc-native"
-
-PACKAGECONFIG ?= " \
-	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
-	${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)} \
-"
-
-S = "${WORKDIR}/git"
-PV = "0.5.0+${SRCREV}"
-SRCREV = "2204db5531ed16bf32f969645e7177f6118f8a8e"
-
-inherit meson
-
-EXTRA_OEMESON += "--buildtype release"
-
--- a/recipes-devtools/cxxopts/cxxopts_git.bb
+++ b/recipes-devtools/cxxopts/cxxopts_git.bb
@ -0,0 +1,14 @@
+SUMMARY = "This is a lightweight C++ option parser library, supporting the standard GNU style syntax for options."
+HOMEPAGE = "https://github.com/jarro2783/cxxopts"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8de00431559a76a1b43f6fd44f8f6689"
+
+SRC_URI = "git://github.com/jarro2783/cxxopts.git;protocol=https;branch=master"
+
+S = "${WORKDIR}/git"
+PV = "3.0.0"
+SRCREV = "c74846a891b3cc3bfa992d588b1295f528d43039"
+
+inherit cmake
+
+	
--- a/recipes-devtools/python/python-brotli_git.bb
+++ b/recipes-devtools/python/python-brotli_git.bb
@ -0,0 +1,18 @@
+SUMMARY = "Python Module for the Brotli compression algorithm."
+HOMEPAGE = "https://github.com/google/brotli/" 
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=941ee9cd1609382f946352712a319b4b" 
+
+inherit cmake setuptools3
+
+SRC_URI = " \
+    git://github.com/google/brotli.git;protocol=https;branch=master \
+"
+
+PV = "1.0.9"
+SRCREV = "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release"
+
--- a/recipes-devtools/python/python-i3ipc_git.bb
+++ b/recipes-devtools/python/python-i3ipc_git.bb
@ -2,18 +2,13 @@ SUMMARY = "An improved Python library to control i3wm and sway."
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3961efb54421653518521529853444c4"

-SRC_URI = " \
-	git://github.com/altdesktop/i3ipc-python.git;protocol=https \
-"
-
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
 	python3 \
 	python-xlib \
 "

-inherit setuptools3
+inherit setuptools3 pypi

-S = "${WORKDIR}/git"
 PV = "2.2.1"
-SRCREV = "v${PV}"

+SRC_URI[sha256sum] = "e880d7d7147959ead5cb34764f08b97b41385b36eb8256e8af1ce163dbcccce8"
--- a/recipes-devtools/python/python-xlib_git.bb
+++ b/recipes-devtools/python/python-xlib_git.bb
@ -1,17 +1,18 @@
 SUMMARY = "The Python X Library."
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"

 SRC_URI = " \
-	git://github.com/python-xlib/python-xlib.git;protocol=https \
+	git://github.com/python-xlib/python-xlib.git;protocol=https;branch=master \
 "

 DEPENDS = " \
 	python3-wheel-native \
-	python3-pip-native \
+	python3-setuptools-scm-native \
 "

-RDEPENDS_${PN} = " \
+
+RDEPENDS:${PN} = " \
 	python3 \	
 	python3-six \
 "
@ -20,5 +21,5 @@ inherit setuptools3

 S = "${WORKDIR}/git"
 PV = "0.31"
-SRCREV = "${PV}"
+SRCREV = "a734526ed33fe446396e32649e8895dde679f52c"

--- a/recipes-devtools/python/python3-colorthief_git.bb
+++ b/recipes-devtools/python/python3-colorthief_git.bb
@ -0,0 +1,16 @@
+SUMMARY = "This tool creates a palette of up to 36 colours out of a jpg or png image."
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a6cb8301ba6bf08f7e489fbd9061cb78"
+
+SRC_URI = " \
+	git://github.com/fengsp/color-thief-py.git;protocol=https;branch=master \
+"
+
+RDEPENDS:${PN} = "python3-pillow"
+
+inherit setuptools3
+
+S = "${WORKDIR}/git"
+PV = "0.2.1"
+SRCREV = "3e96a52abfa34323c798a691b2970c6df3059fda"
+
--- a/recipes-devtools/python/python3-geopy_git.bb
+++ b/recipes-devtools/python/python3-geopy_git.bb
@ -0,0 +1,18 @@
+SUMMARY = "geopy is a Python client for several popular geocoding web services."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b246754361f75980923b7feebfe71c15"
+
+SRC_URI = " \
+	git://github.com/geopy/geopy.git;protocol=https;branch=master \
+"
+
+RDEPENDS:${PN} = " \
+	python3 \
+"
+
+inherit setuptools3
+
+S = "${WORKDIR}/git"
+PV = "2.2.0"
+SRCREV = "ade9c1b68c83a1fc76d90bc0ff603f6b34dfbbbf"
+
--- a/recipes-devtools/python/python3_%.bbappend
+++ b/recipes-devtools/python/python3_%.bbappend
@ -0,0 +1,6 @@
+do_install:append:class-target() {
+	ln -sf ${bindir}/python3 ${D}${bindir}/python
+}
+
+FILES:${PN}:class-target += "${bindir}/python"
+
--- a/recipes-extended/autotiling/autotiling-rs_git.bb
+++ b/recipes-extended/autotiling/autotiling-rs_git.bb
@ -0,0 +1,41 @@
+SUMMARY = "This automatically alternates the container layout between horizontal and vertical for successive new containers."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8c9e7f297308461c48038d7c1e05cfb8"
+
+SRC_URI = " \
+	git://github.com/ammgws/autotiling-rs.git;protocol=https;branch=master \
+	crate://crates.io/autocfg/1.1.0 \
+	crate://crates.io/bitflags/1.3.2 \
+	crate://crates.io/clap/3.1.2 \
+	crate://crates.io/clap_derive/3.1.2 \
+	crate://crates.io/hashbrown/0.11.2 \
+	crate://crates.io/heck/0.4.0 \
+	crate://crates.io/indexmap/1.8.0 \
+	crate://crates.io/itoa/1.0.1 \
+	crate://crates.io/lazy_static/1.4.0 \
+	crate://crates.io/memchr/2.4.1 \
+	crate://crates.io/os_str_bytes/6.0.0 \
+	crate://crates.io/proc-macro-error-attr/1.0.4 \
+	crate://crates.io/proc-macro-error/1.0.4 \
+	crate://crates.io/proc-macro2/1.0.36 \
+	crate://crates.io/quote/1.0.15 \
+	crate://crates.io/ryu/1.0.9 \
+	crate://crates.io/serde/1.0.136 \
+	crate://crates.io/serde_derive/1.0.136 \
+	crate://crates.io/serde_json/1.0.79 \
+	crate://crates.io/swayipc-types/1.0.1 \
+	crate://crates.io/swayipc/3.0.0 \
+	crate://crates.io/syn/1.0.86 \
+	crate://crates.io/textwrap/0.14.2 \
+	crate://crates.io/thiserror-impl/1.0.30 \
+	crate://crates.io/thiserror/1.0.30 \
+	crate://crates.io/unicode-xid/0.2.2 \
+	crate://crates.io/version_check/0.9.4 \
+"
+
+inherit rust cargo
+
+S = "${WORKDIR}/git"
+PV = "0.1.3"
+SRCREV = "1f7a08c6a87b06f13744962f757e6bdcc6e3fc89"
+
--- a/recipes-extended/autotiling/autotiling_git.bb
+++ b/recipes-extended/autotiling/autotiling_git.bb
@ -3,16 +3,16 @@ LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"

 SRC_URI = " \
-	git://github.com/nwg-piotr/autotiling.git;protocol=https \
+	git://github.com/nwg-piotr/autotiling.git;protocol=https;branch=master \
 "

 DEPENDS = "python3-wheel-native"

-RDEPENDS_${PN} = "python-i3ipc"
+RDEPENDS:${PN} = "python-i3ipc"

 inherit setuptools3

 S = "${WORKDIR}/git"
-PV = "1.5"
-SRCREV = "v${PV}"
+PV = "1.6.1"
+SRCREV = "0149553d7aeb26b22b0ca3c63c18d9683ac87332"

--- a/recipes-extended/callaudiod/callaudiod_git.bb
+++ b/recipes-extended/callaudiod/callaudiod_git.bb
@ -0,0 +1,20 @@
+SUMMARY = "callaudiod is a daemon for dealing with audio routing during phone calls."
+HOMEPAGE = "https://gitlab.com/mobian1/callaudiod"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+DEPENDS = "glib-2.0 alsa-lib pulseaudio"
+RDEPENDS:${PN} += "pulseaudio-server"
+
+inherit meson pkgconfig
+
+SRC_URI = " \
+    git://gitlab.com/mobian1/callaudiod.git;protocol=https;branch=master \
+"
+
+S = "${WORKDIR}/git"
+PV = "0.1.4"
+SRCREV = "a7ca6ce9d4c947f19c3f99ff2cab986c64434e57"
+
+FILES:${PN} += "${datadir}"
+
--- a/recipes-extended/date/date_git.bb
+++ b/recipes-extended/date/date_git.bb
@ -6,13 +6,13 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b5d973344b3c7bbf7535f0e6e002d017"

 SRC_URI = " \
-	git://github.com/HowardHinnant/date.git;protocol=https \
-	file://date.pc \	
+	git://github.com/HowardHinnant/date.git;protocol=https;branch=master \
+	file://pkgconfig.patch \
 "

 S = "${WORKDIR}/git"
 PV = "3.0.1"
-SRCREV = "v${PV}"
+SRCREV = "6e921e1b1d21e84a5c82416ba7ecd98e33a436d0"

 inherit cmake

@ -23,10 +23,4 @@ EXTRA_OECMAKE += " \
 	-DBUILD_SHARED_LIBS=ON \
 	-DUSE_SYSTEM_TZ_DB=ON \
 "
-
-do_install_append() {
-	# source lacks pkgconfig support. Include a pc file, so 'date' can be found using pkgconfig
-	install -d ${D}${libdir}/pkgconfig
-	install -m 0644 ${WORKDIR}/date.pc ${D}${libdir}/pkgconfig
-}
 	
--- a/recipes-extended/date/files/date.pc
+++ b/recipes-extended/date/files/date.pc
@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: date
-Description: date library
-Version: 3.0.0
-Cflags: -I${includedir}/date
-Libs: -L${libdir} -ldate-tz -lpthread
--- a/recipes-extended/date/files/pkgconfig.patch
+++ b/recipes-extended/date/files/pkgconfig.patch
@ -0,0 +1,61 @@
+From e56b2dce7e89a92e1b9b35caa13b3e938c4cedea Mon Sep 17 00:00:00 2001
+From: Cole Mickens <cole.mickens@gmail.com>
+Date: Sun, 26 Jan 2020 01:27:08 -0800
+Subject: [PATCH] CMakeLists.txt: output date.pc for pkg-config
+
+---
+ CMakeLists.txt | 15 +++++++++++++++
+ date.pc.in     | 10 ++++++++++
+ 2 files changed, 25 insertions(+)
+ create mode 100644 date.pc.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f30c473..fe778e8 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -128,6 +128,15 @@ if( BUILD_TZ_LIB )
+     endif( )
+ endif( )
+ 
+if ( BUILD_TZ_LIB )
+  # Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@
+  set( TZ_COMPILE_DEFINITIONS "$<IF:$<TARGET_EXISTS:date-tz>,-D$<JOIN:$<TARGET_PROPERTY:date-tz,INTERFACE_COMPILE_DEFINITIONS>, -D>,>" )
+  configure_file(date.pc.in date.pc.cf @ONLY)
+  file( GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc"
+    INPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc.cf" )
+
+endif( )
+
+ #[===================================================================[
+    installation
+ #]===================================================================]
+@@ -171,6 +180,12 @@ install (
+   FILES cmake/dateConfig.cmake "${version_config}"
+   DESTINATION ${CONFIG_LOC})
+ 
+if ( BUILD_TZ_LIB )
+  install(
+    FILES ${CMAKE_BINARY_DIR}/date.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+endif( )
+
+ #[===================================================================[
+    testing
+ #]===================================================================]
+diff --git a/date.pc.in b/date.pc.in
+new file mode 100644
+index 0000000..b9c4623
+--- /dev/null
+++ b/date.pc.in
+@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_BINDIR@
+libdir=@CMAKE_INSTALL_LIB@
+includedir=@CMAKE_INSTALL_INCLUDE@
+
+Name: date
+Description: A date and time library based on the C++11/14/17 <chrono> header
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -ldate-tz
+Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@
+
--- a/recipes-extended/ddcutil/ddcutil_git.bb
+++ b/recipes-extended/ddcutil/ddcutil_git.bb
@ -0,0 +1,32 @@
+SUMMARY = "ddcutil is a Linux program for querying and changing monitor settings, such as brightness and color levels."
+HOMEPAGE = "https://github.com/rockowitz/ddcutil"
+SECTION = "libs"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRC_URI = "git://github.com/rockowitz/ddcutil.git;protocol=https;branch=master"
+
+DEPENDS = "i2c-tools glib-2.0 kmod"
+
+S = "${WORKDIR}/git"
+PV = "1.2.2"
+SRCREV = "5080161b456cc6a1fd3e6db3dc537e1dcd1c809b"
+
+inherit autotools pkgconfig gobject-introspection
+
+CFLAGS += "-Wno-unused-but-set-variable"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'drm x11 systemd', d)}"
+
+PACKAGECONFIG[drm] = "--enable-drm=yes,--enable-drm=no,libdrm"
+PACKAGECONFIG[systemd] = "--enable-udev=yes,--enable-udev=no,udev"
+PACKAGECONFIG[usb] = "--enable-usb=yes,--enable-usb=no,libusb1"
+PACKAGECONFIG[x11] = "--enable-x11=yes,--enable-x11=no,libx11 xrandr"
+
+do_install:append () {
+	install -d ${D}${sysconfdir}/udev/rules.d
+	cp -rf ${D}${datadir}/ddcutil/data/* ${D}${sysconfdir}/udev/rules.d
+}
+
+FILES:${PN} += "${sysconfdir}"
+
--- a/recipes-extended/fcft/fcft/0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch
+++ b/recipes-extended/fcft/fcft/0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch
@ -0,0 +1,47 @@
+From c0c7a5df0b520960d7af662d112704901a235548 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 19 Apr 2022 13:50:54 +0200
+Subject: [PATCH] generate-version.sh: dont try to fetch version from git
+
+workaround for:
+
+| FAILED: version.h
+| /home/flk/build/poky/build-intel/tmp/hosttools/env LC_ALL=C ../git/generate-version.sh 3.0.1 ../git/ version.h
+| fatal: unsafe repository ('/home/flk/build/poky/build-intel/tmp/work/corei7-64-poky-linux/fcft/3.0.1-r0/git' is owned by someone else)
+---
+ generate-version.sh | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
+diff --git a/generate-version.sh b/generate-version.sh
+index 3337d5c..76a6df9 100755
+--- a/generate-version.sh
+++ b/generate-version.sh
+@@ -10,24 +10,7 @@ out_file=${3}
+ # echo "source directory: ${src_dir}"
+ # echo "output file:      ${out_file}"
+ 
+-if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then
+-    workdir=$(pwd)
+-    cd "${src_dir}"
+-
+-    if git describe --tags  > /dev/null 2>&1; then
+-        git_version=$(git describe --always --tags)
+-    else
+-        # No tags available, happens in e.g. CI builds
+-        git_version="${default_version}"
+-    fi
+-
+-    git_branch=$(git rev-parse --abbrev-ref HEAD)
+-    cd "${workdir}"
+-
+-    new_version="${git_version} ($(env LC_TIME=C date "+%b %d %Y"), branch '${git_branch}')"
+-else
+-    new_version="${default_version}"
+-fi
+new_version="${default_version}"
+ 
+ new_version="#define FCFT_VERSION \"${new_version}\""
+ 
+-- 
+2.25.1
+
--- a/recipes-extended/fcft/fcft_git.bb
+++ b/recipes-extended/fcft/fcft_git.bb
@ -12,18 +12,27 @@ DEPENDS = " \
 	harfbuzz \
 	pixman \
 	tllist \
-	scdoc-native \
 "

 SRC_URI = " \
-	git://codeberg.org/dnkl/fcft.git;protocol=https \
+	git://codeberg.org/dnkl/fcft.git;protocol=https;branch=releases/3.1 \
+	file://0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch \
 "

 S = "${WORKDIR}/git"
-PV = "2.4.3"
-SRCREV = "${PV}"
+PV = "3.1.3"
+SRCREV = "fbc8df3875dbb26a665d02b710690e13a5f4eb45"

 inherit meson pkgconfig

+PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,scdoc-native"
+PACKAGECONFIG[grapheme-shaping] = "-Dgrapheme-shaping=enabled,-Dgrapheme-shaping=disabled,utf8proc"
+PACKAGECONFIG[run-shaping] = "-Drun-shaping=enabled,-Drun-shaping=disabled,utf8proc"
+
+PACKAGECONFIG ?= " \
+	grapheme-shaping \
+	run-shaping \
+"
+
 BBCLASSEXTEND = ""

--- a/recipes-extended/feedbackd/feedbackd_git.bb
+++ b/recipes-extended/feedbackd/feedbackd_git.bb
@ -0,0 +1,30 @@
+SUMMARY = "A daemon to provide haptic, led and audio feedback triggered by application events."
+HOMEPAGE = "https://source.puri.sm/Librem5/feedbackd"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+
+DEPENDS = " \
+    gsound \
+    libgudev \
+    glib-2.0 \
+    json-glib \
+"
+
+GIR_MESON_OPTION = ""
+
+inherit meson pkgconfig features_check gobject-introspection vala
+
+SRC_URI = " \
+    git://source.puri.sm/Librem5/feedbackd.git;protocol=https;branch=master \
+"
+
+S = "${WORKDIR}/git"
+PV = "0.0.0+git20220208"
+SRCREV = "74b178a363f1e0e4b84309f2a1b1c1c41bf97248"
+
+EXTRA_OEMESON += "-Dtests=false"
+
+FILES:${PN} += "${datadir}"
+
--- a/recipes-extended/font-awesome/font-awesome-otf_git.bb
+++ b/recipes-extended/font-awesome/font-awesome-otf_git.bb
@ -3,16 +3,16 @@ SUMMARY = "Font Awesome"
 HOMEPAGE = "https://fontawesome.com/"
 SECTION = "base/fonts"

-LICENSE = "OFL-1.1"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2e3494502db283e8891d4886fe445912"
+LICENSE = "CC-BY-4.0 & OFL-1.1"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=57f9201afe70f877988912a7b233de47"

 SRC_URI = " \
-	git://github.com/FortAwesome/Font-Awesome.git;protocol=https \
+	git://github.com/FortAwesome/Font-Awesome.git;protocol=https;branch=6.x \
 "

 S = "${WORKDIR}/git"
-PV = "5.15.3"
-SRCREV = "${PV}"
+PV = "6.1.1"
+SRCREV = "28e297f07af26f148c15e6cbbd12cea3027371d3"


 do_install () {
@ -22,7 +22,7 @@ do_install () {
 	done
 }

-FILES_${PN} = " \
+FILES:${PN} = " \
 	${datadir}/fonts \
 "

--- a/recipes-extended/gom/gom_0.4.bb
+++ b/recipes-extended/gom/gom_0.4.bb
@ -0,0 +1,16 @@
+SUMMARY = "libgom - GObject Data Mapper."
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+DEPENDS = "sqlite3 glib-2.0 gdk-pixbuf python3-pygobject-native"
+
+inherit gnomebase pkgconfig gobject-introspection
+GIR_MESON_OPTION = ""
+
+SRC_URI = "https://download.gnome.org/sources/gom/${PV}/gom-${PV}.tar.xz;name=archive"
+SRC_URI[archive.sha256sum] = "68d08006aaa3b58169ce7cf1839498f45686fba8115f09acecb89d77e1018a9d"
+
+FILES:${PN} += "${datadir} ${libdir}"
+
--- a/recipes-extended/highway/highway_git.bb
+++ b/recipes-extended/highway/highway_git.bb
@ -0,0 +1,18 @@
+SUMMARY = "Highway is a C++ library for SIMD (Single Instruction, Multiple Data)"
+HOMEPAGE = "https://github.com/google/highway/" 
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9" 
+
+inherit cmake
+
+SRC_URI = " \
+    git://github.com/google/highway.git;protocol=https;branch=master \
+"
+
+PV = "0.17.0"
+SRCREV = "0eaa3bb101f2f12edad58ad91846adb62a03fcb8"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release"
+CXXFLAGS:append:arm = " -mfp16-format=ieee"
--- a/recipes-extended/inih/inih_git.bb
+++ b/recipes-extended/inih/inih_git.bb
@ -6,13 +6,12 @@ LICENSE = "BSD-3-Clause"

 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7a95d2af90376e85a05318794e6f202"

-SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https"
+SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master"

 S = "${WORKDIR}/git"
-PV = "53"
-SRCREV = "r${PV}"
+PV = "55"
+SRCREV = "f7f69c6cff2681d84bae371130b4a018cb2171e6"

 inherit meson pkgconfig

 BBCLASSEXTEND = ""
-
--- a/recipes-extended/jq/jq_git.bb
+++ b/recipes-extended/jq/jq_git.bb
@ -1,21 +0,0 @@
-  
-SUMMARY = "jq is a lightweight and flexible command-line JSON processor."
-HOMEPAGE = "https://github.com/stedolan/jq"
-BUGTRACKER = "https://github.com/stedolan/jq/issues"
-SECTION = "dev"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d"
-
-SRC_URI = " \
-	git://github.com/stedolan/jq;protocol=https;nobranch=1 \
-"
-
-S = "${WORKDIR}/git"
-PV = "1.6"
-SRCREV = "jq-${PV}"
-
-inherit autotools
-
-do_configure_prepend() {
-	autoreconf -f
-}
--- a/recipes-extended/libvarlink/libvarlink_git.bb
+++ b/recipes-extended/libvarlink/libvarlink_git.bb
@ -0,0 +1,22 @@
+SUMMARY = "varlink is an interface description format and protocol accessible to both humans and machines."
+HOMEPAGE = "https://varlink.org"
+LICENSE = "Apache-2.0 & BSD-3-Clause"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1"
+
+SRC_URI = " \
+	git://github.com/varlink/libvarlink.git;protocol=https;branch=master \
+"
+
+inherit meson
+
+S = "${WORKDIR}/git"
+PV = "23"
+SRCREV = "d377218338b706ce3ff517a80fc0f1b1cfd8fe80"
+
+EXTRA_OEMESON += "--buildtype release"
+
+FILES:${PN} += "${datadir}"
+
+BBCLASSEXTEND = ""
+
--- a/recipes-extended/light/light_git.bb
+++ b/recipes-extended/light/light_git.bb
@ -5,12 +5,12 @@ LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

 SRC_URI = " \
-	git://github.com/haikarainen/light.git \
+	git://github.com/haikarainen/light.git;protocol=https;branch=master \
 "

 S = "${WORKDIR}/git"
 PV = "1.2.2"
-SRCREV = "v${PV}"
+SRCREV = "9faa9ae075f9e857aecb3eee8a028fc93108f1c2"

 CFLAGS += " -fcommon"

--- a/recipes-extended/pamixer/pamixer_git.bb
+++ b/recipes-extended/pamixer/pamixer_git.bb
@ -0,0 +1,17 @@
+SUMMARY = "Pulseaudio command line mixer."
+HOMEPAGE = "https://github.com/cdemoulins/pamixer"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = " \
+	git://github.com/cdemoulins/pamixer.git;protocol=https;nobranch=1 \
+"
+
+DEPENDS = "pulseaudio cxxopts"
+
+S = "${WORKDIR}/git"
+PV = "1.6"
+SRCREV = "af5e13eafdb00ba342625d7d2131bec4729d2bc3"
+
+inherit meson pkgconfig
+	
--- a/recipes-extended/scdoc/scdoc_git.bb
+++ b/recipes-extended/scdoc/scdoc_git.bb
@ -6,17 +6,17 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d"

 SRC_URI = " \
-	git://github.com/ddevault/scdoc.git;protocol=https \
+	git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \
 "

 DEPENDS = "scdoc-native"

 S = "${WORKDIR}/git"
-PV = "1.11.0"
-SRCREV = "${PV}"
+PV = "1.11.2"
+SRCREV = "4af1e1e3a8ebfddcc11a189254d60fc4ad74cd59"

-EXTRA_OEMAKE_class-native = "PREFIX=${prefix}"
-EXTRA_OEMAKE_class-target = "PREFIX=${prefix} HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc"
+EXTRA_OEMAKE:class-native = "PREFIX=${prefix}"
+EXTRA_OEMAKE:class-target = "PREFIX=${prefix} HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc"

 inherit autotools-brokensep
 	
--- a/recipes-extended/sofia-sip/sofia-sip_git
+++ b/recipes-extended/sofia-sip/sofia-sip_git
@ -0,0 +1,19 @@
+DESCRIPTION = "RFC3261 compliant SIP User-Agent library."
+HOMEPAGE = "https://github.com/freeswitch/sofia-sip"
+SECTION = "libs"
+
+DEPENDS = "glib-2.0 dbus-glib openssl"
+
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=03068f550c635f6520e0f0252da412fc"
+
+S = "${WORKDIR}/git"
+SRCREV = "756ab9b5c9370423489e0d6a27166863c7a57fef"
+PV = "1.13.8"
+
+SRC_URI = "git://github.com/freeswitch/sofia-sip.git;protocol=https;branch=master"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF += "--with-glib"
+
--- a/recipes-extended/tllist/tllist_git.bb
+++ b/recipes-extended/tllist/tllist_git.bb
@ -7,12 +7,12 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3a7351a597a91e763901f7c76f21e798"

 SRC_URI = " \
-	git://codeberg.org/dnkl/tllist.git;protocol=https \
+	git://codeberg.org/dnkl/tllist.git;protocol=https;branch=master \
 "

 S = "${WORKDIR}/git"
-PV = "1.0.5"
-SRCREV = "${PV}"
+PV = "1.1.0"
+SRCREV = "8dcb0725c73eee9e350f41a921faf0bcd2ab9920"

 inherit meson pkgconfig

--- a/recipes-extended/utf8proc/utf8proc_git.bb
+++ b/recipes-extended/utf8proc/utf8proc_git.bb
@ -3,15 +3,15 @@ HOMEPAGE = "https://github.com/JuliaStrings/utf8proc"
 BUGTRACKER = "https://github.com/JuliaStrings/utf8proc/issues"
 SECTION = "base/shell"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=97fe1c51de5d175e7564531e7955381d"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=96d5a3ba306e0f24fb289427af484408"

 SRC_URI = " \
-	git://github.com/JuliaStrings/utf8proc.git;protocol=https \
+	git://github.com/JuliaStrings/utf8proc.git;protocol=https;branch=master \
 "

 S = "${WORKDIR}/git"
-PV = "2.6.1"
-SRCREV = "v${PV}"
+PV = "2.7.0"
+SRCREV = "8ca6144c85c165987cb1c5d8395c7314e13d4cd7"

 EXTRA_OEMAKE = "prefix=${prefix}"

--- a/recipes-extended/xcur2png/xcur2png_git.bb
+++ b/recipes-extended/xcur2png/xcur2png_git.bb
@ -0,0 +1,15 @@
+DESCRIPTION = "xcur2png is a program which let you take PNG image from X cursor, and generate config-file which is reusable by xcursorgen."
+HOMEPAGE = "https://github.com/eworm-de/xcur2png"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+DEPENDS = "libxcursor libpng"
+
+S = "${WORKDIR}/git"
+SRCREV = "f582d648f37a9ed2de0c8650947487af8a54d3ad"
+PV = "0.7.1"
+
+SRC_URI = "git://github.com/eworm-de/xcur2png.git;protocol=https;branch=master"
+
+inherit autotools pkgconfig
+
--- a/recipes-graphics/aalib/aalib_1.4.0.bb
+++ b/recipes-graphics/aalib/aalib_1.4.0.bb
@ -0,0 +1,18 @@
+DESCRIPTION = "AAlib is a portable library for rendering graphics as ASCII art."
+HOMEPAGE = "http://aa-project.sourceforge.net/aalib/"
+SECTION = "libs"
+
+DEPENDS = "ncurses"
+
+LICENSE = "LGPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+S = "${WORKDIR}/aalib-1.4.0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/projects/aa-project/files/aa-lib/1.4rc5/aalib-1.4rc5.tar.gz"
+SRC_URI[sha256sum] = "fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee"
+
+inherit autotools
+
+CFLAGS:append = " -fPIC "
+
--- a/recipes-graphics/libdecor/libdecor_0.1.0.bb
+++ b/recipes-graphics/libdecor/libdecor_0.1.0.bb
@ -0,0 +1,28 @@
+SUMMARY = "libdecor - A client-side decorations library for Wayland clients"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7ae2be7fb1637141840314b51970a9f7"
+
+SRC_URI = "git://gitlab.gnome.org/jadahl/libdecor.git;protocol=https;branch=master"
+
+DEPENDS = " \
+	cairo \
+	libxkbcommon \
+	pango \
+	wayland \
+	wayland-native \
+	wayland-protocols \
+"
+
+S = "${WORKDIR}/git"
+SRCREV = "3ec3fadd59a21835079fbb3046d2bec6c649d6fa"
+
+PACKAGECONFIG ?= "dbus"
+
+PACKAGECONFIG[dbus] = "-Ddbus=enabled,-Ddbus=disabled,dbus"
+PACKAGECONFIG[demo] = "-Ddemo=true,-Ddemo=false,virtual/libgl"
+
+inherit meson pkgconfig
+
+EXTRA_OEMESON += "--buildtype release"
+
+BBCLASSEXTEND = "native nativesdk"
--- a/recipes-graphics/libjxl/libjxl_git.bb
+++ b/recipes-graphics/libjxl/libjxl_git.bb
@ -0,0 +1,37 @@
+SUMMARY = "Reference implementation of JPEG XL (encoder and decoder)"
+HOMEPAGE = "https://github.com/libjxl/libjxl/" 
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6a905a337cc228a1f68f0b5416f52a7f" 
+
+inherit cmake pkgconfig
+
+DEPENDS = "highway brotli"
+
+SRC_URI = " \
+    gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1 \
+"
+
+PV = "0.6.1"
+SRCREV = "ae95f451e0d23a209fa22efac4771969a23dac99"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = " \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DJPEGXL_ENABLE_PLUGINS=OFF \
+	-DBUILD_TESTING=OFF \
+	-DJPEGXL_WARNINGS_AS_ERRORS=OFF \
+	-DJPEGXL_ENABLE_SJPEG=OFF \
+	-DJPEGXL_ENABLE_BENCHMARK=OFF \
+	-DJPEGXL_ENABLE_EXAMPLES=OFF \
+	-DJPEGXL_ENABLE_MANPAGES=OFF \
+	-DJPEGXL_ENABLE_SKCMS=ON \
+	-DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
+	-DJPEGXL_FORCE_SYSTEM_HWY=ON \
+	-DJPEGXL_ENABLE_JNI=OFF \
+	-DJPEGXL_ENABLE_TCMALLOC=OFF \
+	-DJPEGXL_ENABLE_TOOLS=OFF \
+"
+
+CXXFLAGS:append:arm = " -mfp16-format=ieee"
+ 
--- a/recipes-graphics/mpvpaper/mpvpaper_git.bb
+++ b/recipes-graphics/mpvpaper/mpvpaper_git.bb
@ -0,0 +1,21 @@
+SUMMARY = "MPVPaper allows you to play videos with mpv as your wallpaper."
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+SRC_URI = "git://github.com/GhostNaN/mpvpaper.git;protocol=https;branch=master"
+
+DEPENDS = " \
+	mpv \
+	virtual/egl \
+	wayland \
+	wayland-native \
+	wayland-protocols \
+"
+
+S = "${WORKDIR}/git"
+SRCREV = "666f4c9a8fdc7e921073366fc939c335318f723f"
+PV = "1.2.1"
+
+inherit meson pkgconfig
+
+EXTRA_OEMESON += "--buildtype release"
--- a/recipes-graphics/wayland/wayland-protocols_%.bbappend
+++ b/recipes-graphics/wayland/wayland-protocols_%.bbappend
@ -1,5 +0,0 @@
-PV = "1.21"
-
-SRC_URI[md5sum] = "8196416baac07cd833bcb86b69da41a7"
-SRC_URI[sha256sum] = "b99945842d8be18817c26ee77dafa157883af89268e15f4a5a1a1ff3ffa4cde5"
-
--- a/recipes-graphics/wayland/waylandpp_0.2.8.bb
+++ b/recipes-graphics/wayland/waylandpp_0.2.8.bb
@ -1,53 +0,0 @@
-SUMMARY = " C++ binding for Wayland using the most modern C++ technology"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7f6b13e4480850c59e176edd427d996e"
-
-SRC_URI = "git://github.com/NilsBrause/waylandpp.git;tag=${PV}"
-
-DEPENDS_append_class-native = " pugixml-native"
-DEPENDS_append_class-target = " waylandpp-native wayland virtual/egl"
-
-S = "${WORKDIR}/git"
-PV = "0.2.8"
-
-inherit cmake
-
-
-EXTRA_OECMAKE_append_class-native = " \
-    -DBUILD_SCANNER=ON \
-    -DBUILD_LIBRARIES=OFF \
-    -DBUILD_DOCUMENTATION=OFF \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-    "
-
-EXTRA_OECMAKE_append_class-target = " \
-    -DBUILD_SCANNER=OFF \
-    -DBUILD_LIBRARIES=ON \
-    -DBUILD_DOCUMENTATION=OFF \
-    -DBUILD_EXAMPLES=OFF \
-    -DOPENGL_LIBRARY="-lEGL -lGLESv2" \
-    -DOPENGL_opengl_LIBRARY=-lEGL \
-    -DOPENGL_glx_LIBRARY=-lEGL \
-    -DWAYLAND_SCANNERPP="${STAGING_BINDIR_NATIVE}/wayland-scanner++" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-    -DCMAKE_EXE_LINKER_FLAGS="-Wl,--enable-new-dtags" \
-    "
-
-FILES_${PN} = " \
-    ${libdir}/libwayland*.so* \
-    "
-
-FILES_${PN}-dev  = " \
-    ${includedir}/* \
-    ${libdir}/pkgconfig/* \
-    ${libdir}/cmake/waylandpp/* \
-    ${datadir}/waylandpp/protocols/* \
-    "
-
-FILES_SOLIBSDEV = ""
-INSANE_SKIP_${PN} += "dev-so"
-
-BBCLASSEXTEND += "native nativesdk"
-
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-xwayland-Add-a-pkg-config-file-for-Xwayland.patch
+++ b/recipes-graphics/xorg-xserver/xserver-xorg/0001-xwayland-Add-a-pkg-config-file-for-Xwayland.patch
@ -1,179 +0,0 @@
-From dffc5939a0e77eae7a183c7790dc1209881c09aa Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 20 Apr 2020 11:29:16 +0200
-Subject: [PATCH] xwayland: Add a pkg-config file for Xwayland
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Xwayland is usually spawned by the Wayland compositor which sets the
-command line options.
-
-If a command line option is not supported, Xwayland will fail to start.
-
-That somehow makes the Xwayland command line option sort of ABI, the
-Wayland compositor need to know if a particular option is supported by
-Xwayland at build time.
-
-Also, currently, Xwayland is being installed along with the rest of the
-common executable programs that users may run, which is sub-optimal
-because, well, Xwayland is not a common executable program, it's meant
-to be a proxy between the Wayland compositor and the legacy X11 clients
-which wouldn't be able to run on Wayland otherwise.
-
-Xwayland would be better installed in `libexec` but that directory is
-(purposedly) not in the user `PATH` and therefore the Wayland compositor
-may not be able to find Xwayland in that case.
-
-To solve both problems (which options are supported by Xwayland and
-where to look for it), add a `pkg-config` file specifically for Xwayland
-which gives the full path to Xwayland (`xwayland`) and which options it
-supports (using `pkg-config` variables).
-
-The `pkg-config` file also provides the `Version` so the build scripts
-can check for a particular version if necessary.
-
-Obviously, Wayland compositors are not required to use the `pkg-config`
-file and can continue to use whatever mechanism they deem preferable.
-
-Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
-Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
-
---
- configure.ac               | 12 ++++++++++++
- hw/xwayland/Makefile.am    |  6 +++++-
- hw/xwayland/meson.build    | 15 +++++++++++++++
- hw/xwayland/xwayland.pc.in |  7 +++++++
- meson.build                |  5 +++++
- 5 files changed, 44 insertions(+), 1 deletion(-)
- create mode 100644 hw/xwayland/xwayland.pc.in
-
-diff --git a/configure.ac b/configure.ac
-index a51a0ee..1b73e75 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -591,6 +591,8 @@ AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest], [Build Xnest serv
- AC_ARG_ENABLE(xquartz,        AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
- AC_ARG_ENABLE(xwayland,       AS_HELP_STRING([--enable-xwayland], [Build Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto])
- AC_ARG_ENABLE(xwayland-eglstream, AS_HELP_STRING([--enable-xwayland-eglstream], [Build Xwayland eglstream support (default: no)]), [XWAYLAND_EGLSTREAM=$enableval], [XWAYLAND_EGLSTREAM=no])
-+AC_ARG_WITH(xwayland-path, AS_HELP_STRING([--with-xwayland-path=PATH], [Directory containing Xwayland executable (default: ${bindir})]),
-+					 [ xwayland_path="$withval" ], [ xwayland_path="$bindir" ])
- AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])
- AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
- AC_ARG_ENABLE(glamor,         AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: auto)]), [GLAMOR=$enableval], [GLAMOR=auto])
-@@ -2346,6 +2348,9 @@ if test "x$XWAYLAND" = xyes; then
- 	if test "x$GLAMOR" = xyes && test "x$GBM" = xyes; then
- 		AC_DEFINE(XWL_HAS_GLAMOR, 1,
- 			  [Build xwayland with glamor support])
-+		AC_SUBST(have_glamor, "true")
-+	else
-+		AC_SUBST(have_glamor, "false")
- 	fi
- 
- 	PKG_CHECK_MODULES(WAYLAND_EGLSTREAM, [wayland-eglstream-protocols >= 1.0.2], [have_wl_eglstream=yes], [have_wl_eglstream=no])
-@@ -2368,6 +2373,9 @@ if test "x$XWAYLAND" = xyes; then
- 		AC_SUBST(WAYLAND_EGLSTREAM_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-eglstream-protocols`)
- 		AC_DEFINE(XWL_HAS_EGLSTREAM, 1,
- 			  [Build xwayland with eglstream support])
-+		AC_SUBST(have_eglstream, "true")
-+	else
-+		AC_SUBST(have_eglstream, "false")
- 	fi
- 
- 	XWAYLAND_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB"
-@@ -2390,6 +2398,9 @@ if test "x$XWAYLAND" = xyes; then
-                           AC_SUBST(SCANNER_ARG, 'code'))
- 
- 	AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
-+
-+	AC_SUBST(xwayland_path)
-+
- fi
- AM_CONDITIONAL(XWAYLAND_EGLSTREAM, [test "x$XWAYLAND_EGLSTREAM" = "xyes"])
- 
-@@ -2546,6 +2557,7 @@ hw/kdrive/ephyr/Makefile
- hw/kdrive/ephyr/man/Makefile
- hw/kdrive/src/Makefile
- hw/xwayland/Makefile
-+hw/xwayland/xwayland.pc
- test/Makefile
- xserver.ent
- xorg-server.pc
-diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
-index bc1cb85..7c252db 100644
--- a/hw/xwayland/Makefile.am
-+++ b/hw/xwayland/Makefile.am
-@@ -1,3 +1,4 @@
-+bindir = @xwayland_path@
- bin_PROGRAMS = Xwayland
- 
- Xwayland_CFLAGS =				\
-@@ -84,7 +85,10 @@ endif
- nodist_Xwayland_SOURCES = $(Xwayland_built_sources)
- CLEANFILES = $(Xwayland_built_sources)
- 
-EXTRA_DIST = drm.xml
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = xwayland.pc
-+
-+EXTRA_DIST = xwayland.pc.in drm.xml
- 
- $(Xwayland_SOURCES): $(Xwayland_built_sources)
- 
-diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
-index 36bf213..40e8612 100644
--- a/hw/xwayland/meson.build
-+++ b/hw/xwayland/meson.build
-@@ -100,4 +100,19 @@ executable(
-         libglxvnd,
-     ],
-     install: true,
-+    install_dir: xwayland_path
-+)
-+
-+xwayland_data = configuration_data()
-+xwayland_data.set('PACKAGE_VERSION', meson.project_version())
-+xwayland_data.set('xwayland_path', xwayland_path)
-+xwayland_data.set('have_glamor', build_glamor ? 'true' : 'false')
-+xwayland_data.set('have_eglstream', build_eglstream ? 'true' : 'false')
-+configure_file(
-+    input: 'xwayland.pc.in',
-+    output: 'xwayland.pc',
-+    configuration: xwayland_data,
-+    install_dir: join_paths(get_option('prefix'),
-+                            get_option('libdir'),
-+                            'pkgconfig'),
- )
-diff --git a/hw/xwayland/xwayland.pc.in b/hw/xwayland/xwayland.pc.in
-new file mode 100644
-index 0000000..cd28026
--- /dev/null
-+++ b/hw/xwayland/xwayland.pc.in
-@@ -0,0 +1,7 @@
-+Name: Xwayland
-+Description: X Server for Wayland
-+Version: @PACKAGE_VERSION@
-+xwayland=@xwayland_path@/Xwayland
-+have_glamor=@have_glamor@
-+have_eglstream=@have_eglstream@
-+have_initfd=true
-diff --git a/meson.build b/meson.build
-index 0531463..c904e7f 100644
--- a/meson.build
-+++ b/meson.build
-@@ -169,6 +169,11 @@ if (host_machine.system() != 'darwin' and
-     if get_option('xwayland') != 'false'
-         xwayland_required = get_option('xwayland') == 'true'
- 
-+        xwayland_path = get_option('xwayland-path')
-+        if (xwayland_path == '')
-+            xwayland_path = join_paths(get_option('prefix'), get_option('bindir'))
-+        endif
-+
-         xwayland_dep = [
-             dependency('wayland-client', version: '>= 1.3.0', required: xwayland_required),
-             dependency('wayland-protocols', version: '>= 1.10', required: xwayland_required),
--- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/xserver-xorg:"
-
-# This backport is needed on hardknott to enable wlroots to create the xwayland backend
-SRC_URI_append = " file://0001-xwayland-Add-a-pkg-config-file-for-Xwayland.patch"
-
--- a/recipes-gtk/calls/calls_git.bb
+++ b/recipes-gtk/calls/calls_git.bb
@ -0,0 +1,35 @@
+SUMMARY = "A phone dialer and call handler."
+LICENSE = "GPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
+
+DEPENDS = " \
+    callaudiod \
+    evolution-data-server \
+    feedbackd \
+    folks \
+    glib-2.0 \
+    glibmm \
+    gom \
+    gstreamer1.0 \
+    gstreamer1.0-plugins-good \
+    libhandy \
+    libpeas \
+    libsecret \
+    libsoup-2.4 \
+    libxml2 \
+    modemmanager \
+    openldap \
+    python3-docutils-native \
+    sofia-sip \
+"
+
+SRC_URI = "gitsm://gitlab.gnome.org/GNOME/calls.git;protocol=https;nobranch=1"
+
+S = "${WORKDIR}/git"
+SRCREV = "3d7c671034e01756b685d7b3048b1da01d4307bf"
+PV = "43_alpha.2"
+
+inherit meson vala pkgconfig mime-xdg
+
+FILES:${PN} += "${datadir}"
+
--- a/recipes-gtk/gimp/gimp/0001-meson-make-gir-buildable.patch
+++ b/recipes-gtk/gimp/gimp/0001-meson-make-gir-buildable.patch
@ -0,0 +1,43 @@
+From c8f73f57d63779cfaad140e0521be40972fbec8f Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Wed, 1 Sep 2021 16:44:13 +0200
+Subject: [PATCH] meson: make gir buildable
+
+yocto/oe is capable of building gobject introspection despite cross-compiling.
+add an option to enable gir build even if cross-compiling
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ libgimp/meson.build | 2 +-
+ meson_options.txt   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgimp/meson.build b/libgimp/meson.build
+index 9e7b4fbbe3..99614733d7 100644
+--- a/libgimp/meson.build
+++ b/libgimp/meson.build
+@@ -384,7 +384,7 @@ libgimpui_introspectable_files = [
+   libgimpwidgets_introspectable,
+ ]
+ 
+-if meson.is_cross_build()
+if meson.is_cross_build() and not get_option('introspection')
+   have_gobject_introspection = false
+   gobject_introspection_warning = '\n      '.join(['',
+     'GObject Introspection is disabled while cross-compiling because',
+diff --git a/meson_options.txt b/meson_options.txt
+index 7b6ad78045..c29fdb5b40 100644
+--- a/meson_options.txt
+++ b/meson_options.txt
+@@ -52,7 +52,7 @@ option('headless-tests',    type: 'feature', value: 'auto', description: 'Use xv
+ option('gtk-doc',           type: 'boolean', value: true,   description: 'Build developer documentation')
+ option('gtk-doc-app',       type: 'boolean', value: false,  description: 'Build developer documentation for app')
+ option('g-ir-doc',          type: 'boolean', value: false,  description: 'Build developer documentation for introspected API')
+-
+option('introspection',   type: 'boolean', value: false,  description: 'GIR is buildable even if crosscompiling')
+ option('linux-input',       type: 'feature', value: 'auto', description: 'Linux input event controller module')
+ option('vec-icons',         type: 'boolean', value: true,   description: 'Use vector icons rather than raster ones')
+ 
+-- 
+2.25.1
+
--- a/recipes-gtk/gimp/gimp_git.bb
+++ b/recipes-gtk/gimp/gimp_git.bb
@ -0,0 +1,119 @@
+SUMMARY = "The GIMP is the GNU Image Manipulation Program"
+HOMEPAGE = "http://www.gimp.org"
+SECTION = "graphics"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
+
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+
+DEPENDS = " \
+    appstream-glib \
+    atk \
+    babl \
+    bison-native \
+    cairo \
+    dbus-glib \
+    fontconfig \
+    freetype \
+    gdk-pixbuf-native \
+    gegl \
+    gegl-native \
+    gexiv2 \
+    gtk+3 \
+    harfbuzz \
+    intltool-native \
+    json-glib \
+    lcms \
+    libarchive \
+    libexif \
+    libmypaint \
+    libpng \
+    libxmu \
+    libxslt-native \
+    mypaint-brushes-1.0 \
+    pango \
+    poppler \
+    poppler-data \
+"
+
+DEPENDS:append:libc-musl = " libexecinfo"
+RDEPENDS:${PN} = "mypaint-brushes-1.0 glib-networking"
+
+inherit meson gtk-icon-cache mime-xdg pkgconfig features_check gobject-introspection vala
+GIR_MESON_OPTION = ''
+
+SRC_URI = " \
+    git://github.com/GNOME/gimp.git;protocol=https;branch=master \
+"
+
+S = "${WORKDIR}/git"
+SRCREV = "b1e13b5a15096d65d94571e69cf08d45904b5719"
+PV = "2.99.12"
+
+PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib"
+PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
+PACKAGECONFIG[appdata-test] = "-Dappdata-test=enabled,-Dappdata-test=disabled,appstream-glib-native"
+PACKAGECONFIG[bzip2] = ",,bzip2"
+PACKAGECONFIG[cairo-pdf] = "-Dcairo-pdf=enabled,-Dcairo-pdf=disabled"
+PACKAGECONFIG[check-update] = "-Dcheck-update=yes,-Dcheck-update=no"
+PACKAGECONFIG[email] = ",,,xdg-utils"
+PACKAGECONFIG[enable-console-bin] = "-Denable-console-bin=true,-Denable-console-bin=false"
+PACKAGECONFIG[ghostscript] = "-Dghostscript=enabled,-Dghostscript=disabled,ghostscript"
+PACKAGECONFIG[gi-docgen] = "-Dgi-docgen=enabled,-Dgi-docgen=disabled,gi-docgen-native"
+PACKAGECONFIG[gudev] = "-Dgudev=enabled,-Dgudev=disabled,libgudev"
+PACKAGECONFIG[iso-codes] = ",,iso-codes"
+PACKAGECONFIG[javascript] = "-Djavascript=true,-Djavascript=false,,openjre-8"
+PACKAGECONFIG[jpeg2000] = "-Djpeg2000=enabled,-Djpeg2000=disabled,jasper"
+PACKAGECONFIG[jpeg] = ",,jpeg"
+PACKAGECONFIG[jpeg-xl] = ",,libjxl"
+PACKAGECONFIG[libunwind] = ",,libunwind"
+PACKAGECONFIG[libbacktrace] = ",,libbacktrace"
+PACKAGECONFIG[lua] = "-Dlua=true,-Dlua=false,,luajit lgi"
+PACKAGECONFIG[lzma] = ",,xz"
+PACKAGECONFIG[mng] = "-Dmng=enabled,-Dmng=disabled,libmng"
+PACKAGECONFIG[python] = "-Dpython=true,-Dpython=false,,python3 python3-pygobject"
+PACKAGECONFIG[rsvg] = ",,librsvg"
+PACKAGECONFIG[tiff] = ",,tiff"
+PACKAGECONFIG[vala-plugins] = "-Dvala-plugins=enabled,-Dvala-plugins=disabled"
+PACKAGECONFIG[vector-icons] = "-Dvector-icons=true,-Dvector-icons=false,librsvg shared-mime-info"
+PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
+PACKAGECONFIG[xcursor] = "-Dxcursor=enabled,-Dxcursor=disabled,libxcursor"
+PACKAGECONFIG[x11] = "-Dxpm=enabled,-Dxpm=disabled,libxpm libxext libxfixes"
+PACKAGECONFIG[zlib] = ",,zlib"
+
+PACKAGECONFIG ?= " \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
+    aa \
+    alsa \
+    bzip2 \
+    cairo-pdf \
+    gudev \
+    jpeg \
+    jpeg2000 \
+    jpeg-xl \
+    lua \
+    lzma \
+    mng \
+    python \
+    rsvg \
+    tiff \
+    vala-plugins \
+    vector-icons \
+    webp \
+    zlib \
+"
+
+FILES:${PN} += " \
+    ${datadir}/metainfo \
+    ${datadir}/gir-1.0 \
+    ${datadir}/appdata \ 
+    ${libdir}/girepository-1.0 \
+"
+
+EXTRA_OEMESON += " \
+    -Dshmem-type=posix \
+    -Dlinux-input=enabled \
+    -Dcan-crosscompile-gir=true \
+    --buildtype release \
+"
+
--- a/recipes-gtk/granite/granite_git.bb
+++ b/recipes-gtk/granite/granite_git.bb
@ -0,0 +1,23 @@
+SUMMARY = "Granite is a companion library for GTK and GLib."
+HOMEPAGE = "https://github.com/elementary/granite"
+LICENSE = "LGPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+
+DEPENDS = " \
+	gtk+3 \
+	glib-2.0 \
+	libgee \
+"
+
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+
+SRC_URI = "git://github.com/elementary/granite.git;protocol=https;nobranch=1"
+
+S = "${WORKDIR}/git"
+PV = "6.2.0"
+SRCREV = "4ab145c28bb3db6372fe519e8bd79c645edfcda3"
+
+inherit meson pkgconfig gobject-introspection vala features_check
+
+FILES:${PN} += "${datadir}"
--- a/recipes-gtk/gtk-layer-shell/gtk-layer-shell/0001-protocol-meson.build-dont-use-pkgconfig-for-wayland-.patch
+++ b/recipes-gtk/gtk-layer-shell/gtk-layer-shell/0001-protocol-meson.build-dont-use-pkgconfig-for-wayland-.patch
@ -0,0 +1,23 @@
+From 25e9ac8ce8aba85f0c4e3c643d517fecc6e2fd96 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Sat, 9 Jul 2022 01:08:21 +0200
+Subject: [PATCH] protocol/meson.build: dont use pkgconfig for wayland-scanner
+
+wayland-scanner path gets read from target waylands .pc file. Avoid it
+---
+ protocol/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/protocol/meson.build b/protocol/meson.build
+index 2ce0e0c..12f389f 100644
+--- a/protocol/meson.build
+++ b/protocol/meson.build
+@@ -1,4 +1,4 @@
+-if wayland_scanner.found()
+if false
+     prog_wayland_scanner = find_program(wayland_scanner.get_pkgconfig_variable('wayland_scanner'))
+ else
+     prog_wayland_scanner = find_program('wayland-scanner')
+-- 
+2.25.1
+
--- a/recipes-extended/gtk-layer-shell/gtk-layer-shell_git.bb
+++ b/recipes-extended/gtk-layer-shell/gtk-layer-shell_git.bb
@ -1,6 +1,4 @@
 SUMMARY = "A library to write GTK applications that use Layer Shell"
-DESCRIPTION = "A library to write GTK applications that use Layer Shell. Layer Shell is a Wayland protocol for desktop shell components, such as panels, notifications and wallpapers."
-AUTHOR = ""
 HOMEPAGE = "https://github.com/wmww/gtk-layer-shell"
 BUGTRACKER = "https://github.com/www/gtk-layer-shell/issues"
 SECTION = "graphics"
@ -14,20 +12,23 @@ DEPENDS += " \
 	gtk+3 \
 	wayland \
 	wayland-native \
-	gobject-introspection \
-	gobject-introspection-native \
-	qemu-native \
-	prelink-native \
+	wayland-protocols \
 "

-SRC_URI = "git://github.com/wmww/gtk-layer-shell.git;protocol=https"
+SRC_URI = " \
+	git://github.com/wmww/gtk-layer-shell.git;protocol=https;branch=master \
+	file://0001-protocol-meson.build-dont-use-pkgconfig-for-wayland-.patch \	
+"

 S = "${WORKDIR}/git"
-PV = "0.6.0"
-SRCREV = "v${PV}"
+PV = "0.7.0"
+SRCREV = "ca37ef1baa623302dda5fcea200d04e0d9a10578"

-inherit meson pkgconfig features_check
-FILES_${PN} = "${datadir} ${libdir}"
+inherit meson pkgconfig features_check gobject-introspection vala
+
+EXTRA_OEMESON += "--buildtype release"
+
+FILES:${PN} = "${datadir} ${libdir}"

 BBCLASSEXTEND = ""

--- a/recipes-gtk/gtklock/gtklock_git.bb
+++ b/recipes-gtk/gtklock/gtklock_git.bb
@ -0,0 +1,28 @@
+SUMMARY = "GTK-based lockscreen for Wayland."
+HOMEPAGE = "https://github.com/jovanlanik/gtklock"
+SECTION = "graphics"
+LICENSE = "GPL-3.0-only"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+REQUIRED_DISTRO_FEATURES = "wayland pam"
+
+DEPENDS = " \
+	gtk+3 \
+	gtk-layer-shell \
+	libpam \
+	scdoc-native \
+	wayland \
+	wayland-native \
+	wayland-protocols \
+"
+
+SRC_URI = "git://github.com/jovanlanik/gtklock.git;protocol=https;branch=master"
+
+S = "${WORKDIR}/git"
+PV = "1.3.0"
+SRCREV = "533799037bab53e47c16f3d7da97efbeb8f4cb0d"
+
+inherit autotools-brokensep pkgconfig features_check
+
+EXTRA_OEMAKE += "PREFIX=${prefix}"
--- a/recipes-gtk/iwgtk/iwgtk_git.bb
+++ b/recipes-gtk/iwgtk/iwgtk_git.bb
@ -0,0 +1,30 @@
+SUMMARY = "iwgtk is a wireless networking GUI for Linux with supported functionality similar to that of iwctl."
+HOMEPAGE = "https://github.com/J-Lentz/iwgtk"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+DEPENDS = " \
+    gtk4 \
+    qrencode \
+    scdoc-native \
+"
+
+inherit meson gtk-icon-cache pkgconfig
+
+SRC_URI = "git://github.com/J-Lentz/iwgtk.git;protocol=https;branch=master"
+
+S = "${WORKDIR}/git"
+PV = "0.8"
+SRCREV = "5d3d3f17b80b5724250f63b0f5acbbd656a281d0"
+
+do_install:append() {
+	# fix weird /usr/share/lib install
+	mv ${D}${datadir}/lib ${D}${libdir}
+}
+
+FILES:${PN} += "${systemd_user_unitdir}/iwgtk.service"
+
+# for working dbus communication in iwd default configuration the user either needs
+# to be in group 'wheel' or 'netdev'. See /usr/share/dbus-1/system.d/iwd-dbus.conf
+ 
+RDEPENDS:${PN} = "gtk4 iwd dbus"
--- a/recipes-gtk/nwg-shell/azote-palettes_git.bb
+++ b/recipes-gtk/nwg-shell/azote-palettes_git.bb
@ -0,0 +1,21 @@
+SUMMARY = "This tool creates a palette of up to 36 colours out of a jpg or png image."
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+SRC_URI = " \
+	git://github.com/nwg-piotr/azote-palettes.git;protocol=https;branch=master \
+"
+
+RDEPENDS:${PN} = " \
+	python3 \
+	python3-pygobject \
+	python3-pillow \
+	python3-colorthief \
+"
+
+inherit setuptools3
+
+S = "${WORKDIR}/git"
+PV = "1.0.1"
+SRCREV = "b5aaf3ecc0df3809c6b0f07c6b7bf8376f017a5b"
+
--- a/recipes-gtk/nwg-shell/azote_git.bb
+++ b/recipes-gtk/nwg-shell/azote_git.bb
@ -0,0 +1,46 @@
+SUMMARY = "Azote is a GTK+3 based frontend for swaybg."
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+SRC_URI = " \
+	git://github.com/nwg-piotr/azote.git;protocol=https;branch=master \
+"
+
+RDEPENDS:${PN} = " \
+	azote-palettes \
+	python3 \
+	gtk+3 \
+	python3-pygobject \
+	python3-pycairo \
+	python3-pillow \
+	python3-pkg-resources \
+	python3-send2trash \
+	imagemagick \
+	grim \
+	slurp \
+	swaybg \
+"
+
+inherit setuptools3
+
+S = "${WORKDIR}/git"
+PV = "1.9.5"
+SRCREV = "a8845b9df985d51570b83d40f40e0b0e7579b9e3"
+
+do_configure:prepend() {
+	[ -d ${S}/dist ] && mv ${S}/dist ${S}/distrib
+}
+
+do_install:append() {
+	install -d ${D}${bindir} ${D}${datadir}/azote ${D}${datadir}/pixmaps ${D}${datadir}/applications
+	install -m 755 ${S}/distrib/azote ${D}${bindir}
+	install -m 644 ${S}/distrib/azote.desktop ${D}${datadir}/applications
+	install -m 644 ${S}/distrib/azote.svg ${D}${datadir}/pixmaps
+	install -m 644 ${S}/distrib/indicator_active.png ${D}${datadir}/azote
+	install -m 644 ${S}/distrib/indicator_attention.png ${D}${datadir}/azote
+}
+
+FILES:${PN}:append = " \
+	${datadir} \
+	${bindir} \
+"
--- a/recipes-gtk/nwg-shell/ddcpopup_git.bb
+++ b/recipes-gtk/nwg-shell/ddcpopup_git.bb
@ -0,0 +1,30 @@
+SUMMARY = "ddcpopup allows to control basic settings of external (not laptop built-in) monitors."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/README.md;md5=63b79d68c363846305e6bb4fbf116a35"
+
+DEPENDS = " \
+	ddcutil \
+	gtk+3 \
+	gtk-layer-shell \
+"
+
+RDEPENDS:${PN} = "ddcutil"
+
+GO_IMPORT = "github.com/nwg-piotr/ddcpopup.git"
+
+SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
+
+PV = "0.1"
+SRCREV = "8fab5132e49e08a1eeaa7a0dd3350d06f4399200"
+
+inherit go go-mod pkgconfig
+
+GO_INSTALL = "${GO_IMPORT}"
+
+do_compile[network] = "1"
+
+do_install:append() {
+	mv ${D}${bindir}/main ${D}${bindir}/ddcpopup
+	# remove precompiled x86 binaries
+	rm -r ${D}${libdir}/go/pkg/mod/github.com/dlasky/gotk3-layershell@*/example
+}
--- a/recipes-gtk/nwg-shell/gopsuinfo_git.bb
+++ b/recipes-gtk/nwg-shell/gopsuinfo_git.bb
@ -0,0 +1,16 @@
+SUMMARY = "Go version of the psuinfo python script."
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=22ed6cb3c33862e689e075b45066a779"
+
+GO_IMPORT = "github.com/nwg-piotr/gopsuinfo.git"
+
+SRC_URI = "git://${GO_IMPORT};branch=main;protocol=https"
+PV = "0.1.2"
+SRCREV = "8380a5bd8e200b14badb8e75762bf84a25ab1dd9"
+
+inherit go go-mod
+
+GO_INSTALL = "${GO_IMPORT}"
+
+do_compile[network] = "1"
+
--- a/recipes-support/nwg-shell/nwg-bar_git.bb
+++ b/recipes-support/nwg-shell/nwg-bar_git.bb
@ -10,17 +10,14 @@ DEPENDS = " \

 GO_IMPORT = "github.com/nwg-piotr/nwg-bar.git"

-SRC_URI = "git://${GO_IMPORT};nobranch=1"
+SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"

-PV = "0.0.1"
-SRCREV = "v${PV}"
+PV = "0.1.0"
+SRCREV = "eee48b9575936495b5b7d6bc88e14d736245259a"

-inherit go go-mod
+inherit go go-mod pkgconfig

 GO_INSTALL = "${GO_IMPORT}"

-do_install_append() {
-	# remove precompiled x86 binary
-	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
-}
+do_compile[network] = "1"

--- a/recipes-gtk/nwg-shell/nwg-displays_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-displays_git.bb
@ -0,0 +1,27 @@
+SUMMARY = "Output management utility for sway Wayland compositor, inspired by wdisplays and wlay."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2e53cad864b84be468b2fc0b511942ce"
+
+SRC_URI = " \
+	git://github.com/nwg-piotr/nwg-displays.git;protocol=https;branch=master \
+"
+
+RDEPENDS:${PN} = "\
+	gtk-layer-shell \
+	python3 \
+	python3-pygobject \
+	python-i3ipc \
+"
+
+inherit setuptools3
+
+S = "${WORKDIR}/git"
+PV = "0.1.4"
+SRCREV = "18537ed665b21d30d9c0b0d94154a366d754beb5"
+
+do_install:append() {
+	install -d ${D}${datadir}/pixmaps ${D}${datadir}/applications
+	install -m 644 ${S}/nwg-displays.desktop ${D}${datadir}/applications
+	install -m 644 ${S}/nwg-displays.svg ${D}${datadir}/pixmaps
+}
+
--- a/recipes-gtk/nwg-shell/nwg-dock_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-dock_git.bb
@ -0,0 +1,28 @@
+SUMMARY = "GTK3-based dock for wlroots based compositors."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=fffa55ad1c828db5e334374fb1182530"
+
+DEPENDS = " \
+	gtk+3 \
+	gtk-layer-shell \
+"
+
+GO_IMPORT = "github.com/nwg-piotr/nwg-dock.git"
+
+SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
+
+PV = "0.2.2"
+SRCREV = "204582169596597095109727302fec51f930c91e"
+
+inherit go go-mod pkgconfig
+
+GO_INSTALL = "${GO_IMPORT}"
+
+do_install:append() {
+	# remove precompiled x86 binaries
+	rm -rf ${D}${libdir}/go/src/${GO_IMPORT}/bin
+	rm -rf ${D}${libdir}/go/pkg/mod/github.com/dlasky/gotk3-layershell*/example
+}
+
+do_compile[network] = "1"
+
--- a/recipes-support/nwg-shell/nwg-drawer_git.bb
+++ b/recipes-support/nwg-shell/nwg-drawer_git.bb
@ -7,24 +7,27 @@ DEPENDS = " \
 	gtk-layer-shell \
 "

-RRECOMMENDS_${PN} = " \
+RRECOMMENDS:${PN} = " \
 	thunar \
 	foot \
 "

 GO_IMPORT = "github.com/nwg-piotr/nwg-drawer.git"

-SRC_URI = "git://${GO_IMPORT};nobranch=1"
+SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"

-PV = "0.1.4"
-SRCREV = "v${PV}"
+PV = "0.3.0"
+SRCREV = "f3b3635bd8950e1accb5dbbcaf311c8c7a26a856"

-inherit go go-mod
+inherit go go-mod pkgconfig

 GO_INSTALL = "${GO_IMPORT}"

-do_install_append() {
+do_install:append() {
 	# remove precompiled x86 binary
-	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
+	rm -rf ${D}${libdir}/go/src/${GO_IMPORT}/bin
+	rm -rf ${D}${libdir}/go/pkg/mod/github.com/dlasky/gotk3-layershell*/example
 }

+do_compile[network] = "1"
+
--- a/recipes-gtk/nwg-shell/nwg-icon-picker_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-icon-picker_git.bb
@ -0,0 +1,19 @@
+SUMMARY = "This program is intended to work as the icon picker for nwg-panel, but it may be used standalone."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2e53cad864b84be468b2fc0b511942ce"
+
+SRC_URI = " \
+	git://github.com/nwg-piotr/nwg-icon-picker.git;protocol=https;branch=master \
+"
+
+RDEPENDS:${PN} = " \
+	python3 \
+	python3-pygobject \
+"
+
+inherit setuptools3
+
+S = "${WORKDIR}/git"
+PV = "0.0.1"
+SRCREV = "cd32e72ffb3c2fb41a3f7189981376cdad6af976"
+
--- a/recipes-support/nwg-shell/nwg-launchers_git.bb
+++ b/recipes-support/nwg-shell/nwg-launchers_git.bb
@ -25,11 +25,10 @@ PACKAGECONFIG ?= " \
 "

 SRC_URI = " \
-	git://github.com/nwg-piotr/nwg-launchers.git;protocol=https \
-	file://0001-nwg_tools.cc-fix-build-without-gdk-x11.patch \
+	git://github.com/nwg-piotr/nwg-launchers.git;protocol=https;branch=master \
 "
-SRCREV = "v${PV}"
-PV = "0.5.0"
+SRCREV = "8d152bb725c8bd79b71c0c458bce65a51ab80b79"
+PV = "0.6.3"

 S = "${WORKDIR}/git"

--- a/recipes-gtk/nwg-shell/nwg-look_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-look_git.bb
@ -0,0 +1,28 @@
+SUMMARY = "Nwg-look is a GTK3 settings editor, designed to work properly in wlroots-based Wayland environment."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=2e53cad864b84be468b2fc0b511942ce"
+
+DEPENDS = "xcur2png gtk+3"
+RDEPENDS:${PN} = "xcur2png"
+
+GO_IMPORT = "github.com/nwg-piotr/nwg-look.git"
+
+SRC_URI = "git://${GO_IMPORT};branch=main;protocol=https"
+SRCREV = "9bb91da211c5d494e755cf9715938d68a0d00c6a"
+PV = "0.1.4"
+
+inherit go go-mod pkgconfig gtk-icon-cache
+
+GO_INSTALL = "${GO_IMPORT}"
+
+do_install:append() {
+	install -d ${D}${datadir}/nwg-look ${D}${datadir}/applications ${D}${datadir}/pixmaps
+	install -m 0644 ${S}/src/${GO_IMPORT}/stuff/main.glade ${D}${datadir}/nwg-look
+	install -m 0644 ${S}/src/${GO_IMPORT}/stuff/nwg-look.desktop ${D}${datadir}/applications
+	install -m 0644 ${S}/src/${GO_IMPORT}/stuff/nwg-look.svg ${D}${datadir}/pixmaps
+}
+
+FILES:${PN} += "${datadir}"
+
+do_compile[network] = "1"
+
--- a/recipes-support/nwg-shell/nwg-menu_git.bb
+++ b/recipes-support/nwg-shell/nwg-menu_git.bb
@ -9,24 +9,26 @@ DEPENDS = " \
 	gtk-layer-shell \
 "

-RRECOMMENDS_${PN} = " \
+RRECOMMENDS:${PN} = " \
 	thunar \
 	foot \
 "

 GO_IMPORT = "github.com/nwg-piotr/nwg-menu.git"

-SRC_URI = "git://${GO_IMPORT};nobranch=1"
+SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"

 PV = "0.1.1"
-SRCREV = "v${PV}"
+SRCREV = "b76362d971490cb8279b40d9c2d543c5e69232ef"

-inherit go go-mod
+inherit go go-mod pkgconfig

 GO_INSTALL = "${GO_IMPORT}"

-do_install_append() {
+do_install:append() {
 	# remove precompiled x86 binary
-	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
+	rm -rf ${D}${libdir}/go/src/${GO_IMPORT}/bin
 }

+do_compile[network] = "1"
+
--- a/recipes-gtk/nwg-shell/nwg-panel_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-panel_git.bb
@ -0,0 +1,25 @@
+SUMMARY = "GTK3-based panel for wayland."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=cf35eed17e1e2850ef025a633885d45f"
+
+SRC_URI = " \
+	git://github.com/nwg-piotr/nwg-panel.git;protocol=https;branch=master \
+"
+
+RDEPENDS:${PN} = "\
+	bash \
+	light \
+	python3 \
+	python-i3ipc \
+	python3-psutil \
+	python3-pygobject \
+	python3-requests \
+	swaync \
+"
+
+inherit setuptools3
+
+S = "${WORKDIR}/git"
+PV = "0.7.7"
+SRCREV = "436bfc854b95bd73fe873bf4b122f968dc7b76b8"
+
--- a/recipes-gtk/nwg-shell/nwg-shell-config_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-shell-config_git.bb
@ -0,0 +1,22 @@
+SUMMARY = "nwg-shell config utility."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fffa55ad1c828db5e334374fb1182530"
+
+SRC_URI = " \
+	git://github.com/nwg-piotr/nwg-shell-config.git;protocol=https;branch=master \
+"
+
+RDEPENDS:${PN} = "\
+	python3 \
+	python3-geopy \
+	python-i3ipc \
+	python3-pygobject \
+	swaync \
+"
+
+inherit setuptools3
+
+S = "${WORKDIR}/git"
+PV = "0.3.14"
+SRCREV = "19aa30f99dc3246290f39f0cb002952e0b5903c4"
+
--- a/recipes-gtk/nwg-shell/nwg-shell-wallpapers_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-shell-wallpapers_git.bb
@ -0,0 +1,18 @@
+SUMMARY = "A selection of wallpapers contributed to the nwg-shell project."
+LICENSE = "CC0-1.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032"
+
+SRC_URI = "git://github.com/nwg-piotr/nwg-shell-wallpapers.git;protocol=https;nobranch=1"
+
+S = "${WORKDIR}/git"
+PV = "1.0"
+SRCREV = "ee904a7beb1e8b7750f50072601fddb3507b0657"
+
+do_install() {
+	install -d ${D}${datadir}/backgrounds/sway
+	for file in ${S}/wallpapers/*; do
+		install -m 0644 "$file" ${D}${datadir}/backgrounds/sway
+	done
+}
+
+FILES:${PN} = "${datadir}"
--- a/recipes-gtk/nwg-shell/nwg-wrapper_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-wrapper_git.bb
@ -0,0 +1,17 @@
+SUMMARY = "GTK3-based wrapper to display a script output, or a text file content on the desktop in wlroots-based compositors."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f8c294ba3ca22f2369223ac6415d1168"
+
+SRC_URI = " \
+	git://github.com/nwg-piotr/nwg-wrapper.git;protocol=https;branch=master \
+"
+
+DEPENDS = "python3"
+RDEPENDS:${PN} = "python3-pygobject"
+
+inherit setuptools3 gobject-introspection
+
+S = "${WORKDIR}/git"
+PV = "0.1.2"
+SRCREV = "9c1b0669dd894b6209a3130169956c755154b055"
+
--- a/recipes-gtk/nwg-shell/nwgocc_git.bb
+++ b/recipes-gtk/nwg-shell/nwgocc_git.bb
@ -0,0 +1,45 @@
+SUMMARY = "nwg Control Center is a highly customisable, GTK-based GUI, intended for use with window managers."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=fffa55ad1c828db5e334374fb1182530"
+
+DEPENDS = " \
+	gtk+3 \
+"
+
+RRECOMMENDS:${PN} = " \
+	light \
+	playerctl \
+"
+
+GO_IMPORT = "github.com/nwg-piotr/nwgocc.git"
+
+SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
+
+PV = "0.0.1"
+SRCREV = "782a37014de40f63115825c0b5bd343dee2ba668"
+
+inherit go go-mod pkgconfig gtk-icon-cache
+
+GO_INSTALL = "${GO_IMPORT}"
+
+do_install:append() {
+	install -d \
+		${D}${datadir}/nwgocc/icons_light ${D}${datadir}/nwgocc/icons_dark \
+		${D}${datadir}/applications ${D}${datadir}/icons/hicolor/scalable/apps
+	install -m 644 ${S}/src/${GO_IMPORT}/nwgocc.desktop ${D}${datadir}/applications
+	install -m 644 ${S}/src/${GO_IMPORT}/nwgocc.svg ${D}${datadir}/icons/hicolor/scalable/apps
+	for file in ${S}/src/${GO_IMPORT}/configs/*; do
+		install -m 644 $file ${D}${datadir}/nwgocc
+	done
+	for file in ${S}/src/${GO_IMPORT}/icons_light/*; do
+		install -m 644 $file ${D}${datadir}/nwgocc/icons_light
+	done
+	for file in ${S}/src/${GO_IMPORT}/icons_dark/*; do
+		install -m 644 $file ${D}${datadir}/nwgocc/icons_dark
+	done
+}
+
+FILES:${PN} += "${datadir}"
+
+do_compile[network] = "1"
+
--- a/recipes-gtk/phosh/phosh/phosh.pam
+++ b/recipes-gtk/phosh/phosh/phosh.pam
@ -0,0 +1,6 @@
+#%PAM-1.0
+auth        required    pam_unix.so
+account     required    pam_unix.so
+password    required    pam_unix.so
+session     required    pam_unix.so
+
--- a/recipes-gtk/phosh/phosh_git.bb
+++ b/recipes-gtk/phosh/phosh_git.bb
@ -0,0 +1,69 @@
+SUMMARY = "a pure wayland shell for mobile devices like Purism's Librem 5."
+HOMEPAGE = "https://source.puri.sm/Librem5/feedbackd"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+REQUIRED_DISTRO_FEATURES = "wayland polkit pam pulseaudio"
+
+DEPENDS = " \
+    callaudiod \
+    evolution-data-server \
+    feedbackd \
+    fribidi \
+    gcr \
+    git-native \
+    glib-2.0 \
+    gnome-desktop \
+    gtk+3 \
+    libgudev \
+    libhandy \
+    libpam \
+    libsecret \
+    libxml2 \
+    networkmanager \
+    polkit \
+    pulseaudio \
+    upower \
+    wayland \
+    wayland-native \
+    wayland-protocols \
+"
+
+RDEPENDS:${PN} = " \
+    gnome-control-center \
+    gnome-session \
+    gnome-settings-daemon \
+    gsettings-desktop-schemas \
+    phoc \
+    squeekboard \
+"
+
+PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false"
+PACKAGECONFIG[tools] = "-Dtools=true,-Dtools=false"
+# install systemd service files ?
+PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false"
+
+PACKAGECONFIG ?= " \
+	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+	tools \
+"
+
+inherit features_check gsettings meson pkgconfig
+
+SRC_URI = " \
+    gitsm://gitlab.gnome.org/World/Phosh/phosh.git;protocol=https;nobranch=1 \
+    file://phosh.pam \
+"
+
+S = "${WORKDIR}/git"
+PV = "0.21.0"
+SRCREV = "4122630266abfd6623e169330da6e7d6bc01be7f"
+
+EXTRA_OEMESON += "--buildtype=release"
+
+do_install:append() {
+    install -Dm 644 ${WORKDIR}/phosh.pam ${D}${sysconfdir}/pam.d/phosh
+}
+
+FILES:${PN} += "${datadir} ${libdir}"
+
--- a/recipes-gtk/sirula/sirula_git.bb
+++ b/recipes-gtk/sirula/sirula_git.bb
@ -0,0 +1,120 @@
+SUMMARY = "Sirula (simple rust launcher) is an app launcher for wayland"
+HOMEPAGE = "https://github.com/DorianRudolph/sirula.git"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e49f4652534af377a713df3d9dec60cb"
+
+SRC_URI += " \
+    git://github.com/DorianRudolph/sirula.git;protocol=https;nobranch=1 \
+    crate://crates.io/aho-corasick/0.7.18 \
+    crate://crates.io/anyhow/1.0.44 \
+    crate://crates.io/arrayvec/0.5.2 \
+    crate://crates.io/atk-sys/0.15.1 \
+    crate://crates.io/atk/0.15.1 \
+    crate://crates.io/autocfg/1.0.1 \
+    crate://crates.io/bitflags/1.3.2 \
+    crate://crates.io/bitvec/0.19.5 \
+    crate://crates.io/cairo-rs/0.15.12 \
+    crate://crates.io/cairo-sys-rs/0.15.1 \
+    crate://crates.io/cfg-expr/0.10.3 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/dirs-sys/0.3.7 \
+    crate://crates.io/dirs/4.0.0 \
+    crate://crates.io/either/1.6.1 \
+    crate://crates.io/field-offset/0.3.4 \
+    crate://crates.io/freedesktop_entry_parser/1.2.0 \
+    crate://crates.io/funty/1.1.0 \
+    crate://crates.io/futures-channel/0.3.21 \
+    crate://crates.io/futures-core/0.3.21 \
+    crate://crates.io/futures-executor/0.3.21 \
+    crate://crates.io/futures-io/0.3.21 \
+    crate://crates.io/futures-macro/0.3.21 \
+    crate://crates.io/futures-sink/0.3.21 \
+    crate://crates.io/futures-task/0.3.21 \
+    crate://crates.io/futures-util/0.3.21 \
+    crate://crates.io/futures/0.3.21 \
+    crate://crates.io/fuzzy-matcher/0.3.7 \
+    crate://crates.io/gdk-pixbuf-sys/0.15.10 \
+    crate://crates.io/gdk-pixbuf/0.15.11 \
+    crate://crates.io/gdk-sys/0.15.1 \
+    crate://crates.io/gdk/0.15.4 \
+    crate://crates.io/getrandom/0.2.7 \
+    crate://crates.io/gio-sys/0.15.10 \
+    crate://crates.io/gio/0.15.12 \
+    crate://crates.io/glib-macros/0.15.11 \
+    crate://crates.io/glib-sys/0.15.10 \
+    crate://crates.io/glib/0.15.12 \
+    crate://crates.io/gobject-sys/0.15.10 \
+    crate://crates.io/gtk-layer-shell-sys/0.4.1 \
+    crate://crates.io/gtk-layer-shell/0.4.1 \
+    crate://crates.io/gtk-sys/0.15.3 \
+    crate://crates.io/gtk/0.15.5 \
+    crate://crates.io/gtk3-macros/0.15.4 \
+    crate://crates.io/heck/0.4.0 \
+    crate://crates.io/itertools/0.8.2 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/lexical-core/0.7.6 \
+    crate://crates.io/libc/0.2.126 \
+    crate://crates.io/locale-types/0.4.0 \
+    crate://crates.io/memchr/2.4.1 \
+    crate://crates.io/memoffset/0.6.4 \
+    crate://crates.io/nom/6.1.2 \
+    crate://crates.io/once_cell/1.8.0 \
+    crate://crates.io/osstrtools/0.2.2 \
+    crate://crates.io/pango-sys/0.15.10 \
+    crate://crates.io/pango/0.15.10 \
+    crate://crates.io/pest/2.1.3 \
+    crate://crates.io/pin-project-lite/0.2.7 \
+    crate://crates.io/pin-utils/0.1.0 \
+    crate://crates.io/pkg-config/0.3.20 \
+    crate://crates.io/proc-macro-crate/1.1.0 \
+    crate://crates.io/proc-macro-error-attr/1.0.4 \
+    crate://crates.io/proc-macro-error/1.0.4 \
+    crate://crates.io/proc-macro2/1.0.40 \
+    crate://crates.io/quote/1.0.10 \
+    crate://crates.io/radium/0.5.3 \
+    crate://crates.io/redox_syscall/0.2.13 \
+    crate://crates.io/redox_users/0.4.3 \
+    crate://crates.io/regex-syntax/0.6.27 \
+    crate://crates.io/regex/1.6.0 \
+    crate://crates.io/rustc_version/0.3.3 \
+    crate://crates.io/ryu/1.0.5 \
+    crate://crates.io/semver-parser/0.10.2 \
+    crate://crates.io/semver/0.11.0 \
+    crate://crates.io/serde/1.0.138 \
+    crate://crates.io/serde_derive/1.0.138 \
+    crate://crates.io/slab/0.4.4 \
+    crate://crates.io/smallvec/1.9.0 \
+    crate://crates.io/static_assertions/1.1.0 \
+    crate://crates.io/syn/1.0.98 \
+    crate://crates.io/system-deps/6.0.2 \
+    crate://crates.io/tap/1.0.1 \
+    crate://crates.io/thiserror-impl/1.0.30 \
+    crate://crates.io/thiserror/1.0.30 \
+    crate://crates.io/thread_local/1.1.3 \
+    crate://crates.io/toml/0.5.9 \
+    crate://crates.io/ucd-trie/0.1.3 \
+    crate://crates.io/unicode-ident/1.0.1 \
+    crate://crates.io/version-compare/0.1.0 \
+    crate://crates.io/version_check/0.9.3 \
+    crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/wyz/0.2.0 \
+    crate://crates.io/xdg/2.4.1 \
+"
+
+DEPENDS = " \
+    gtk-layer-shell \
+    gdk-pixbuf \
+    glib-2.0 \
+    cairo \
+    pango \
+    gtk+3 \
+"
+
+inherit cargo pkgconfig
+
+SRCREV = "70b5ce1936c819f4e5c8674e90145e5e7badcfa8"
+S = "${WORKDIR}/git"
+PV = "1.0.1"
--- a/recipes-gtk/srain/srain_git.bb
+++ b/recipes-gtk/srain/srain_git.bb
@ -0,0 +1,37 @@
+SUMMARY = "Modern IRC client written in GTK."
+HOMEPAGE = "https://github.com/SrainApp/srain"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3d42081fffd0d03da6e4a8ee09ae1a18"
+
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+
+DEPENDS = " \
+    gtk+3 \
+    cairo \
+    gdk-pixbuf \
+    glib-2.0 \
+    libconfig \
+    libsoup-2.4 \
+    openssl \
+    libsecret \
+"
+
+GIR_MESON_OPTION = ""
+
+inherit meson gtk-icon-cache mime-xdg pkgconfig features_check gobject-introspection
+
+SRC_URI = " \
+    git://github.com/SrainApp/srain.git;protocol=https;branch=master \
+"
+
+S = "${WORKDIR}/git"
+PV = "1.4.1"
+SRCREV = "ac00f833380e7f85b1c031f4d97dd08b227ead09"
+
+EXTRA_OEMESON += " \
+    --buildtype release \
+    -Ddoc_builders= \
+"
+
+FILES:${PN} += "${datadir}/metainfo"
+
--- a/recipes-gtk/swappy/swappy_git.bb
+++ b/recipes-gtk/swappy/swappy_git.bb
@ -0,0 +1,27 @@
+SUMMARY = "A Wayland native snapshot and editor tool, inspired by Snappy on macOS"
+HOMEPAGE = "https://github.com/jtheoof/swappy"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=81524e81ed2bc7b472566654e4767a52"
+
+DEPENDS = " \
+    gtk+3 \
+    cairo \
+    pango \
+"
+
+RRECOMMENDS:${PN} = "grim slurp"
+
+inherit meson gtk-icon-cache mime-xdg pkgconfig
+
+SRC_URI = " \
+    git://github.com/jtheoof/swappy.git;protocol=https;branch=master \
+"
+
+S = "${WORKDIR}/git"
+PV = "1.4.0"
+SRCREV = "60da5491e243c9edd85f6225326a68ae5e3edfd5"
+
+PACKAGECONFIG[man-pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native"
+
+PACKAGECONFIG ?= "man-pages"
+
--- a/recipes-gtk/swaync/swaync_git.bb
+++ b/recipes-gtk/swaync/swaync_git.bb
@ -0,0 +1,41 @@
+SUMMARY = "A simple notification daemon with a GTK gui for notifications and the control center."
+HOMEPAGE = "https://github.com/ErikReider/SwayNotificationCenter"
+BUGTRACKER = "github.com/ErikReider/SwayNotificationCenter"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
+
+
+DEPENDS = " \
+            gtk+3 \
+            gtk-layer-shell \
+            json-glib \
+            libhandy \
+"
+
+SRC_URI = " \
+	git://github.com/ErikReider/SwayNotificationCenter.git;protocol=https;nobranch=1 \
+"
+
+S = "${WORKDIR}/git"
+PV = "0.7.2"
+SRCREV = "2663f6342c63fd3eaa32763224693ef590545c57"
+
+PACKAGECONFIG[bash] = "-Dbash-completions=true,-Dbash-completions=false"
+PACKAGECONFIG[fish] = "-Dfish-completions=true,-Dfish-completions=false"
+PACKAGECONFIG[man-pages] = "-Dman-pages=true,-Dman-pages=false,scdoc-native"
+PACKAGECONFIG[scripting] = "-Dscripting=true,-Dscripting=false"
+PACKAGECONFIG[systemd] = "-Dsystemd-service=true,-Dsystemd-service=false"
+PACKAGECONFIG[zsh] = "-Dzsh-completions=true,-Dzsh-completions=false"
+
+PACKAGECONFIG ?= " \
+	bash \
+"
+
+inherit meson pkgconfig vala
+
+EXTRA_OEMESON += "--buildtype release"
+
+FILES:${PN} += "${datadir}"
+
+BBCLASSEXTEND = ""
+
--- a/recipes-gtk/swaysettings/swaysettings_git.bb
+++ b/recipes-gtk/swaysettings/swaysettings_git.bb
@ -0,0 +1,28 @@
+SUMMARY = "A GUI for configuring your sway desktop"
+HOMEPAGE = "https://github.com/ErikReider/SwaySettings"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
+
+
+DEPENDS = " \
+	accountsservice \
+	glib-2.0 \
+	granite \
+	gtk+3 \
+	gtk-layer-shell \
+	json-glib \
+	libgee \
+	libhandy \
+	libxml2 \
+	xkeyboard-config \
+"
+
+SRC_URI = "git://github.com/ErikReider/SwaySettings.git;protocol=https;nobranch=1"
+
+S = "${WORKDIR}/git"
+PV = "0.3.0"
+SRCREV = "8c7ac50f78eadd65086b68c662514f95e02f8559"
+
+inherit meson pkgconfig vala
+
+FILES:${PN} += "${datadir}"
--- a/recipes-support/waybar/waybar_git.bb
+++ b/recipes-support/waybar/waybar_git.bb
@ -11,12 +11,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=98f7e9dc79966298d76caf1b0a6d35c1"
 REQUIRED_DISTRO_FEATURES = "wayland gobject-introspection-data"

 DEPENDS += " \
+	fmt \
 	glib-2.0-native \
 	gtkmm3 \
 	jsoncpp \
+	libevdev \
 	libsigc++-3 \
-	fmt \
-	spdlog \
+	libxkbcommon \
 	gtk+3 \
 	gobject-introspection \
 	spdlog \
@ -27,6 +28,7 @@ DEPENDS += " \

 PACKAGECONFIG[bluetooth] = "-Drfkill=enabled,-Drfkill=disabled"
 PACKAGECONFIG[date] = ",,date"
+PACKAGECONFIG[experimental] = "-Dexperimental=true,-Dexperimental=false"
 PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
 PACKAGECONFIG[gtk-layer-shell] = ",,gtk-layer-shell"
 PACKAGECONFIG[mpd] = ",,libmpdclient"
@ -44,21 +46,21 @@ PACKAGECONFIG ?= " \
    date \
 "

-RRECOMMENDS_${PN} += " \
+RRECOMMENDS:${PN} += " \
 	font-awesome-otf \
 "

-SRC_URI = "git://github.com/Alexays/Waybar.git;protocol=https"
+SRC_URI = "git://github.com/Alexays/Waybar.git;protocol=https;branch=master"

 S = "${WORKDIR}/git"
-PV = "0.9.7+${SRCREV}"
-SRCREV = "91cdf80c65dcecf16922e4ac724f37471cbad529"
+PV = "0.9.13"
+SRCREV = "4deb6d812d6a34c84b3d4b053c1d9673bc2864d7"

 inherit meson pkgconfig features_check

 PACKAGES += "${PN}-systemd"

-FILES_${PN}-systemd += "${libdir}/systemd"
+FILES:${PN}-systemd += "${libdir}/systemd"

 BBCLASSEXTEND = ""

--- a/recipes-support/asciinema/asciinema_git.bb
+++ b/recipes-support/asciinema/asciinema_git.bb
@ -0,0 +1,17 @@
+SUMMARY = "Terminal session recorder and the best companion of asciinema.org."
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = " \
+	git://github.com/asciinema/asciinema.git;protocol=https;branch=master \
+"
+
+RDEPENDS:${PN} = " \
+	python3 \
+"
+
+inherit python_setuptools_build_meta
+
+S = "${WORKDIR}/git"
+PV = "2.2.0"
+SRCREV = "f3af768f569e0b363bcced11d266d4ed857e21e7"
--- a/recipes-support/dmenu/dmenu-wayland_git.bb
+++ b/recipes-support/dmenu/dmenu-wayland_git.bb
@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c1b51aaede0be292f946ef75b6759e6c"


-SRC_URI = "git://github.com/nyyManni/dmenu-wayland.git;protocol=https \
+SRC_URI = "git://github.com/nyyManni/dmenu-wayland.git;protocol=https;branch=master \
 "

 DEPENDS = " \
--- a/recipes-support/fnott/fnott_git.bb
+++ b/recipes-support/fnott/fnott_git.bb
@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3a7351a597a91e763901f7c76f21e798"
 REQUIRED_DISTRO_FEATURES = "wayland"

 SRC_URI = " \
-	git://codeberg.org/dnkl/fnott.git;protocol=https;branch=releases/1.1 \
+	git://codeberg.org/dnkl/fnott.git;protocol=https;branch=releases/1.3 \
 "

 DEPENDS = " \
@ -24,7 +24,7 @@ DEPENDS = " \
 	wayland-protocols \
 "

-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
 	fontconfig \
 	freetype \
 	wlroots \
@ -33,12 +33,12 @@ RDEPENDS_${PN} = " \
 inherit meson pkgconfig features_check

 S = "${WORKDIR}/git"
-PV = "1.1.0"
-SRCREV = "${PV}"
+PV = "1.3.0"
+SRCREV = "ca03bf5a697b1e392790c62b4fbddb4b1e68bd73"

 EXTRA_OEMESON += "--buildtype release"

 PACKAGES += "${PN}-zsh-completion"
-FILES_${PN}-zsh-completion = "${datadir}/zsh"
+FILES:${PN}-zsh-completion = "${datadir}/zsh"

 BBCLASSEXTEND = ""
--- a/recipes-support/foot/foot/0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch
+++ b/recipes-support/foot/foot/0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch
@ -0,0 +1,44 @@
+From bd6828df037d588c60a30f21fdb83780e8ad0966 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 19 Apr 2022 13:41:21 +0200
+Subject: [PATCH] generate-version.sh: dont try to fetch version from git
+
+---
+ generate-version.sh | 21 ++-------------------
+ 1 file changed, 2 insertions(+), 19 deletions(-)
+
+diff --git a/generate-version.sh b/generate-version.sh
+index a030d512..5114abe0 100755
+--- a/generate-version.sh
+++ b/generate-version.sh
+@@ -15,25 +15,8 @@ out_file=${3}
+ # echo "source directory: ${src_dir}"
+ # echo "output file:      ${out_file}"
+ 
+-if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then
+-    workdir=$(pwd)
+-    cd "${src_dir}"
+-
+-    if git describe --tags  > /dev/null 2>&1; then
+-        git_version=$(git describe --always --tags)
+-    else
+-        # No tags available, happens in e.g. CI builds
+-        git_version="${default_version}"
+-    fi
+-
+-    git_branch=$(git rev-parse --abbrev-ref HEAD)
+-    cd "${workdir}"
+-
+-    new_version="${git_version} ($(date "+%b %d %Y"), branch '${git_branch}')"
+-else
+-    new_version="${default_version}"
+-    extra=""
+-fi
+new_version="${default_version}"
+extra=""
+ 
+ major=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1/')
+ minor=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\2/')
+-- 
+2.25.1
+
--- a/recipes-support/foot/foot_git.bb
+++ b/recipes-support/foot/foot_git.bb
@ -6,8 +6,6 @@ LICENSE = "MIT"

 LIC_FILES_CHKSUM = "file://LICENSE;md5=3a7351a597a91e763901f7c76f21e798"

-REQUIRED_DISTRO_FEATURES = "wayland"
-
 DEPENDS = " \
 	fcft \
 	fontconfig \
@ -16,31 +14,39 @@ DEPENDS = " \
 	pixman \
 	wayland \
 	wayland-native \
-	scdoc-native \
 "

-RRECOMMENDS_${PN} = "xdg-utils"
+RRECOMMENDS:${PN} = "ncurses-terminfo xdg-utils"

 SRC_URI = " \
-	git://codeberg.org/dnkl/foot.git;protocol=https \
+	git://codeberg.org/dnkl/foot.git;protocol=https;branch=releases/1.13 \
+	file://0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch \
 "

 S = "${WORKDIR}/git"
-PV = "1.8.2"
-SRCREV = "${PV}"
+PV = "1.13.1"
+SRCREV = "cd1933baf12eeef82e04a926f9150ca815d54768"

-PACKAGECONFIG[terminfo] = "-Dterminfo=enabled,-Dterminfo=disabled,ncurses-native"
 PACKAGECONFIG[grapheme-clustering] = "-Dgrapheme-clustering=enabled,-Dgrapheme-clustering=disabled,utf8proc"
+PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,scdoc-native"
+PACKAGECONFIG[themes] = "-Dthemes=true,-Dthemes=false"

 PACKAGECONFIG ?= " \
 	grapheme-clustering \
+	themes \
 "

-inherit meson pkgconfig features_check
+EXTRA_OEMESON += "--buildtype=release -Dterminfo=disabled"

-FILES_${PN} = " \
+inherit meson pkgconfig
+
+CFLAGS += "-Wno-unused-but-set-variable"
+
+FILES:${PN} = " \
 	${bindir} \
 	${datadir} \
+	${libdir} \
+	${sysconfdir} \
 "

 BBCLASSEXTEND = ""
--- a/recipes-support/fuzzel/fuzzel_git.bb
+++ b/recipes-support/fuzzel/fuzzel_git.bb
@ -24,8 +24,8 @@ DEPENDS = " \
 "

 S = "${WORKDIR}/git"
-PV = "1.6.1"
-SRCREV = "${PV}"
+PV = "1.6.2"
+SRCREV = "ba5399e5a3bc225a3242a74459a61c729fbca8e5"

 inherit meson pkgconfig features_check

@ -42,6 +42,6 @@ PACKAGECONFIG ?= " \
 EXTRA_OEMESON += "--buildtype release"

 PACKAGES += "${PN}-zsh-completion"
-FILES_${PN}-zsh-completion = "${datadir}/zsh"
+FILES:${PN}-zsh-completion = "${datadir}/zsh"

 BBCLASSEXTEND = ""
--- a/recipes-support/greetd/agreety_git.bb
+++ b/recipes-support/greetd/agreety_git.bb
@ -0,0 +1,65 @@
+SUMMARY = "agreety"
+HOMEPAGE = "https://kl.wtf/projects/agreety"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+SRC_URI += "git://git.sr.ht/~kennylevinsen/greetd;protocol=https;nobranch=1"
+SRCREV = "d70030962341a3ae7a88ecf2f7af748a5a6296d1"
+S = "${WORKDIR}/git"
+PV = "0.8.0"
+
+inherit cargo
+
+CARGO_SRC_DIR = "agreety"
+
+RDEPENDS:${PN} = "greetd"
+
+SRC_URI += " \
+    crate://crates.io/arc-swap/0.4.6 \
+    crate://crates.io/async-trait/0.1.31 \
+    crate://crates.io/autocfg/1.0.1 \
+    crate://crates.io/bitflags/1.2.1 \
+    crate://crates.io/bytes/1.0.1 \
+    crate://crates.io/cc/1.0.53 \
+    crate://crates.io/cfg-if/0.1.10 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/enquote/1.0.3 \
+    crate://crates.io/getopts/0.2.21 \
+    crate://crates.io/itoa/0.4.5 \
+    crate://crates.io/libc/0.2.112 \
+    crate://crates.io/log/0.4.8 \
+    crate://crates.io/memchr/2.3.3 \
+    crate://crates.io/memoffset/0.6.5 \
+    crate://crates.io/mio/0.7.7 \
+    crate://crates.io/miow/0.3.6 \
+    crate://crates.io/nix/0.20.2 \
+    crate://crates.io/ntapi/0.3.4 \
+    crate://crates.io/once_cell/1.5.2 \
+    crate://crates.io/pam-sys/0.5.6 \
+    crate://crates.io/pin-project-lite/0.2.4 \
+    crate://crates.io/proc-macro2/1.0.12 \
+    crate://crates.io/quote/1.0.5 \
+    crate://crates.io/rpassword/5.0.0 \
+    crate://crates.io/ryu/1.0.4 \
+    crate://crates.io/serde/1.0.110 \
+    crate://crates.io/serde_derive/1.0.110 \
+    crate://crates.io/serde_json/1.0.53 \
+    crate://crates.io/signal-hook-registry/1.2.0 \
+    crate://crates.io/socket2/0.3.19 \
+    crate://crates.io/syn/1.0.21 \
+    crate://crates.io/thiserror-impl/1.0.17 \
+    crate://crates.io/thiserror/1.0.17 \
+    crate://crates.io/tokio-macros/1.0.0 \
+    crate://crates.io/tokio/1.0.2 \
+    crate://crates.io/unicode-width/0.1.7 \
+    crate://crates.io/unicode-xid/0.2.0 \
+    crate://crates.io/users/0.11.0 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi/0.3.8 \
+"
+
+do_configure:prepend() {
+    sed -i "s|abort|unwind|" ${S}/Cargo.toml
+}
+
--- a/recipes-support/greetd/greetd/greetd.pam
+++ b/recipes-support/greetd/greetd/greetd.pam
@ -0,0 +1,6 @@
+#%PAM-1.0
+auth        required    pam_unix.so
+account     required    pam_unix.so
+password    required    pam_unix.so
+session     required    pam_unix.so
+
--- a/recipes-support/greetd/greetd_git.bb
+++ b/recipes-support/greetd/greetd_git.bb
@ -0,0 +1,78 @@
+SUMMARY = "greetd is a minimal and flexible login manager daemon that makes no assumptions about what you want to launch."
+HOMEPAGE = "https://kl.wtf/projects/greetd"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+SRC_URI += " \
+    git://git.sr.ht/~kennylevinsen/greetd;protocol=https;nobranch=1 \
+    file://greetd.pam \
+"
+SRCREV = "d70030962341a3ae7a88ecf2f7af748a5a6296d1"
+S = "${WORKDIR}/git"
+PV = "0.8.0"
+
+DEPENDS = "libpam"
+RRECOMMENDS:${PN} ?= "agreety"
+
+inherit cargo
+
+CARGO_SRC_DIR = "greetd"
+
+SRC_URI += " \
+    crate://crates.io/arc-swap/0.4.6 \
+    crate://crates.io/async-trait/0.1.31 \
+    crate://crates.io/autocfg/1.0.1 \
+    crate://crates.io/bitflags/1.2.1 \
+    crate://crates.io/bytes/1.0.1 \
+    crate://crates.io/cc/1.0.53 \
+    crate://crates.io/cfg-if/0.1.10 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/enquote/1.0.3 \
+    crate://crates.io/getopts/0.2.21 \
+    crate://crates.io/itoa/0.4.5 \
+    crate://crates.io/libc/0.2.112 \
+    crate://crates.io/log/0.4.8 \
+    crate://crates.io/memchr/2.3.3 \
+    crate://crates.io/memoffset/0.6.5 \
+    crate://crates.io/mio/0.7.7 \
+    crate://crates.io/miow/0.3.6 \
+    crate://crates.io/nix/0.20.2 \
+    crate://crates.io/ntapi/0.3.4 \
+    crate://crates.io/once_cell/1.5.2 \
+    crate://crates.io/pam-sys/0.5.6 \
+    crate://crates.io/pin-project-lite/0.2.4 \
+    crate://crates.io/proc-macro2/1.0.12 \
+    crate://crates.io/quote/1.0.5 \
+    crate://crates.io/rpassword/5.0.0 \
+    crate://crates.io/ryu/1.0.4 \
+    crate://crates.io/serde/1.0.110 \
+    crate://crates.io/serde_derive/1.0.110 \
+    crate://crates.io/serde_json/1.0.53 \
+    crate://crates.io/signal-hook-registry/1.2.0 \
+    crate://crates.io/socket2/0.3.19 \
+    crate://crates.io/syn/1.0.21 \
+    crate://crates.io/thiserror-impl/1.0.17 \
+    crate://crates.io/thiserror/1.0.17 \
+    crate://crates.io/tokio-macros/1.0.0 \
+    crate://crates.io/tokio/1.0.2 \
+    crate://crates.io/unicode-width/0.1.7 \
+    crate://crates.io/unicode-xid/0.2.0 \
+    crate://crates.io/users/0.11.0 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi/0.3.8 \
+"
+
+do_configure:prepend() {
+    sed -i "s|abort|unwind|" ${S}/Cargo.toml
+}
+
+do_install:append() {
+    install -d ${D}${systemd_system_unitdir} ${D}${sysconfdir}/greetd ${D}${sysconfdir}/pam.d
+    install -m0644 ${S}/greetd.service ${D}${systemd_system_unitdir}
+    install -m0644 ${S}/config.toml ${D}${sysconfdir}/greetd
+    install -m0644 ${WORKDIR}/greetd.pam ${D}${sysconfdir}/pam.d/greetd
+}
+
+FILES:${PN} += "${sysconfdir} ${systemd_system_unitdir}"
+
--- a/recipes-support/greetd/gtkgreet_git.bb
+++ b/recipes-support/greetd/gtkgreet_git.bb
@ -0,0 +1,26 @@
+SUMMARY = "GTK based greeter for greetd, to be run under cage or similar."
+HOMEPAGE = "https://git.sr.ht/~kennylevinsen/gtkgreet"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+DEPENDS = "gtk+3 json-c"
+RDEPENDS:${PN} = "greetd"
+
+PACKAGECONFIG[layershell] = "-Dlayershell=enabled,-Dlayershell=disabled,gtk-layer-shell"
+
+PACKAGECONFIG ?= "layershell"
+
+inherit meson pkgconfig
+
+SRC_URI = "git://git.sr.ht/~kennylevinsen/gtkgreet;protocol=https;branch=master"
+
+S = "${WORKDIR}/git"
+PV = "1.3.2"
+SRCREV = "c09696f6a27aa0e4769fd3f707f27be4407ec95d"
+
+EXTRA_OEMESON += " \
+    --buildtype release \
+    -Dman-pages=disabled \
+"
+
+
--- a/recipes-support/greetd/tuigreet_0.7.3.bb
+++ b/recipes-support/greetd/tuigreet_0.7.3.bb
@ -0,0 +1,147 @@
+SUMMARY = "Graphical console greeter for greetd"
+HOMEPAGE = "https://github.com/apognu/tuigreet.git"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+RDEPENDS:${PN} = "greetd"
+
+SRC_URI = " \
+    git://github.com/apognu/tuigreet.git;protocol=https;nobranch=1 \
+    crate://crates.io/ahash/0.7.6 \
+    crate://crates.io/aho-corasick/0.7.18 \
+    crate://crates.io/async-trait/0.1.53 \
+    crate://crates.io/autocfg/1.1.0 \
+    crate://crates.io/bitflags/1.3.2 \
+    crate://crates.io/block-buffer/0.9.0 \
+    crate://crates.io/block/0.1.6 \
+    crate://crates.io/bytes/1.1.0 \
+    crate://crates.io/cassowary/0.3.0 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/chrono/0.4.19 \
+    crate://crates.io/cpufeatures/0.2.2 \
+    crate://crates.io/crossterm/0.23.2 \
+    crate://crates.io/crossterm_winapi/0.9.0 \
+    crate://crates.io/dashmap/5.3.3 \
+    crate://crates.io/digest/0.9.0 \
+    crate://crates.io/dlv-list/0.3.0 \
+    crate://crates.io/find-crate/0.6.3 \
+    crate://crates.io/fluent-bundle/0.15.2 \
+    crate://crates.io/fluent-langneg/0.13.0 \
+    crate://crates.io/fluent-syntax/0.11.0 \
+    crate://crates.io/fluent/0.16.0 \
+    crate://crates.io/futures-channel/0.3.21 \
+    crate://crates.io/futures-core/0.3.21 \
+    crate://crates.io/futures-executor/0.3.21 \
+    crate://crates.io/futures-io/0.3.21 \
+    crate://crates.io/futures-macro/0.3.21 \
+    crate://crates.io/futures-sink/0.3.21 \
+    crate://crates.io/futures-task/0.3.21 \
+    crate://crates.io/futures-util/0.3.21 \
+    crate://crates.io/futures/0.3.21 \
+    crate://crates.io/generic-array/0.14.5 \
+    crate://crates.io/getopts/0.2.21 \
+    crate://crates.io/getrandom/0.2.6 \
+    crate://crates.io/greetd_ipc/0.8.0 \
+    crate://crates.io/hashbrown/0.12.1 \
+    crate://crates.io/hermit-abi/0.1.19 \
+    crate://crates.io/i18n-config/0.4.2 \
+    crate://crates.io/i18n-embed-fl/0.6.4 \
+    crate://crates.io/i18n-embed-impl/0.8.0 \
+    crate://crates.io/i18n-embed/0.13.4 \
+    crate://crates.io/intl-memoizer/0.5.1 \
+    crate://crates.io/intl_pluralrules/7.0.1 \
+    crate://crates.io/itoa/1.0.1 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.125 \
+    crate://crates.io/locale_config/0.3.0 \
+    crate://crates.io/lock_api/0.4.7 \
+    crate://crates.io/log/0.4.17 \
+    crate://crates.io/malloc_buf/0.0.6 \
+    crate://crates.io/memchr/2.5.0 \
+    crate://crates.io/memoffset/0.6.5 \
+    crate://crates.io/mio/0.8.3 \
+    crate://crates.io/nix/0.24.1 \
+    crate://crates.io/num-integer/0.1.45 \
+    crate://crates.io/num-traits/0.2.15 \
+    crate://crates.io/num_cpus/1.13.1 \
+    crate://crates.io/objc-foundation/0.1.1 \
+    crate://crates.io/objc/0.2.7 \
+    crate://crates.io/objc_id/0.1.1 \
+    crate://crates.io/once_cell/1.10.0 \
+    crate://crates.io/opaque-debug/0.3.0 \
+    crate://crates.io/ordered-multimap/0.4.3 \
+    crate://crates.io/parking_lot/0.12.0 \
+    crate://crates.io/parking_lot_core/0.9.3 \
+    crate://crates.io/pin-project-lite/0.2.9 \
+    crate://crates.io/pin-utils/0.1.0 \
+    crate://crates.io/proc-macro-error-attr/1.0.4 \
+    crate://crates.io/proc-macro-error/1.0.4 \
+    crate://crates.io/proc-macro2/1.0.38 \
+    crate://crates.io/pure-rust-locales/0.5.6 \
+    crate://crates.io/quote/1.0.18 \
+    crate://crates.io/redox_syscall/0.2.13 \
+    crate://crates.io/regex-syntax/0.6.25 \
+    crate://crates.io/regex/1.5.5 \
+    crate://crates.io/rust-embed-impl/6.2.0 \
+    crate://crates.io/rust-embed-utils/7.2.0 \
+    crate://crates.io/rust-embed/6.4.0 \
+    crate://crates.io/rust-ini/0.18.0 \
+    crate://crates.io/rustc-hash/1.1.0 \
+    crate://crates.io/ryu/1.0.9 \
+    crate://crates.io/same-file/1.0.6 \
+    crate://crates.io/scopeguard/1.1.0 \
+    crate://crates.io/self_cell/0.10.2 \
+    crate://crates.io/serde/1.0.137 \
+    crate://crates.io/serde_derive/1.0.137 \
+    crate://crates.io/serde_json/1.0.81 \
+    crate://crates.io/sha2/0.9.9 \
+    crate://crates.io/signal-hook-mio/0.2.3 \
+    crate://crates.io/signal-hook-registry/1.4.0 \
+    crate://crates.io/signal-hook/0.3.13 \
+    crate://crates.io/slab/0.4.6 \
+    crate://crates.io/smallvec/1.8.0 \
+    crate://crates.io/smart-default/0.6.0 \
+    crate://crates.io/smawk/0.3.1 \
+    crate://crates.io/socket2/0.4.5 \
+    crate://crates.io/strsim/0.10.0 \
+    crate://crates.io/syn/1.0.92 \
+    crate://crates.io/textwrap/0.15.0 \
+    crate://crates.io/thiserror-impl/1.0.31 \
+    crate://crates.io/thiserror/1.0.31 \
+    crate://crates.io/time/0.1.43 \
+    crate://crates.io/tinystr/0.3.4 \
+    crate://crates.io/tokio-macros/1.7.0 \
+    crate://crates.io/tokio/1.18.2 \
+    crate://crates.io/toml/0.5.9 \
+    crate://crates.io/tui/0.18.0 \
+    crate://crates.io/type-map/0.4.0 \
+    crate://crates.io/typenum/1.15.0 \
+    crate://crates.io/unic-langid-impl/0.9.0 \
+    crate://crates.io/unic-langid/0.9.0 \
+    crate://crates.io/unicode-linebreak/0.1.2 \
+    crate://crates.io/unicode-segmentation/1.9.0 \
+    crate://crates.io/unicode-width/0.1.9 \
+    crate://crates.io/unicode-xid/0.2.3 \
+    crate://crates.io/version_check/0.9.4 \
+    crate://crates.io/walkdir/2.3.2 \
+    crate://crates.io/wasi/0.10.2+wasi-snapshot-preview1 \
+    crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.5 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/windows-sys/0.36.1 \
+    crate://crates.io/windows_aarch64_msvc/0.36.1 \
+    crate://crates.io/windows_i686_gnu/0.36.1 \
+    crate://crates.io/windows_i686_msvc/0.36.1 \
+    crate://crates.io/windows_x86_64_gnu/0.36.1 \
+    crate://crates.io/windows_x86_64_msvc/0.36.1 \
+    crate://crates.io/zeroize/1.5.5 \
+"
+
+inherit cargo rust
+
+SRCREV = "599d8d5d3657e6c25b3877f84a09979a79256600"
+S = "${WORKDIR}/git"
+PV = "0.7.3"
+
--- a/recipes-support/greetd/wlgreet_git.bb
+++ b/recipes-support/greetd/wlgreet_git.bb
@ -0,0 +1,83 @@
+SUMMARY = "Raw wayland greeter for greetd, to be run under sway or similar."
+HOMEPAGE = "https://git.sr.ht/~kennylevinsen/wlgreet"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+DEPENDS = "wayland wayland-protocols wayland-native"
+RDEPENDS:${PN} = "greetd"
+
+inherit cargo pkgconfig
+
+SRC_URI = "git://git.sr.ht/~kennylevinsen/wlgreet;protocol=https;branch=master"
+
+S = "${WORKDIR}/git"
+PV = "0.3"
+SRCREV = "8517e578cb64a8fb3bd8f8a438cdbe46f208b87c"
+
+SRC_URI += " \
+    crate://crates.io/approx/0.3.2 \
+    crate://crates.io/autocfg/1.0.1 \
+    crate://crates.io/bitflags/1.2.1 \
+    crate://crates.io/byteorder/1.4.3 \
+    crate://crates.io/calloop/0.9.1 \
+    crate://crates.io/cc/1.0.72 \
+    crate://crates.io/cfg-if/0.1.10 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/chrono/0.4.19 \
+    crate://crates.io/dlib/0.5.0 \
+    crate://crates.io/downcast-rs/1.2.0 \
+    crate://crates.io/getopts/0.2.21 \
+    crate://crates.io/greetd_ipc/0.8.0 \
+    crate://crates.io/itoa/0.4.8 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.108 \
+    crate://crates.io/libloading/0.7.2 \
+    crate://crates.io/log/0.4.14 \
+    crate://crates.io/memchr/2.4.1 \
+    crate://crates.io/memmap2/0.3.1 \
+    crate://crates.io/memoffset/0.6.4 \
+    crate://crates.io/minimal-lexical/0.2.1 \
+    crate://crates.io/nix/0.15.0 \
+    crate://crates.io/nix/0.22.2 \
+    crate://crates.io/nom/7.1.0 \
+    crate://crates.io/num-integer/0.1.44 \
+    crate://crates.io/num-traits/0.2.14 \
+    crate://crates.io/once_cell/1.8.0 \
+    crate://crates.io/ordered-float/1.1.1 \
+    crate://crates.io/os_pipe/0.8.2 \
+    crate://crates.io/pkg-config/0.3.22 \
+    crate://crates.io/proc-macro2/1.0.32 \
+    crate://crates.io/quote/1.0.10 \
+    crate://crates.io/rusttype/0.7.9 \
+    crate://crates.io/rusttype/0.8.3 \
+    crate://crates.io/ryu/1.0.5 \
+    crate://crates.io/scoped-tls/1.0.0 \
+    crate://crates.io/serde/1.0.130 \
+    crate://crates.io/serde_derive/1.0.130 \
+    crate://crates.io/serde_json/1.0.71 \
+    crate://crates.io/smallvec/1.7.0 \
+    crate://crates.io/smithay-client-toolkit/0.15.2 \
+    crate://crates.io/stb_truetype/0.3.1 \
+    crate://crates.io/syn/1.0.81 \
+    crate://crates.io/thiserror-impl/1.0.30 \
+    crate://crates.io/thiserror/1.0.30 \
+    crate://crates.io/time/0.1.44 \
+    crate://crates.io/toml/0.5.8 \
+    crate://crates.io/unicode-width/0.1.9 \
+    crate://crates.io/unicode-xid/0.2.2 \
+    crate://crates.io/version_check/0.9.3 \
+    crate://crates.io/void/1.0.2 \
+    crate://crates.io/wasi/0.10.0+wasi-snapshot-preview1 \
+    crate://crates.io/wayland-client/0.29.1 \
+    crate://crates.io/wayland-commons/0.29.1 \
+    crate://crates.io/wayland-cursor/0.29.1 \
+    crate://crates.io/wayland-protocols/0.29.1 \
+    crate://crates.io/wayland-scanner/0.29.1 \
+    crate://crates.io/wayland-sys/0.29.1 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/xcursor/0.3.4 \
+    crate://crates.io/xml-rs/0.8.4 \
+"
+
--- a/recipes-support/grim/grim_git.bb
+++ b/recipes-support/grim/grim_git.bb
@ -11,22 +11,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1"
 REQUIRED_DISTRO_FEATURES = "wayland"

 DEPENDS += " \
-	cairo \
+	pixman \
+	libpng \
 	jpeg \	
 	wayland \
 	wayland-native \
 	wayland-protocols \
-           "
+"

-SRC_URI = "git://github.com/emersion/grim.git;protocol=https"
+SRC_URI = "git://git.sr.ht/~emersion/grim;protocol=https;branch=master"

 S = "${WORKDIR}/git"
-PV = "1.3.2"
-SRCREV = "v${PV}"
+PV = "1.4.0"
+SRCREV = "89e02e663fabc534b7e7039514f60a8c5d70070d"

 inherit meson pkgconfig features_check

-EXTRA_OEMESON += "--buildtype release"
+EXTRA_OEMESON = "--buildtype release"

 BBCLASSEXTEND = ""

--- a/recipes-support/imv/imv_git.bb
+++ b/recipes-support/imv/imv_git.bb
@ -1,45 +0,0 @@
-SUMMARY = "imv - X11/Wayland Image Viewer"
-DESCRIPTION = "imv is a command line image viewer intended for use with tiling window managers."
-HOMEPAGE = "https://github.com/eXeC64/imv"
-SECTION = "graphics"
-LICENSE = "MIT"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dcea6b87dbecf6c482d399a15ff8ba49"
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-DEPENDS += " \
-	glib-2.0 \
-	libxkbcommon \
-	pango \
-	cairo \
-	icu \
-	inih \
-	wayland \
-	wayland-native \
-	wayland-protocols \
-	virtual/egl \
-"
-
-PACKAGECONFIG[x11] = "-Dwindows=all,-Dwindows=wayland,libx11 libglu xcb-util-renderutil"
-PACKAGECONFIG[tiff] = ",,tiff"
-PACKAGECONFIG[png] = ",,libpng"
-PACKAGECONFIG[jpeg] = ",,libjpeg-turbo"
-#librsvg shipped in oe-core is too old ... requires v2.44
-PACKAGECONFIG[rsvg] = ",,librsvg"
-
-PACKAGECONFIG ?= " \
-	jpeg \
-	png \
-	tiff \
-"
-
-SRC_URI = "git://github.com/eXeC64/imv.git;protocol=https"
-
-S = "${WORKDIR}/git"
-PV = "4.2.0"
-SRCREV = "v${PV}"
-
-inherit meson pkgconfig mime-xdg features_check
-
-BBCLASSEXTEND = ""
--- a/recipes-support/kanshi/kanshi_git.bb
+++ b/recipes-support/kanshi/kanshi_git.bb
@ -0,0 +1,32 @@
+SUMMARY = "kanshi allows you to define output profiles that are automatically enabled and disabled on hotplug."
+HOMEPAGE = "https://git.sr.ht/~emersion/kanshi"
+SECTION = "Wayland"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=706cd9899438a9385250ab6773c1fa53"
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+SRC_URI = " \
+	git://git.sr.ht/~emersion/kanshi;protocol=https;branch=master \
+"
+
+DEPENDS = "wayland wayland-native"
+
+inherit meson pkgconfig features_check
+
+PACKAGECONFIG[ipc] = "-Dipc=enabled,-Dipc=disabled,libvarlink"
+PACKAGECONFIG[man-pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native"
+
+PACKAGECONFIG ?= " \
+	ipc \
+"
+
+S = "${WORKDIR}/git"
+PV = "1.2.0"
+SRCREV = "992c1954a6a00a3f66882c9eb75d74c2dbcbe25c"
+
+EXTRA_OEMESON += "--buildtype release"
+
+BBCLASSEXTEND = ""
+
--- a/recipes-support/mako/files/0001-meson.build-fix-scdoc-not-to-be-found.patch
+++ b/recipes-support/mako/files/0001-meson.build-fix-scdoc-not-to-be-found.patch
@ -1,26 +0,0 @@
-From a8fa47e90bddccfe6dd9f267dd7a189793c8adca Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Mon, 2 Aug 2021 06:59:38 +0200
-Subject: [PATCH] meson.build: fix scdoc not to be found
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 180f0fb..0973213 100644
--- a/meson.build
-+++ b/meson.build
-@@ -130,7 +130,7 @@ configure_file(
- 	install_dir: datadir + '/dbus-1/services',
- )
- 
-scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7')
-+scdoc = dependency('scdoc', native: true, required: get_option('man-pages'), version: '>= 1.9.7') 
- 
- if scdoc.found()
- 	sh = find_program('sh')
-- 
-2.25.1
-
--- a/recipes-support/mako/mako/0001-meson.build-make-epoll-shim-dependency-optional.patch
+++ b/recipes-support/mako/mako/0001-meson.build-make-epoll-shim-dependency-optional.patch
@ -0,0 +1,28 @@
+From e7973e352b8649b10053f3feb82134d9cefb851e Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 17 May 2022 19:00:02 +0200
+Subject: [PATCH] meson.build: make epoll-shim dependency optional
+
+After updating my host system, meson.build tries to depend on the epoll-shim.
+Since we are not on BSD, we dont have it and it is not needed. Make the
+dependency on it optional.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 84abdcb..9687b23 100644
+--- a/meson.build
+++ b/meson.build
+@@ -35,7 +35,7 @@ wayland_cursor = dependency('wayland-cursor')
+ epoll = dependency('', required: false)
+ if (not cc.has_function('timerfd_create', prefix: '#include <sys/timerfd.h>') or
+     not cc.has_function('signalfd', prefix: '#include <sys/signalfd.h>'))
+-	epoll = dependency('epoll-shim')
+	epoll = dependency('epoll-shim', required: false)
+ endif
+ 
+ if get_option('sd-bus-provider') == 'auto'
+-- 
+2.25.1
+
--- a/recipes-support/mako/mako_git.bb
+++ b/recipes-support/mako/mako_git.bb
@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1"
 REQUIRED_DISTRO_FEATURES = "wayland"

 SRC_URI = " \
-	git://github.com/emersion/mako.git;protocol=https \
-	file://0001-meson.build-fix-scdoc-not-to-be-found.patch \
+	git://github.com/emersion/mako.git;protocol=https;branch=master \
+	file://0001-meson.build-make-epoll-shim-dependency-optional.patch \
 "

 DEPENDS = " \
@ -21,9 +21,9 @@ DEPENDS = " \
 	wayland-protocols \
 "

-RDEPENDS_${PN} = "dbus"
+RDEPENDS:${PN} = "dbus"

-RRECOMMENDS_${PN} = "jq"
+RRECOMMENDS:${PN} = "jq"

 inherit meson pkgconfig features_check

@ -41,11 +41,11 @@ PACKAGECONFIG ?= " \

 S = "${WORKDIR}/git"
 PV = "1.6"
-SRCREV = "v${PV}"
+SRCREV = "ddc1849804c8703ec749140e3a55febb5250e934"

 EXTRA_OEMESON += "--buildtype release"

-FILES_${PN} += "${datadir}"
+FILES:${PN} += "${datadir}"

 BBCLASSEXTEND = ""

--- a/recipes-support/nwg-shell/azote_git.bb
+++ b/recipes-support/nwg-shell/azote_git.bb
@ -1,41 +0,0 @@
-SUMMARY = "Azote is a GTK+3 based frontend for swaybg."
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
-
-SRC_URI = " \
-	git://github.com/nwg-piotr/azote.git;protocol=https \
-"
-
-RDEPENDS_${PN} = " \
-	python3 \
-	gtk+3 \
-	python3-pygobject \
-	python3-pycairo \
-	python3-pillow \
-	python3-pkg-resources \
-	python3-send2trash \
-	imagemagick \
-	grim \
-	slurp \
-	swaybg \
-"
-
-inherit setuptools3
-
-S = "${WORKDIR}/git"
-PV = "1.9.1"
-SRCREV = "v${PV}"
-
-do_install_append() {
-	install -d ${D}${bindir} ${D}${datadir}/azote ${D}${datadir}/pixmaps ${D}${datadir}/applications
-	install -m 755 ${S}/dist/azote ${D}${bindir}
-	install -m 644 ${S}/dist/azote.desktop ${D}${datadir}/applications
-	install -m 644 ${S}/dist/azote.svg ${D}${datadir}/pixmaps
-	install -m 644 ${S}/dist/indicator_active.png ${D}${datadir}/azote
-	install -m 644 ${S}/dist/indicator_attention.png ${D}${datadir}/azote
-}
-
-FILES_${PN}_append = " \
-	${datadir} \
-	${bindir} \
-"
--- a/recipes-support/nwg-shell/nwg-dock_git.bb
+++ b/recipes-support/nwg-shell/nwg-dock_git.bb
@ -1,25 +0,0 @@
-SUMMARY = "GTK3-based dock for wlroots based compositors."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=fffa55ad1c828db5e334374fb1182530"
-
-DEPENDS = " \
-	gtk+3 \
-	gtk-layer-shell \
-"
-
-GO_IMPORT = "github.com/nwg-piotr/nwg-dock.git"
-
-SRC_URI = "git://${GO_IMPORT};nobranch=1"
-
-PV = "0.1.5"
-SRCREV = "v${PV}"
-
-inherit go go-mod
-
-GO_INSTALL = "${GO_IMPORT}"
-
-do_install_append() {
-	# remove precompiled x86 binary
-	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
-}
-
--- a/recipes-support/nwg-shell/nwg-launchers/0001-nwg_tools.cc-fix-build-without-gdk-x11.patch
+++ b/recipes-support/nwg-shell/nwg-launchers/0001-nwg_tools.cc-fix-build-without-gdk-x11.patch
@ -1,26 +0,0 @@
-From 2520ce268d028e775179f9a48903827c56399528 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Tue, 27 Jul 2021 03:47:22 +0200
-Subject: [PATCH] nwg_tools.cc: fix build without gdk-x11
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
- common/nwg_tools.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/common/nwg_tools.cc b/common/nwg_tools.cc
-index 834a9e3..92bae6a 100644
--- a/common/nwg_tools.cc
-+++ b/common/nwg_tools.cc
-@@ -83,7 +83,7 @@ std::string detect_wm(const Glib::RefPtr<Gdk::Display>& display, const Glib::Ref
-      * but let's try to find a WM name if possible. If not, let it be just "other" */
-     std::string wm_name{"other"};
- 
-#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_GDK_X11
-     {
-         auto* g_display = display->gobj();
-         auto* g_screen  = screen->gobj();
-- 
-2.25.1
-
--- a/recipes-support/nwg-shell/nwg-panel_git.bb
+++ b/recipes-support/nwg-shell/nwg-panel_git.bb
@ -1,24 +0,0 @@
-SUMMARY = "GTK3-based panel for wayland."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fffa55ad1c828db5e334374fb1182530"
-
-SRC_URI = " \
-	git://github.com/nwg-piotr/nwg-panel.git;protocol=https \
-"
-
-RDEPENDS_${PN} = "\
-	light \
-	python3 \
-	python3-pygobject \
-	python3-psutil \
-	python-i3ipc \
-"
-
-inherit setuptools3
-
-S = "${WORKDIR}/git"
-PV = "0.3.3"
-SRCREV = "v${PV}"
-
-INSANE_SKIP_${PN} = "file-rdeps"
-
--- a/recipes-support/nwg-shell/nwg-wrapper_git.bb
+++ b/recipes-support/nwg-shell/nwg-wrapper_git.bb
@ -1,17 +0,0 @@
-SUMMARY = "GTK3-based wrapper to display a script output, or a text file content on the desktop in wlroots-based compositors."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fffa55ad1c828db5e334374fb1182530"
-
-SRC_URI = " \
-	git://github.com/nwg-piotr/nwg-wrapper.git;protocol=https \
-"
-
-DEPENDS = "python3"
-RDEPENDS_${PN} = "python3-pygobject"
-
-inherit setuptools3 gobject-introspection
-
-S = "${WORKDIR}/git"
-PV = "0.0.2"
-SRCREV = "v${PV}"
-
--- a/recipes-support/slurp/slurp_git.bb
+++ b/recipes-support/slurp/slurp_git.bb
@ -19,11 +19,11 @@ DEPENDS += " \
 	wayland-protocols \
           "

-SRC_URI = "git://github.com/emersion/slurp.git;protocol=https"
+SRC_URI = "git://github.com/emersion/slurp.git;protocol=https;branch=master"

 S = "${WORKDIR}/git"
 PV = "1.3.2"
-SRCREV = "v${PV}"
+SRCREV = "f4e75594c3234519fe8b795a1163dfa31d2e7f3a"

 inherit meson pkgconfig features_check

--- a/Show More
+++ b/Show More