python3: move python link to its own python3-as-python package

the FILES is overriden in the python anonymous function for dynamic packages
(python3-core)

causing the following error:

```log
ERROR: python3-3.12.8-r0 do_package: QA Issue: python3: Files/directories were installed but not shipped in any package:
  /usr/bin/python
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
python3: 1 installed and not shipped files. [installed-vs-shipped]
ERROR: python3-3.12.8-r0 do_package: Fatal QA errors were found, failing task.
```

it is safer to make a new package split and add a RRECOMMENDS to python-core
on it

fixes:
https://codeberg.org/flk/meta-wayland/issues/14

Signed-off-by: Ludovic Jozeau <ludovic.jozeau@scle.fr>

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: honister
+        branch: master
         revision: HEAD
     URI: git://github.com/openembedded/meta-openembedded
-        branch: honister
+        branch: master
         revision: HEAD
 
 Building

conf/layer.conf

@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "wayland"
 BBFILE_PATTERN_wayland = "^${LAYERDIR}/"
 BBFILE_PRIORITY_wayland = "8"
 
-LAYERSERIES_COMPAT_wayland = "honister"
+LAYERSERIES_COMPAT_wayland = "kirkstone"
 
 LAYERDEPENDS_wayland = " \
 	core \

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"
 

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"
+
+do_install:prepend() {
+	install -d ${D}${libdir}/elogind/system-shutdown
+	install -d ${D}${libdir}/elogind/system-sleep
+}
 
 FILES:${PN} += "/usr"
 

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.6.3"
-SRCREV = "${PV}"
-
-inherit meson
-
-EXTRA_OEMESON += "--buildtype release"
-

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
+
+	

recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch

@@ -1,42 +0,0 @@
-From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Tue, 3 Jul 2018 13:59:09 +0100
-Subject: [PATCH] Make CPU family warnings fatal
-
-Upstream-Status: Inappropriate [OE specific]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
----
- mesonbuild/envconfig.py   | 2 +-
- mesonbuild/environment.py | 4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 307aac3..66fb7ec 100644
---- a/mesonbuild/envconfig.py
-+++ b/mesonbuild/envconfig.py
-@@ -267,7 +267,7 @@ class MachineInfo(HoldableObject):
- 
-         cpu_family = literal['cpu_family']
-         if cpu_family not in known_cpu_families:
--            mlog.warning(f'Unknown CPU family {cpu_family}, please report this at https://github.com/mesonbuild/meson/issues/new')
-+            raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))
- 
-         endian = literal['endian']
-         if endian not in ('little', 'big'):
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 71286a5..179917e 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -352,9 +352,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
-             trial = 'ppc64'
- 
-     if trial not in known_cpu_families:
--        mlog.warning(f'Unknown CPU family {trial!r}, please report this at '
--                     'https://github.com/mesonbuild/meson/issues/new with the '
--                     'output of `uname -a` and `cat /proc/cpuinfo`')
-+        raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
- 
-     return trial
- 
-

recipes-devtools/meson/meson_%.bbappend

@@ -1,9 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-SRC_URI:remove = "           file://0003-native_bindir.patch \"
-SRC_URI:remove = "           file://gi-target-dep.patch \"
-
-PV = "0.59.0"
-SRC_URI[sha256sum] = "e376c298df64b643dfe01eccb2d7b6f1e02e95aa38c19f19d120d129612ce476"
-
-

recipes-devtools/python/python-brotli_git.bb

@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=941ee9cd1609382f946352712a319b4b"
 inherit cmake setuptools3
 
 SRC_URI = " \
-    git://github.com/google/brotli.git;protocol=https \
+    git://github.com/google/brotli.git;protocol=https;branch=master \
 "
 
 PV = "1.0.9"
-SRCREV = "v${PV}"
+SRCREV = "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release"

recipes-devtools/python/python-i3ipc.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} = " \
 	python3 \
 	python-xlib \
 "
 
-inherit setuptools3
+inherit setuptools3 pypi
 
-S = "${WORKDIR}/git"
 PV = "2.2.1"
-SRCREV = "v${PV}"
 
+SRC_URI[sha256sum] = "e880d7d7147959ead5cb34764f08b97b41385b36eb8256e8af1ce163dbcccce8"

recipes-devtools/python/python-xlib_git.bb

@@ -1,16 +1,17 @@
 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} = " \
 	python3 \	
 	python3-six \
@@ -20,5 +21,5 @@ inherit setuptools3
 
 S = "${WORKDIR}/git"
 PV = "0.31"
-SRCREV = "${PV}"
+SRCREV = "a734526ed33fe446396e32649e8895dde679f52c"
 

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"
+

recipes-devtools/python/python3_%.bbappend

@@ -0,0 +1,8 @@
+do_install:append:class-target() {
+	ln -sf ${bindir}/python3 ${D}${bindir}/python
+}
+
+PACKAGES:prepend:class-target = "${PN}-as-python "
+FILES:${PN}-as-python = "${bindir}/python"
+RRECOMMENDS:${PN}-core:append:class-target = " ${PN}-as-python"
+

recipes-extended/autotiling/autotiling-rs_git.bb

@@ -3,7 +3,7 @@ LICENSE = "WTFPL"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/WTFPL;md5=7993e3336259bdb618ad5a1afc872165"
 
 SRC_URI = " \
-	git://github.com/ammgws/autotiling-rs.git;protocol=https \
+	git://github.com/ammgws/autotiling-rs.git;protocol=https;branch=master \
 	crate://crates.io/clap/2.33.3 \
 	crate://crates.io/swayipc/2.7.2 \
 	crate://crates.io/bitflags/1.2.1 \
@@ -35,5 +35,5 @@ inherit rust cargo
 
 S = "${WORKDIR}/git"
 PV = "0.1.3"
-SRCREV = "v${PV}"
+SRCREV = "d5b66b6cc23014aeda8da4c4fe561d366d9892b7"
 

recipes-extended/autotiling/autotiling_git.bb

@@ -3,7 +3,7 @@ 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"
@@ -13,6 +13,6 @@ RDEPENDS:${PN} = "python-i3ipc"
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "1.5"
-SRCREV = "v${PV}"
+PV = "1.6"
+SRCREV = "dbdbfa10115c23c987d63f66f0661b7039885735"
 

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}"
+

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
 
@@ -24,9 +24,3 @@ EXTRA_OECMAKE += " \
 	-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
-}
-	

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

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@
+

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
+

recipes-extended/fcft/fcft_git.bb

@@ -12,19 +12,20 @@ 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.0 \
+	file://0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch \
 "
 
 S = "${WORKDIR}/git"
-PV = "2.5.0"
-SRCREV = "${PV}"
+PV = "3.0.1"
+SRCREV = "e964c3677e35ce44a4bd8bf6f0b85d8f9119e8a6"
 
 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"
 

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}"
+

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.4"
-SRCREV = "${PV}"
+PV = "6.1.1"
+SRCREV = "28e297f07af26f148c15e6cbbd12cea3027371d3"
 
 
 do_install () {

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}"
+

recipes-extended/highway/highway_git.bb

@@ -7,12 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9"
 inherit cmake
 
 SRC_URI = " \
-    git://github.com/google/highway.git;protocol=https \
+    git://github.com/google/highway.git;protocol=https;branch=master \
 "
 
-PV = "0.14.2"
-SRCREV = "${PV}"
+PV = "0.15.0"
+SRCREV = "e69083a12a05caf037cabecdf1b248b7579705a5"
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release"
-
+CXXFLAGS:append:arm = " -mfp16-format=ieee"

recipes-extended/inih/inih_git.bb

@@ -1,18 +0,0 @@
-SUMMARY = "inih (INI Not Invented Here)"
-DESCRIPTION = "A .INI file parser written in C that was designed to be small and simple."
-HOMEPAGE = "https://github.com/benhoyt/inih"
-SECTION = "libs"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7a95d2af90376e85a05318794e6f202"
-
-SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https"
-
-S = "${WORKDIR}/git"
-PV = "53"
-SRCREV = "r${PV}"
-
-inherit meson pkgconfig
-
-BBCLASSEXTEND = ""
-

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 = ""
+

recipes-extended/libwmf/libwmf_%.bbappend

@@ -1,3 +0,0 @@
-DEPENDS:remove = "gtk+"
-DEPENDS:append = " gtk+3"
-

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"
 

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
+	

recipes-extended/scdoc/scdoc_git.bb

@@ -6,14 +6,14 @@ 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"

recipes-extended/sofia-sip/sofia-sip_1.13.7 .bb

@@ -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 = "1607ade8b6d1c4f82379c7489e7573a769b61994"
+PV = "1.13.7"
+
+SRC_URI = "git://github.com/freeswitch/sofia-sip.git;protocol=https;branch=master"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF += "--with-glib"
+

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}"
+SRCREV = "f2d806fe3e63a4f8b2da45883764c79696380e51"
 
 inherit meson pkgconfig
 

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}"
 

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
+

recipes-graphics/aalib/aalib_1.4.0.bb

@@ -4,7 +4,7 @@ SECTION = "libs"
 
 DEPENDS = "ncurses"
 
-LICENSE = "LGPLv2"
+LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
 S = "${WORKDIR}/aalib-1.4.0"

recipes-graphics/libjxl/libjxl_git.bb

@@ -9,11 +9,11 @@ inherit cmake pkgconfig
 DEPENDS = "highway brotli"
 
 SRC_URI = " \
-    gitsm://github.com/libjxl/libjxl.git;protocol=https;branch=v0.6.x \
+    gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1 \
 "
 
-PV = "0.6"
-SRCREV = "v${PV}"
+PV = "0.6.1"
+SRCREV = "a205468bc5d3a353fb15dae2398a101dff52f2d3"
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = " \
@@ -32,3 +32,6 @@ EXTRA_OECMAKE = " \
 	-DJPEGXL_ENABLE_TCMALLOC=OFF \
 	-DJPEGXL_ENABLE_TOOLS=OFF \
 "
+
+CXXFLAGS:append:arm = " -mfp16-format=ieee"
+ 

recipes-graphics/libsdl2/libsdl2_%.bbappend

@@ -1,7 +0,0 @@
-SRC_URI = "git://github.com/libsdl-org/SDL.git;branch=main;protocol=https"
-S = "${WORKDIR}/git"
-PV = "2.0.16+${SRCREV}"
-SRCREV = "ab09f3dae5bf89f17ef92d78ff7e5d2fde9c14b8"
-
-EXTRA_OECONF:remove = "--enable-sdl-dlopen"
-

recipes-graphics/wayland/wayland-protocols_%.bbappend

@@ -1,3 +0,0 @@
-PV = "1.23"
-SRC_URI[sha256sum] = "6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76"
-

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"
-

recipes-graphics/wayland/waylandpp_git.bb

@@ -0,0 +1,39 @@
+SUMMARY = " C++ binding for Wayland using the most modern C++ technology"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3aae28cc66d61975114c2b14df215407"
+
+SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master"
+
+DEPENDS = "pugixml"
+DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2"
+
+S = "${WORKDIR}/git"
+SRCREV = "4321ed5c7b4bffa41b8a2a13dc7f3ece1191f4f3"
+PV = "1.0.0"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE:class-native = " \
+	-DBUILD_SCANNER=ON \
+	-DBUILD_LIBRARIES=OFF \
+	-DBUILD_DOCUMENTATION=OFF \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_VERBOSE_MAKEFILE=TRUE \
+"
+
+EXTRA_OECMAKE:class-target = " \
+	-DBUILD_SCANNER=ON \
+	-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" \
+"
+
+BBCLASSEXTEND += "native nativesdk"
+

recipes-graphics/xorg-lib/libxkbcommon_%.bbappend

@@ -1,5 +0,0 @@
-PACKAGECONFIG[xkbregistry] = "-Denable-xkbregistry=true,-Denable-xkbregistry=false,libxml2"
-PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native"
-
-PACKAGECONFIG:append = " xkbregistry"
-

recipes-gtk/calls/calls_42.0.bb

@@ -0,0 +1,32 @@
+SUMMARY = "A phone dialer and call handler."
+LICENSE = "GPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+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 \
+    sofia-sip \
+"
+
+inherit gnomebase vala pkgconfig mime-xdg
+
+SRC_URI[archive.sha256sum] = "784bbc4a1347965d4bdbd0d552bd4a4a88aa0f9370c10e6c2f1297e889611f9a"
+
+FILES:${PN} += "${datadir}"
+

recipes-gtk/gimp/gegl_%.bbappend

@@ -1,4 +0,0 @@
-SRC_URI:remove = "    file://0001-Fix-build-with-OpenEXR-3.patch \"
-PV = "0.4.32"
-SRC_URI[sha256sum] = "668e3c6b9faf75fb00512701c36274ab6f22a8ba05ec62dbf187d34b8d298fa1"
-

recipes-gtk/gimp/gimp_git.bb

@@ -1,7 +1,7 @@
 SUMMARY = "The GIMP is the GNU Image Manipulation Program"
 HOMEPAGE = "http://www.gimp.org"
 SECTION = "graphics"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
 
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
@@ -27,6 +27,7 @@ DEPENDS = " \
     libarchive \
     libexif \
     libmypaint \
+    libpng \
     libxslt-native \
     mypaint-brushes-1.0 \
     pango \
@@ -37,15 +38,16 @@ DEPENDS = " \
 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
+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 \
-    file://0001-meson-make-gir-buildable.patch \
+    git://github.com/GNOME/gimp.git;protocol=https;branch=master \
 "
 
 S = "${WORKDIR}/git"
-SRCREV = "GIMP_2_99_8"
+SRCREV = "618e11e602418e8c9639991b73a2a7f2b302ac38"
+PV = "2.99.10"
 
 PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib"
 PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
@@ -56,9 +58,9 @@ 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[gtk-doc] = "-Dgtk-doc=true,-Dgtk-doc=false,gtk-doc-native"
-PACKAGECONFIG[gtk-doc-app] = "-Dgtk-doc-app=true,-Dgtk-doc-app=false,gtk-doc-native"
+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"
@@ -68,13 +70,11 @@ PACKAGECONFIG[libbacktrace] = ",,libbacktrace"
 PACKAGECONFIG[lua] = "-Dlua=true,-Dlua=false,,luajit lgi"
 PACKAGECONFIG[lzma] = ",,xz"
 PACKAGECONFIG[mng] = "-Dmng=enabled,-Dmng=disabled,libmng"
-PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng"
 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[vec-icons] = "-Dvec-icons=true,-Dvec-icons=false,librsvg shared-mime-info"
-PACKAGECONFIG[webkit] = "-Dwebkit=enabled,-Dwebkit=disabled,webkitgtk"
+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 libxmu libxext libxfixes"
@@ -86,7 +86,6 @@ PACKAGECONFIG ?= " \
     alsa \
     bzip2 \
     cairo-pdf \
-    gtk-doc-app \
     gudev \
     jpeg \
     jpeg2000 \
@@ -94,11 +93,11 @@ PACKAGECONFIG ?= " \
     lua \
     lzma \
     mng \
-    png \
     python \
     rsvg \
     tiff \
-    vec-icons \
+    vala-plugins \
+    vector-icons \
     webp \
     zlib \
 "
@@ -113,6 +112,7 @@ FILES:${PN} += " \
 EXTRA_OEMESON += " \
     -Dshmem-type=posix \
     -Dlinux-input=enabled \
+    -Dcan-crosscompile-gir=true \
     --buildtype release \
 "
 

recipes-gtk/gtk-layer-shell/gtk-layer-shell_git.bb

@@ -14,15 +14,15 @@ DEPENDS += " \
 	wayland-native \
 "
 
-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"
 
 S = "${WORKDIR}/git"
-PV = "0.6.0+${SRCREV}"
-SRCREV = "b5e0bbc7f2ac632a65db29193fa384baeb23a96c"
+PV = "0.7.0"
+SRCREV = "ca37ef1baa623302dda5fcea200d04e0d9a10578"
 
-inherit meson pkgconfig features_check gobject-introspection
+inherit meson pkgconfig features_check gobject-introspection vala
 
-EXTRA_OEMESON += "--buildtype release"
+EXTRA_OEMESON += "--buildtype release -Dvapi=true"
 
 FILES:${PN} = "${datadir} ${libdir}"
 

recipes-gtk/nwg-shell/azote_git.bb

@@ -3,7 +3,7 @@ LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
 
 SRC_URI = " \
-	git://github.com/nwg-piotr/azote.git;protocol=https \
+	git://github.com/nwg-piotr/azote.git;protocol=https;branch=master \
 "
 
 RDEPENDS:${PN} = " \
@@ -23,16 +23,20 @@ RDEPENDS:${PN} = " \
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "1.9.1"
-SRCREV = "v${PV}"
+PV = "1.9.3"
+SRCREV = "c4ccd502c27fa6eb801a7b2b0636aed09e8c4a12"
+
+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}/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
+	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 = " \

recipes-gtk/nwg-shell/gopsuinfo_git.bb

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=22ed6cb3c33862e689e075b4
 
 GO_IMPORT = "github.com/nwg-piotr/gopsuinfo.git"
 
-SRC_URI = "git://${GO_IMPORT};branch=main"
+SRC_URI = "git://${GO_IMPORT};branch=main;protocol=https"
 
 SRCREV = "838b4893f48924bb03f5124701754836562d090a"
 
@@ -17,3 +17,5 @@ do_install:append() {
 	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
 }
 
+do_compile[network] = "1"
+

recipes-gtk/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"
 

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://nwg_displays/main.py;;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489"
+
+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.2"
+SRCREV = "d8e3dee27c2f55039e6a3748ef98f9131be761c2"
+
+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
+}
+

recipes-gtk/nwg-shell/nwg-dock_git.bb

@@ -9,18 +9,20 @@ DEPENDS = " \
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-dock.git"
 
-SRC_URI = "git://${GO_IMPORT};nobranch=1"
+SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
 
-PV = "0.2.0"
-SRCREV = "v${PV}"
+PV = "0.2.2"
+SRCREV = "204582169596597095109727302fec51f930c91e"
 
-inherit go go-mod
+inherit go go-mod pkgconfig
 
 GO_INSTALL = "${GO_IMPORT}"
 
 do_install:append() {
 	# remove precompiled x86 binaries
-	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
-	rm -r ${D}${libdir}/go/pkg/mod/github.com/dlasky/gotk3-layershell*/example
+	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"
+

recipes-gtk/nwg-shell/nwg-drawer_git.bb

@@ -14,10 +14,10 @@ RRECOMMENDS:${PN} = " \
 
 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.2.1"
-SRCREV = "v${PV}"
+PV = "0.2.8"
+SRCREV = "d05059808656b727851c01dfd4ea56ca46151a75"
 
 inherit go go-mod pkgconfig
 
@@ -25,7 +25,9 @@ GO_INSTALL = "${GO_IMPORT}"
 
 do_install:append() {
 	# remove precompiled x86 binary
-	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
-	rm -r ${D}${libdir}/go/pkg/mod/github.com/dlasky/gotk3-layershell*/example
+	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"
+

recipes-gtk/nwg-shell/nwg-launchers_git.bb

@@ -25,9 +25,9 @@ PACKAGECONFIG ?= " \
 "
 
 SRC_URI = " \
-	git://github.com/nwg-piotr/nwg-launchers.git;protocol=https \
+	git://github.com/nwg-piotr/nwg-launchers.git;protocol=https;branch=master \
 "
-SRCREV = "v${PV}"
+SRCREV = "4dde40e2a0d82ae87a262e0c2babd22e309d28bf"
 PV = "0.6.3"
 
 S = "${WORKDIR}/git"

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 = "36b6d80f20244d6886efd6e1f1fcff75bc3281c2"
+PV = "0.1.2"
+
+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}/icons/hicolor/scalable/apps
+	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}/icons/hicolor/scalable/apps
+}
+
+FILES:${PN} += "${datadir}"
+
+do_compile[network] = "1"
+

recipes-gtk/nwg-shell/nwg-menu_git.bb

@@ -16,17 +16,19 @@ RRECOMMENDS:${PN} = " \
 
 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() {
 	# 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"
+

recipes-gtk/nwg-shell/nwg-panel_git.bb

@@ -3,26 +3,22 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fffa55ad1c828db5e334374fb1182530"
 
 SRC_URI = " \
-	git://github.com/nwg-piotr/nwg-panel.git;protocol=https \
+	git://github.com/nwg-piotr/nwg-panel.git;protocol=https;branch=master \
 "
 
 RDEPENDS:${PN} = "\
+	bash \
 	light \
 	python3 \
 	python3-pygobject \
 	python3-psutil \
 	python-i3ipc \
+	swaync \
 "
 
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "0.4.3"
-SRCREV = "v${PV}"
-
-do_install:append() {
-	rm  ${D}${libdir}/python3.9/site-packages/nwg_panel/executors/arch_updates.py
-}
-
-INSANE_SKIP:${PN} = "file-rdeps"
+PV = "0.6.3"
+SRCREV = "11336063c318e4015bce9144493a97a6afa6d372"
 

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.2.5"
+SRCREV = "234aeec1b78c8b495b02902f2fa33d23036c6d66"
+

recipes-gtk/nwg-shell/nwg-wrapper_git.bb

@@ -1,9 +1,9 @@
 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"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f8c294ba3ca22f2369223ac6415d1168"
 
 SRC_URI = " \
-	git://github.com/nwg-piotr/nwg-wrapper.git;protocol=https \
+	git://github.com/nwg-piotr/nwg-wrapper.git;protocol=https;branch=master \
 "
 
 DEPENDS = "python3"
@@ -12,6 +12,6 @@ RDEPENDS:${PN} = "python3-pygobject"
 inherit setuptools3 gobject-introspection
 
 S = "${WORKDIR}/git"
-PV = "0.0.2"
-SRCREV = "v${PV}"
+PV = "0.1.1"
+SRCREV = "9c1b0669dd894b6209a3130169956c755154b055"
 

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
+

recipes-gtk/phosh/phosh_git.bb

@@ -0,0 +1,67 @@
+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 \
+    feedbackd \
+    fribidi \
+    gcr \
+    git-native \
+    glib-2.0 \
+    gnome-desktop \
+    gtk+3 \
+    libgudev \
+    libhandy \
+    libpam \
+    libsecret \
+    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.17.0"
+SRCREV = "e9651c72a6c3033597d40b135c230262a2bf4cb6"
+
+EXTRA_OEMESON += "--buildtype=release"
+
+do_install:append() {
+    install -Dm 644 ${WORKDIR}/phosh.pam ${D}${sysconfdir}/pam.d/phosh
+}
+
+FILES:${PN} += "${datadir} ${libdir}"
+

recipes-gtk/srain/srain_git.bb

@@ -16,17 +16,17 @@ DEPENDS = " \
     libsecret \
 "
 
-UNKNOWN_CONFIGURE_WHITELIST:append = " introspection"
+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 \
+    git://github.com/SrainApp/srain.git;protocol=https;branch=stable/1.3 \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.3.0"
-SRCREV = "${PV}"
+PV = "1.3.2"
+SRCREV = "2faa79510cb124aae975de65a437b52b0e9e92d8"
 
 EXTRA_OEMESON += " \
     --buildtype release \

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.5"
+SRCREV = "77b8a85ce1a230ea9b5433062f46f15a2e5a7235"
+
+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 = ""
+

recipes-gtk/waybar/waybar_git.bb

@@ -28,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"
@@ -49,11 +50,11 @@ 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.8+${SRCREV}"
-SRCREV = "6eb9606f239418d225c7367f9e0f44adca764f3c"
+PV = "0.9.12"
+SRCREV = "3c1ba0a24063550aa6ea9c3cb199f08ecf75dbcc"
 
 inherit meson pkgconfig features_check
 

recipes-support/asciinema/asciinema_git.bb

@@ -3,7 +3,7 @@ LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = " \
-	git://github.com/asciinema/asciinema.git;protocol=https \
+	git://github.com/asciinema/asciinema.git;protocol=https;branch=master \
 "
 
 RDEPENDS:${PN} = " \
@@ -14,5 +14,5 @@ inherit setuptools3
 
 S = "${WORKDIR}/git"
 PV = "2.1.0"
-SRCREV = "v${PV}"
+SRCREV = "e08109f99a589d7d6e7ecf68fd93f731976ed61f"
 

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 = " \

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.2 \
 "
 
 DEPENDS = " \
@@ -33,8 +33,8 @@ RDEPENDS:${PN} = " \
 inherit meson pkgconfig features_check
 
 S = "${WORKDIR}/git"
-PV = "1.1.0"
-SRCREV = "${PV}"
+PV = "1.2.1"
+SRCREV = "e5aa6850d4ffbf0b61b2464a0dcbf131aad5a941"
 
 EXTRA_OEMESON += "--buildtype release"
 

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
+

recipes-support/foot/foot/0001-wayland-handle-enum-value-XDG_TOPLEVEL_STATE_SUSPEND.patch

@@ -0,0 +1,70 @@
+From 72bc0acfbd4b002ebf26d65368bb65601452353e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
+Date: Mon, 3 Jul 2023 14:36:03 +0200
+Subject: [PATCH 001/117] wayland: handle enum value
+ XDG_TOPLEVEL_STATE_SUSPENDED
+
+Added in wayland-protocols-1.32
+---
+ wayland.c | 23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/wayland.c b/wayland.c
+index 406aba6d..5160240b 100644
+--- a/wayland.c
++++ b/wayland.c
+@@ -651,6 +651,7 @@ xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
+     bool is_tiled_bottom = false;
+     bool is_tiled_left = false;
+     bool is_tiled_right = false;
++    bool is_suspended UNUSED = false;
+ 
+ #if defined(LOG_ENABLE_DBG) && LOG_ENABLE_DBG
+     char state_str[2048];
+@@ -665,29 +666,35 @@ xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
+         [XDG_TOPLEVEL_STATE_TILED_RIGHT] = "tiled:right",
+         [XDG_TOPLEVEL_STATE_TILED_TOP] = "tiled:top",
+         [XDG_TOPLEVEL_STATE_TILED_BOTTOM] = "tiled:bottom",
++#if defined(XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION)  /* wayland-protocols >= 1.32 */
++        [XDG_TOPLEVEL_STATE_SUSPENDED] = "suspended",
++#endif
+     };
+ #endif
+ 
+     enum xdg_toplevel_state *state;
+     wl_array_for_each(state, states) {
+         switch (*state) {
+-        case XDG_TOPLEVEL_STATE_ACTIVATED:    is_activated = true; break;
+-        case XDG_TOPLEVEL_STATE_FULLSCREEN:   is_fullscreen = true; break;
+         case XDG_TOPLEVEL_STATE_MAXIMIZED:    is_maximized = true; break;
++        case XDG_TOPLEVEL_STATE_FULLSCREEN:   is_fullscreen = true; break;
++        case XDG_TOPLEVEL_STATE_RESIZING:     is_resizing = true; break;
++        case XDG_TOPLEVEL_STATE_ACTIVATED:    is_activated = true; break;
+         case XDG_TOPLEVEL_STATE_TILED_LEFT:   is_tiled_left = true; break;
+         case XDG_TOPLEVEL_STATE_TILED_RIGHT:  is_tiled_right = true; break;
+         case XDG_TOPLEVEL_STATE_TILED_TOP:    is_tiled_top = true; break;
+         case XDG_TOPLEVEL_STATE_TILED_BOTTOM: is_tiled_bottom = true; break;
+-        case XDG_TOPLEVEL_STATE_RESIZING:     is_resizing = true; break;
+-        }
++
++#if defined(XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION)
++        case XDG_TOPLEVEL_STATE_SUSPENDED:    is_suspended = true; break;
++#endif
++    }
+ 
+ #if defined(LOG_ENABLE_DBG) && LOG_ENABLE_DBG
+-        if (*state >= XDG_TOPLEVEL_STATE_MAXIMIZED &&
+-            *state <= XDG_TOPLEVEL_STATE_TILED_BOTTOM)
+-        {
++        if (*state >= 0 && *state < ALEN(strings)) {
+             state_chars += snprintf(
+                 &state_str[state_chars], sizeof(state_str) - state_chars,
+-                "%s, ", strings[*state]);
++                "%s, ",
++                strings[*state] != NULL ? strings[*state] : "<unknown>");
+         }
+ #endif
+     }
+-- 
+2.41.0
+

recipes-support/foot/foot_git.bb

@@ -16,15 +16,17 @@ DEPENDS = " \
 	wayland-native \
 "
 
-RRECOMMENDS:${PN} = "xdg-utils"
+RRECOMMENDS:${PN} = "ncurses-terminfo"
 
 SRC_URI = " \
-	git://codeberg.org/dnkl/foot.git;protocol=https \
+	git://codeberg.org/dnkl/foot.git;protocol=https;branch=releases/1.12 \
+	file://0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch \
+	file://0001-wayland-handle-enum-value-XDG_TOPLEVEL_STATE_SUSPEND.patch \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.10.0"
-SRCREV = "31966f5494ed82268c414b04b63b20e88d4fff16"
+PV = "1.12.1"
+SRCREV = "e95269447f1b62384dc64707bb19ebe1006386ac"
 
 PACKAGECONFIG[grapheme-clustering] = "-Dgrapheme-clustering=enabled,-Dgrapheme-clustering=disabled,utf8proc"
 PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,scdoc-native"
@@ -37,22 +39,13 @@ PACKAGECONFIG ?= " \
 
 EXTRA_OEMESON += "--buildtype=release -Dterminfo=disabled"
 
-
-# Hack! tic from ncurses-native fails to generate the terminfo files. Use hosts tic instead. 
-# ncurses-bin needs to be installed.
-# TODO: ncurses 6.3 has included foot terminfo files. Remove Hack for builds newer than honister.
-do_install:append() {
-	sed -i "s|@default_terminfo@|foot|" ${S}/foot.info
-	sed -i "s|@default_terminfo-direct@|foot-direct|" ${S}/foot.info
-	install -d ${D}${datadir}/terminfo
-	/usr/bin/tic -o ${D}${datadir}/terminfo -x -e foot,foot-direct ${S}/foot.info
-}
-
 inherit meson pkgconfig
 
 FILES:${PN} = " \
 	${bindir} \
 	${datadir} \
+	${libdir} \
+	${sysconfdir} \
 "
 
 BBCLASSEXTEND = ""

recipes-support/fuzzel/fuzzel_git.bb

@@ -25,7 +25,7 @@ DEPENDS = " \
 
 S = "${WORKDIR}/git"
 PV = "1.6.2"
-SRCREV = "${PV}"
+SRCREV = "ba5399e5a3bc225a3242a74459a61c729fbca8e5"
 
 inherit meson pkgconfig features_check
 

recipes-support/greetd/agreety_git.bb

@@ -0,0 +1,63 @@
+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"
+
+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
+}
+

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
+

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}"
+

recipes-support/greetd/gtkgreet_git.bb

@@ -0,0 +1,25 @@
+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"
+
+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 \
+"
+
+

recipes-support/greetd/wlgreet_git.bb

@@ -0,0 +1,82 @@
+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"
+
+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 \
+"
+

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://github.com/emersion/grim.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 PV = "1.3.2"
-SRCREV = "v${PV}"
+SRCREV = "20c7c47a0aac09371c570c060f5f52f7e165e67a"
 
 inherit meson pkgconfig features_check
 
-EXTRA_OEMESON += "--buildtype release"
+EXTRA_OEMESON = "--buildtype release"
 
 BBCLASSEXTEND = ""
 

recipes-support/imv/imv_git.bb

@@ -1,46 +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"
-PACKAGECONFIG[rsvg] = ",,librsvg"
-PACKAGECONFIG[doc] = ",,asciidoc-native"
-
-PACKAGECONFIG ?= " \
-	jpeg \
-	png \
-	tiff \
-	rsvg \
-"
-
-SRC_URI = "git://github.com/eXeC64/imv.git;protocol=https"
-
-S = "${WORKDIR}/git"
-PV = "4.3.0"
-SRCREV = "f58e81288b2138d1b532cf11fb95bbcbac362a4e"
-
-inherit meson pkgconfig mime-xdg features_check
-
-BBCLASSEXTEND = ""

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 = ""
+

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
-

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
+

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 = " \
@@ -41,7 +41,7 @@ PACKAGECONFIG ?= " \
 
 S = "${WORKDIR}/git"
 PV = "1.6"
-SRCREV = "v${PV}"
+SRCREV = "ddc1849804c8703ec749140e3a55febb5250e934"
 
 EXTRA_OEMESON += "--buildtype release"
 

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
 

recipes-support/squeekboard/squeekboard/0001-Pass-additional-arguments-to-cargo.patch

@@ -0,0 +1,65 @@
+From f4de5125daeaffe237f2e2b42f3a0a8f960e3816 Mon Sep 17 00:00:00 2001
+From: Joshua Watt <JPEWhacker@gmail.com>
+Date: Fri, 19 Nov 2021 08:36:28 -0600
+Subject: [PATCH] Pass additional arguments to cargo
+
+Adds an option to pass additional arguments to cargo. This is necessary
+for cross compiling
+
+Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
+---
+ cargo_build.py    | 6 ++++++
+ meson.build       | 6 +++---
+ meson_options.txt | 4 ++++
+ 3 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/cargo_build.py b/cargo_build.py
+index 0c7c5c6..cfd34e8 100644
+--- a/cargo_build.py
++++ b/cargo_build.py
+@@ -27,6 +27,12 @@ else:
+     args.pop(i)
+     filename = args.pop(i)
+ 
++try:
++    i = args.index('--target')
++    binary_dir = "{}/{}".format(args[i + 1], binary_dir)
++except ValueError:
++    pass
++
+ # The target destination of the produced file is a positional argument
+ out_path = [arg for arg in args if not arg.startswith('--')]
+ if out_path:
+diff --git a/meson.build b/meson.build
+index 342ecca..a2a6f2f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -54,10 +54,10 @@ endif
+ if get_option('buildtype') != 'plain'
+     add_project_arguments('-fstack-protector-strong', language: 'c')
+ endif
++
++cargo_build_flags = get_option('cargo-flags')
+ if get_option('buildtype') == 'release'
+-    cargo_build_flags = ['--release'] # for artifacts
+-else
+-    cargo_build_flags = []
++    cargo_build_flags += ['--release'] # for artifacts
+ endif
+ 
+ prefix = get_option('prefix')
+diff --git a/meson_options.txt b/meson_options.txt
+index bb68374..459807a 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -14,3 +14,7 @@ option('legacy',
+ option('strict',
+        type: 'boolean', value: true,
+        description: 'Turn more warnings into errors')
++
++option('cargo-flags',
++       type: 'array', value: [],
++       description: 'Extra flags to pass to cargo')
+-- 
+2.33.0
+

recipes-support/squeekboard/squeekboard/0001-Skip-build-tests-if-not-enabled.patch

@@ -0,0 +1,73 @@
+From 8c83844e57dc454a0041f61351e2f9c297eb7b23 Mon Sep 17 00:00:00 2001
+From: Joshua Watt <JPEWhacker@gmail.com>
+Date: Fri, 19 Nov 2021 10:49:06 -0600
+Subject: [PATCH] Skip build tests if not enabled
+
+Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
+---
+ src/meson.build | 48 +++++++++++++++++++++++++-----------------------
+ 1 file changed, 25 insertions(+), 23 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index d85be96..b3bb776 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -61,30 +61,32 @@ rslibs = custom_target(
+     depends: cargo_toml,
+ )
+ 
+-build_rstests = custom_target(
+-    'build_rstests',
+-    build_by_default: false,
+-    # HACK: this target needs to build before all the tests,
+-    # but it doesn't produce anything stable.
+-    # Declaring build_by_default with some random but irrelevant output
+-    # ensures that it's always built as it should
+-    build_always_stale: true,
+-    output: ['src'],
+-    install: false,
+-    console: true,
+-    command: [cargo_script, 'test', '--no-run'] + cargo_build_flags,
+-    depends: [rslibs, cargo_toml], # no point building tests if the code itself fails
+-)
++if get_option('tests')
++    build_rstests = custom_target(
++        'build_rstests',
++        build_by_default: false,
++        # HACK: this target needs to build before all the tests,
++        # but it doesn't produce anything stable.
++        # Declaring build_by_default with some random but irrelevant output
++        # ensures that it's always built as it should
++        build_always_stale: true,
++        output: ['src'],
++        install: false,
++        console: true,
++        command: [cargo_script, 'test', '--no-run'] + cargo_build_flags,
++        depends: [rslibs, cargo_toml], # no point building tests if the code itself fails
++    )
+ 
+-test(
+-    'rstest',
+-    cargo_script,
+-    args: ['test'] + cargo_build_flags,
+-    env: ['SOURCE_DIR=' + meson.source_root()],
+-    # this is a whole Carg-based test suite, let it run for a while
+-    timeout: 900,
+-    depends: [build_rstests, cargo_toml],
+-)
++    test(
++        'rstest',
++        cargo_script,
++        args: ['test'] + cargo_build_flags,
++        env: ['SOURCE_DIR=' + meson.source_root()],
++        # this is a whole Carg-based test suite, let it run for a while
++        timeout: 900,
++        depends: [build_rstests, cargo_toml],
++    )
++endif
+ 
+ libsqueekboard = static_library('libsqueekboard',
+   sources,
+-- 
+2.33.0
+

recipes-support/squeekboard/squeekboard_git.bb

@@ -0,0 +1,114 @@
+SUMMARY = "A Wayland virtual keyboard"
+DESCRIPTION = "Squeekboard is a virtual keyboard supporting Wayland, built \
+primarily for the Librem 5 phone. \
+It squeaks because some Rust got inside."
+HOMEPAGE = "https://developer.puri.sm/projects/squeekboard/"
+BUGTRACKER = "https://gitlab.gnome.org/World/Phosh/squeekboard/-/issues"
+LICENSE = "GPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://debian/copyright;md5=03d0c6e3f2e8ec62fb33c983433ce7e5"
+
+DEPENDS = "\
+    feedbackd \
+    glib-2.0 \
+    glib-2.0-native \
+    gnome-desktop \
+    gtk+3 \
+    libxkbcommon \
+    wayland \
+    wayland-native \
+    wayland-protocols \
+    "
+
+SRC_URI = "\
+    git://gitlab.gnome.org/World/Phosh/squeekboard.git;protocol=https;branch=${BRANCH} \
+    file://0001-Pass-additional-arguments-to-cargo.patch \
+    file://0001-Skip-build-tests-if-not-enabled.patch \
+    crate://crates.io/atk-sys/0.9.1 \
+    crate://crates.io/atk/0.7.0 \
+    crate://crates.io/autocfg/1.0.1 \
+    crate://crates.io/bitflags/1.2.1 \
+    crate://crates.io/cairo-rs/0.7.1 \
+    crate://crates.io/cairo-sys-rs/0.9.2 \
+    crate://crates.io/cc/1.0.72 \
+    crate://crates.io/clap/2.33.3 \
+    crate://crates.io/dtoa/0.4.8 \
+    crate://crates.io/fragile/0.3.0 \
+    crate://crates.io/gdk-pixbuf-sys/0.9.1 \
+    crate://crates.io/gdk-pixbuf/0.7.0 \
+    crate://crates.io/gdk-sys/0.9.1 \
+    crate://crates.io/gdk/0.11.0 \
+    crate://crates.io/gio-sys/0.9.1 \
+    crate://crates.io/gio/0.7.0 \
+    crate://crates.io/glib-sys/0.9.1 \
+    crate://crates.io/glib/0.8.2 \
+    crate://crates.io/gobject-sys/0.9.1 \
+    crate://crates.io/gtk-sys/0.9.2 \
+    crate://crates.io/gtk/0.7.0 \
+    crate://crates.io/hashbrown/0.8.1 \
+    crate://crates.io/indexmap/1.5.2 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.107 \
+    crate://crates.io/linked-hash-map/0.5.4 \
+    crate://crates.io/maplit/1.0.2 \
+    crate://crates.io/memmap/0.7.0 \
+    crate://crates.io/pango-sys/0.9.1 \
+    crate://crates.io/pango/0.7.0 \
+    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/regex-syntax/0.6.25 \
+    crate://crates.io/regex/1.3.9 \
+    crate://crates.io/serde/1.0.130 \
+    crate://crates.io/serde_derive/1.0.130 \
+    crate://crates.io/serde_yaml/0.8.21 \
+    crate://crates.io/syn/1.0.81 \
+    crate://crates.io/textwrap/0.11.0 \
+    crate://crates.io/unicode-width/0.1.9 \
+    crate://crates.io/unicode-xid/0.2.2 \
+    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/xkbcommon/0.4.0 \
+    crate://crates.io/yaml-rust/0.4.5 \
+    "
+
+# Modify these as desired
+PV = "1.17.1"
+SRCREV = "2faa98d85f1142383ec8ad1487616c1a7ad1882f"
+BRANCH = "1.17"
+
+S = "${WORKDIR}/git"
+
+inherit cargo meson rust pkgconfig
+
+EXTRA_OEMESON = "\
+    -Dcargo-flags=[\'--target\',\'${HOST_SYS}\',\'-v\'] \
+    -Dtests=false \
+    -Ddepdatadir=${datadir} \
+    -Donline=false \
+"
+
+export CARGO_FEATURE_STD = "1"
+
+do_configure() {
+    cargo_common_do_configure
+    meson_do_configure
+}
+
+do_compile() {
+    oe_cargo_fix_env
+    export RUSTFLAGS="${RUSTFLAGS}"
+    export RUST_TARGET_PATH="${RUST_TARGET_PATH}"
+    meson_do_compile
+}
+
+do_install() {
+    oe_cargo_fix_env
+    export RUSTFLAGS="${RUSTFLAGS}"
+    export RUST_TARGET_PATH="${RUST_TARGET_PATH}"
+    meson_do_install
+
+    install -d ${D}${sysconfdir}/xdg/autostart
+    cp ${D}${datadir}/applications/sm.puri.Squeekboard.desktop ${D}${sysconfdir}/xdg/autostart
+}

recipes-support/swaybg/swaybg_git.bb

@@ -17,15 +17,15 @@ DEPENDS = " \
 "
 
 SRC_URI = " \
-	git://github.com/swaywm/swaybg.git;protocol=https \
+	git://github.com/swaywm/swaybg.git;protocol=https;branch=master \
 "
 
 # Reproducibility issue. Fix me!
 CFLAGS:append = " -Wno-error=date-time"
 
 S = "${WORKDIR}/git"
-PV = "1.1"
-SRCREV = "v${PV}"
+PV = "1.1.1"
+SRCREV = "06f93ddc01ccdecf1a1c9c2c658ea030658f44f2"
 
 inherit meson pkgconfig features_check
 

recipes-support/swayidle/swayidle_git.bb

@@ -15,12 +15,12 @@ DEPENDS = " \
 "
 
 SRC_URI = " \
-	git://github.com/swaywm/swayidle.git;protocol=https \
+	git://github.com/swaywm/swayidle.git;protocol=https;branch=master \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.7"
-SRCREV = "${PV}"
+PV = "1.7.1"
+SRCREV = "081d61670387da8fd36bad630d8ced5e48a5fcf0"
 
 inherit meson pkgconfig features_check
 

recipes-support/swaylock/swaylock_git.bb

@@ -17,12 +17,12 @@ DEPENDS = " \
 "
 
 SRC_URI = " \
-	git://github.com/swaywm/swaylock.git;protocol=https \
+	git://github.com/swaywm/swaylock.git;protocol=https;branch=master \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.5+${SRCREV}"
-SRCREV = "2bf76009e1d279a4194d37b9ee4f2bf0d9424d62"
+PV = "1.6"
+SRCREV = "92de4d2e310c7bd7dca9c9ced602219dc8245a55"
 
 PACKAGECONFIG[pam] = ",,libpam"
 PACKAGECONFIG[gdk-pixbuf] = ",,gdk-pixbuf"

recipes-support/virtboard/virtboard_git.bb

@@ -1,33 +0,0 @@
-SUMMARY = "A basic keyboard, blazing the path of modern Wayland keyboards."
-HOMEPAGE = "https://source.puri.sm/Librem5/virtboard"
-LICENSE = "MIT"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=0ebb9978fd668af3c88c6dfa393e866d"
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-DEPENDS = " \
-	cairo \
-	glib-2.0-native \
-	libpng \
-	libxkbcommon \
-	pixman \
-	wayland \
-	wayland-native \
-	wayland-protocols \
-"
-
-SRC_URI = " \
-	git://source.puri.sm/Librem5/virtboard.git;protocol=https \
-"
-
-inherit meson pkgconfig gtk-icon-cache features_check
-
-S = "${WORKDIR}/git"
-PV = "0.0.6"
-SRCREV = "v${PV}"
-
-FILES:${PN} += "${datadir}"
-
-BBCLASSEXTEND = ""
-

recipes-support/wf-recorder/wf-recorder_git.bb

@@ -16,7 +16,7 @@ DEPENDS = " \
 REQUIRED_DISTRO_FEATURES = "wayland"
 
 SRC_URI = " \
-	git://github.com/ammen99/wf-recorder.git;protocol=https \
+	git://github.com/ammen99/wf-recorder.git;protocol=https;branch=master \
 "
 SRCREV = "2a901365571de8b86a7eaf95fe9d0cd5a5645579"
 

recipes-support/wl-clipboard/wl-clipboard_git.bb

@@ -3,7 +3,7 @@ DESCRIPTION = "This project implements two command-line Wayland clipboard utilit
 HOMEPAGE = "https://github.com/bugaevc/wl-clipboard"
 BUGTRACKER = "https://github.com/bugaevc/wl-clipboard/issues"
 SECTION = "base/shell"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
 
@@ -15,7 +15,7 @@ DEPENDS += " \
 	wayland-protocols \
 "
 
-SRC_URI = "git://github.com/bugaevc/wl-clipboard.git;protocol=https"
+SRC_URI = "git://github.com/bugaevc/wl-clipboard.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 PV = "2.0+${SRCREV}"

recipes-support/wlsunset/wlsunset_git.bb

@@ -1,6 +1,6 @@
 SUMMARY = "Day/night gamma adjustments for Wayland compositors supporting wlr-gamma-control-unstable-v1."
-HOMEPAGE = "https://github.com/kennylevinsen/wlsunset"
-BUGTRACKER = "https://github.com/kennylevinsen/wlsunset/issues"
+HOMEPAGE = "https://git.sr.ht/~kennylevinsen/wlsunset"
+BUGTRACKER = "https://git.sr.ht/~kennylevinsen/wlsunset/issues"
 SECTION = "base/shell"
 LICENSE = "MIT"
 
@@ -14,14 +14,14 @@ DEPENDS += " \
 	wayland-protocols \
 "
 
-SRC_URI = "git://github.com/kennylevinsen/wlsunset.git;protocol=https"
+SRC_URI = "git://git.sr.ht/~kennylevinsen/wlsunset;protocol=https;nobranch=1"
 
 PACKAGECONFIG[man-pages] = ",,scdoc-native"
 
 
 S = "${WORKDIR}/git"
 PV = "0.2.0"
-SRCREV = "${PV}"
+SRCREV = "2e7d793bb6b0e21319940d476ca27242f60e3cd6"
 
 inherit meson pkgconfig features_check
 

recipes-support/wob/wob_git.bb

@@ -0,0 +1,32 @@
+SUMMARY = "A lightweight overlay volume/backlight/progress/anything bar for wlroots based Wayland compositors."
+HOMEPAGE = "https://github.com/francma/wob"
+SECTION = "Wayland"
+LICENSE = "ISC"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=07d60638be9414ee4e38ed68e642ba25"
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+SRC_URI = " \
+	git://github.com/francma/wob.git;protocol=https;branch=master \
+"
+
+DEPENDS = " \
+	wayland \
+	wayland-native \
+	wayland-protocols \
+"
+
+inherit meson pkgconfig features_check
+
+PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp"
+PACKAGECONFIG[man-pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native"
+
+PACKAGECONFIG ??= ""
+
+S = "${WORKDIR}/git"
+PV = "0.13"
+SRCREV = "79724fa53f536e8aa23cfb72611983e87351b6e9"
+
+EXTRA_OEMESON += "--buildtype release"
+

recipes-support/yambar/yambar_git.bb

@@ -7,7 +7,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=00b01b6aa1e1a7130832b0178f8d7485"
 
 SRC_URI = " \
-	git://codeberg.org/dnkl/yambar.git;protocol=https;branch=releases/1.6 \
+	git://codeberg.org/dnkl/yambar.git;protocol=https;branch=master \
 "
 
 DEPENDS = " \
@@ -16,7 +16,6 @@ DEPENDS = " \
 	tllist \
 	pixman \
 	json-c \
-	libmpdclient \
 	alsa-lib \
 	scdoc-native \
 "
@@ -28,13 +27,15 @@ RRECOMMENDS:${PN} += " \
 inherit meson pkgconfig
 
 S = "${WORKDIR}/git"
-PV = "1.6.2"
-SRCREV = "${PV}"
+PV = "1.8.0"
+SRCREV = "3cc142a27302adbb4a314ea95c901a5216b06d98"
 
 PACKAGECONFIG[wayland] = "-Dbackend-wayland=enabled,-Dbackend-wayland=disabled,wayland wayland-native wayland-protocols"
 PACKAGECONFIG[x11] = "-Dbackend-x11=enabled,-Dbackend-x11=disabled,xcb-util xcb-util-cursor xcb-util-wm libxcb"
 PACKAGECONFIG[systemd] = ",,systemd"
 PACKAGECONFIG[sysvinit] = ",,eudev"
+PACKAGECONFIG[mpd] = "-Dplugin-mpd=enabled,-Dplugin-mpd=disabled,libmpdclient"
+PACKAGECONFIG[shared-plugins] = "-Dcore-plugins-as-shared-libraries=true,-Dcore-plugins-as-shared-libraries=false"
 
 PACKAGECONFIG ?= " \
 	${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \

recipes-wlroots/cage/cage_git.bb

@@ -0,0 +1,27 @@
+
+SUMMARY = "Cage: a Wayland kiosk"
+HOMEPAGE = "https://www.hjdskes.nl/projects/cage/" 
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3d06ce025701c9a0b391f15902ce8ed" 
+
+DEPENDS = " \
+    wayland-native \
+    wayland \
+    wayland-protocols \
+    wlroots \
+    pixman \
+    libxkbcommon \
+"
+
+inherit meson pkgconfig features_check
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+SRC_URI = "git://github.com/Hjdskes/${BPN}.git;branch=master;protocol=https"
+SRCREV = "f71844ab54dbb3192d8c2f0a1db84d50e18536d9"
+PV = "0.1.4"
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xserver-xorg,xwayland"
+

recipes-wlroots/phoc/phoc_git.bb

@@ -0,0 +1,58 @@
+
+SUMMARY = "wlroots based Phone compositor as used on the Librem5."
+HOMEPAGE = "https://gitlab.gnome.org/World/Phosh/phoc"
+SECTION = "graphics"
+LICENSE = "GPL-3.0-only"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+DEPENDS += " \
+	glib-2.0 \
+	gnome-desktop \
+	libinput \
+	libxkbcommon \
+	pixman \
+	seatd \
+	wayland \
+	wayland-native \
+	wayland-protocols \
+"
+#needed to build wlroots as a subproject
+DEPENDS += " \
+	ffmpeg \
+	git-native \
+	libdrm \
+	libcap \
+	virtual/libgbm \
+	virtual/libgles2 \
+	libpng \
+"
+
+RDEPENDS:${PN} = "mutter"
+
+SRC_URI = " \
+	gitsm://gitlab.gnome.org/World/Phosh/phoc.git;protocol=https;branch=master \
+"
+
+SRCREV = "cbcfdcb7de84863010827c01b0c47781adb13f74"
+PV = "0.13.0"
+S = "${WORKDIR}/git"
+
+inherit features_check gsettings meson pkgconfig
+
+PACKAGECONFIG[systemd] = ",,systemd"
+PACKAGECONFIG[sysvinit] = ",,eudev elogind"
+PACKAGECONFIG[x11] = ",,libxcb xcb-util-renderutil"
+PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xwayland xcb-util-wm"
+
+PACKAGECONFIG ?= " \
+	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+	${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)} \
+"
+
+EXTRA_OEMESON += "-Dembed-wlroots=enabled --buildtype=release"
+
+FILES:${PN} += "${datadir}"
+

recipes-wlroots/sway/sway_git.bb

@@ -26,7 +26,7 @@ DEPENDS += " \
 	wayland-protocols \
 "
 # sways default config makes use of it
-RDEPENDS:${PN} ?= "swaybg"
+RDEPENDS:${PN} ?= "swaybg python3 python-i3ipc"
 
 RRECOMMENDS:${PN} ?= " \
 	foot \
@@ -37,20 +37,22 @@ RRECOMMENDS:${PN} ?= " \
 "
 
 SRC_URI = " \
-	git://github.com/swaywm/sway.git;protocol=https;branch=master \
+	git://github.com/swaywm/sway.git;protocol=https;branch=v1.7 \
 "
 
-SRCREV = "119f31edb4f0c61fd074229040dd93e047ff7cb4"
-PV = "1.6.1+${SRCREV}"
+SRCREV = "5543acff06981639086bc9a0fc9b608796a23e84"
+PV = "1.7"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
 
-PACKAGECONFIG[default-wallpaper] = "-Ddefault-wallpaper=true,-Ddefault-wallpaper=false"
-PACKAGECONFIG[gdk-pixbuf] = "-Dgdk-pixbuf=enabled,-Dgdk-pixbuf=disabled,gdk-pixbuf"
-PACKAGECONFIG[systemd] = "-Dsd-bus-provider=libsystemd,,systemd"
-PACKAGECONFIG[elogind] = "-Dsd-bus-provider=libelogind,,elogind"
 PACKAGECONFIG[basu] = "-Dsd-bus-provider=basu,,basu"
+PACKAGECONFIG[default-wallpaper] = "-Ddefault-wallpaper=true,-Ddefault-wallpaper=false"
+PACKAGECONFIG[elogind] = "-Dsd-bus-provider=libelogind,,elogind"
+PACKAGECONFIG[gdk-pixbuf] = "-Dgdk-pixbuf=enabled,-Dgdk-pixbuf=disabled,gdk-pixbuf"
+PACKAGECONFIG[swaybar] = "-Dswaybar=true,-Dswaybar=false"
+PACKAGECONFIG[swaynag] = "-Dswaynag=true,-Dswaynag=false"
+PACKAGECONFIG[systemd] = "-Dsd-bus-provider=libsystemd,,systemd"
 PACKAGECONFIG[tray] = "-Dtray=enabled,-Dtray=disabled"
 PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb"
 
@@ -66,6 +68,8 @@ EXTRA_OEMESON += "--buildtype release"
 
 do_install:append() {
 	install -m 755 ${S}/contrib/grimshot ${D}${bindir}
+	install -m 755 ${S}/contrib/autoname-workspaces.py ${D}${bindir}
+	install -m 755 ${S}/contrib/inactive-windows-transparency.py ${D}${bindir}
 }
 
 FILES:${PN}:append = " \

recipes-wlroots/wayfire/wayfire/0001-meson.build-build-with-system-wf-touch-and-wf-utils.patch

@@ -0,0 +1,35 @@
+From b8ba62e91d30ede97478f66587300525c5d7bd7e Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 15 Feb 2022 01:40:30 +0100
+Subject: [PATCH] meson.build: build with system wf-touch and wf-utils
+
+---
+ meson.build | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ab3652a8..a9f287e2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -32,6 +32,8 @@ threads        = dependency('threads')
+ xkbcommon      = dependency('xkbcommon')
+ wlroots        = dependency('wlroots', version: ['>=0.15.0', '<0.16.0'], required: get_option('use_system_wlroots'))
+ wfconfig       = dependency('wf-config', version: ['>=0.7.0', '<0.8.0'], required: get_option('use_system_wfconfig'))
++wfutils        = dependency('wf-utils', version: '>=0.4.0')
++wftouch        = dependency('wf-touch')
+ 
+ use_system_wlroots = not get_option('use_system_wlroots').disabled() and wlroots.found()
+ if not use_system_wlroots
+@@ -43,9 +45,6 @@ if not use_system_wfconfig
+   wfconfig = subproject('wf-config').get_variable('wfconfig')
+ endif
+ 
+-wfutils = subproject('wf-utils').get_variable('wfutils')
+-wftouch = subproject('wf-touch').get_variable('wftouch')
+-
+ needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system())
+ libinotify       = dependency('libinotify', required: needs_libinotify)
+ 
+-- 
+2.25.1
+

recipes-wlroots/wayfire/wayfire_git.bb

@@ -20,17 +20,22 @@ DEPENDS += " \
 	libxkbcommon \
 	libxml2 \
 	mesa \
+	pango \
 	pixman \
 	seatd \
 	wayland \
 	wayland-native \
 	wayland-protocols \
+	wf-config \
+	wf-utils \
+	wf-touch \
 "
 
 RRECOMMENDS:${PN} += " \
-	wlroots \
 	wcm \
 	wf-config \
+	wf-touch \
+	wf-utils \
 	wf-recorder \
 	wf-shell \
 "
@@ -41,12 +46,17 @@ PACKAGECONFIG[use_system_wlroots] = "-Duse_system_wlroots=enabled,-Duse_system_w
 PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled"
 
 PACKAGECONFIG ?= " \
+	gles32 \
 	use_system_wfconfig \
 	use_system_wlroots \
 "
 
-SRC_URI = "git://github.com/WayfireWM/wayfire.git;protocol=https;branch=0.7.x"
-SRCREV = "v${PV}"
+SRC_URI = " \
+	git://github.com/WayfireWM/wayfire.git;protocol=https;branch=0.7.x \
+	file://0001-meson.build-build-with-system-wf-touch-and-wf-utils.patch \
+"
+
+SRCREV = "835a7bf9bde4e78796f9fd9f14021476084a9728"
 PV = "0.7.2"
 S = "${WORKDIR}/git"
 
@@ -54,5 +64,7 @@ inherit meson pkgconfig features_check
 
 EXTRA_OEMESON += "--buildtype release"
 
+FILES:${PN} += "${datadir}"
+
 BBCLASSEXTEND = ""
 

recipes-wlroots/wayfire/wf-config_git.bb

@@ -14,15 +14,15 @@ DEPENDS = " \
 
 REQUIRED_DISTRO_FEATURES = "wayland"
 
-SRC_URI = "https://github.com/WayfireWM/wf-config/releases/download/v${PV}/wf-config-${PV}.tar.xz"
-SRC_URI[sha256sum] = "7d2285adeaca0ff6e36e6ef450564ab02c8e26ba5da3b169257c5bf061f7e5f0"
+SRC_URI = "git://github.com/WayfireWM/wf-config.git;protocol=https;branch=0.7.x"
+SRCREV = "62e3897f207f49b1a3bbb85ba4b11d9fea239ec1"
+PV = "0.7.1"
 
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
 
 EXTRA_OEMESON += "--buildtype release"
 
-
 BBCLASSEXTEND = ""