foot: cleanup

The code doesn't contain any license information. Asume WTFPL to silence
missing license file warning

README.md

@@ -12,10 +12,10 @@ Dependencies
 This layer depends on:
 
     URI: git://github.com/openembedded/openembedded-core
-        branch: hardknott
+        branch: honister
         revision: HEAD
     URI: git://github.com/openembedded/meta-openembedded
-        branch: hardknott
+        branch: honister
         revision: HEAD
 
 Building

conf/layer.conf

@@ -6,12 +6,11 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "wayland"
 BBFILE_PATTERN_wayland = "^${LAYERDIR}/"
-BBFILE_PRIORITY_wayland = "5"
+BBFILE_PRIORITY_wayland = "8"
 
-LAYERSERIES_COMPAT_wayland = "hardknott"
+LAYERSERIES_COMPAT_wayland = "honister"
 
 LAYERDEPENDS_wayland = " \
 	core \
 	openembedded-layer \
 "
-

recipes-core/elogind/elogind_git.bb

@@ -17,5 +17,5 @@ inherit meson
 
 EXTRA_OEMESON += "--buildtype release"
 
-FILES_${PN} += "/usr"
+FILES:${PN} += "/usr"
 

recipes-core/seatd/seatd_git.bb

@@ -23,8 +23,8 @@ PACKAGECONFIG ?= " \
 "
 
 S = "${WORKDIR}/git"
-PV = "0.5.0+${SRCREV}"
-SRCREV = "2204db5531ed16bf32f969645e7177f6118f8a8e"
+PV = "0.6.3"
+SRCREV = "${PV}"
 
 inherit meson
 

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

@@ -0,0 +1,42 @@
+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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,18 @@
+SUMMARY = "Python Module for the Brotli compression algorithm."
+HOMEPAGE = "https://github.com/google/brotli/" 
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=941ee9cd1609382f946352712a319b4b" 
+
+inherit cmake setuptools3
+
+SRC_URI = " \
+    git://github.com/google/brotli.git;protocol=https \
+"
+
+PV = "1.0.9"
+SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release"
+

recipes-devtools/python/python-i3ipc_git.bb

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

recipes-devtools/python/python-xlib.bb

@@ -11,7 +11,7 @@ DEPENDS = " \
 	python3-pip-native \
 "
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
 	python3 \	
 	python3-six \
 "

recipes-extended/autotiling/autotiling-rs_git.bb

@@ -0,0 +1,39 @@
+SUMMARY = "This automatically alternates the container layout between horizontal and vertical for successive new containers."
+LICENSE = "WTFPL"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/WTFPL;md5=7993e3336259bdb618ad5a1afc872165"
+
+SRC_URI = " \
+	git://github.com/ammgws/autotiling-rs.git;protocol=https \
+	crate://crates.io/clap/2.33.3 \
+	crate://crates.io/swayipc/2.7.2 \
+	crate://crates.io/bitflags/1.2.1 \
+	crate://crates.io/textwrap/0.11.0 \
+	crate://crates.io/unicode-width/0.1.8 \
+	crate://crates.io/failure/0.1.8 \
+	crate://crates.io/serde/1.0.104 \
+	crate://crates.io/serde_json/1.0.48 \
+	crate://crates.io/serde_derive/1.0.104 \
+	crate://crates.io/backtrace/0.3.48 \
+	crate://crates.io/failure_derive/0.1.8 \
+	crate://crates.io/itoa/0.4.5 \
+	crate://crates.io/ryu/1.0.2 \
+	crate://crates.io/addr2line/0.12.1 \
+	crate://crates.io/cfg-if/0.1.10 \
+	crate://crates.io/libc/0.2.71 \
+	crate://crates.io/object/0.19.0 \
+	crate://crates.io/rust_demangle/0.1.0 \
+	crate://crates.io/rustc-demangle/0.1.16 \
+	crate://crates.io/proc-macro2/1.0.17 \
+	crate://crates.io/quote/1.0.6 \
+	crate://crates.io/syn/1.0.29 \
+	crate://crates.io/synstructure/0.12.3 \
+	crate://crates.io/gimli/0.21.0 \
+	crate://crates.io/unicode-xid/0.2.0 \
+"
+
+inherit rust cargo
+
+S = "${WORKDIR}/git"
+PV = "0.1.3"
+SRCREV = "v${PV}"
+

recipes-extended/autotiling/autotiling_git.bb

@@ -8,7 +8,7 @@ SRC_URI = " \
 
 DEPENDS = "python3-wheel-native"
 
-RDEPENDS_${PN} = "python-i3ipc"
+RDEPENDS:${PN} = "python-i3ipc"
 
 inherit setuptools3
 

recipes-extended/date/date_git.bb

@@ -24,7 +24,7 @@ EXTRA_OECMAKE += " \
 	-DUSE_SYSTEM_TZ_DB=ON \
 "
 
-do_install_append() {
+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/fcft/fcft_git.bb

@@ -20,10 +20,18 @@ SRC_URI = " \
 "
 
 S = "${WORKDIR}/git"
-PV = "2.4.3"
+PV = "2.5.0"
 SRCREV = "${PV}"
 
 inherit meson pkgconfig
 
+PACKAGECONFIG[grapheme-shaping] = "-Dgrapheme-shaping=enabled,-Dgrapheme-shaping=disabled,utf8proc"
+PACKAGECONFIG[run-shaping] = "-Drun-shaping=enabled,-Drun-shaping=disabled,utf8proc"
+
+PACKAGECONFIG ?= " \
+	grapheme-shaping \
+	run-shaping \
+"
+
 BBCLASSEXTEND = ""
 

recipes-extended/font-awesome/font-awesome-otf_git.bb

@@ -11,7 +11,7 @@ SRC_URI = " \
 "
 
 S = "${WORKDIR}/git"
-PV = "5.15.3"
+PV = "5.15.4"
 SRCREV = "${PV}"
 
 
@@ -22,7 +22,7 @@ do_install () {
 	done
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
 	${datadir}/fonts \
 "
 

recipes-extended/highway/highway_git.bb

@@ -0,0 +1,18 @@
+SUMMARY = "Highway is a C++ library for SIMD (Single Instruction, Multiple Data)"
+HOMEPAGE = "https://github.com/google/highway/" 
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9" 
+
+inherit cmake
+
+SRC_URI = " \
+    git://github.com/google/highway.git;protocol=https \
+"
+
+PV = "0.14.2"
+SRCREV = "${PV}"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release"
+

recipes-extended/jq/jq_git.bb

@@ -1,21 +0,0 @@
-  
-SUMMARY = "jq is a lightweight and flexible command-line JSON processor."
-HOMEPAGE = "https://github.com/stedolan/jq"
-BUGTRACKER = "https://github.com/stedolan/jq/issues"
-SECTION = "dev"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d"
-
-SRC_URI = " \
-	git://github.com/stedolan/jq;protocol=https;nobranch=1 \
-"
-
-S = "${WORKDIR}/git"
-PV = "1.6"
-SRCREV = "jq-${PV}"
-
-inherit autotools
-
-do_configure_prepend() {
-	autoreconf -f
-}

recipes-extended/libwmf/libwmf_%.bbappend

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

recipes-extended/scdoc/scdoc_git.bb

@@ -15,8 +15,8 @@ S = "${WORKDIR}/git"
 PV = "1.11.0"
 SRCREV = "${PV}"
 
-EXTRA_OEMAKE_class-native = "PREFIX=${prefix}"
-EXTRA_OEMAKE_class-target = "PREFIX=${prefix} HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc"
+EXTRA_OEMAKE:class-native = "PREFIX=${prefix}"
+EXTRA_OEMAKE:class-target = "PREFIX=${prefix} HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc"
 
 inherit autotools-brokensep
 	

recipes-graphics/aalib/aalib_1.4.0.bb

@@ -0,0 +1,18 @@
+DESCRIPTION = "AAlib is a portable library for rendering graphics as ASCII art."
+HOMEPAGE = "http://aa-project.sourceforge.net/aalib/"
+SECTION = "libs"
+
+DEPENDS = "ncurses"
+
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+S = "${WORKDIR}/aalib-1.4.0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/projects/aa-project/files/aa-lib/1.4rc5/aalib-1.4rc5.tar.gz"
+SRC_URI[sha256sum] = "fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee"
+
+inherit autotools
+
+CFLAGS:append = " -fPIC "
+

recipes-graphics/libjxl/libjxl_git.bb

@@ -0,0 +1,34 @@
+SUMMARY = "Reference implementation of JPEG XL (encoder and decoder)"
+HOMEPAGE = "https://github.com/libjxl/libjxl/" 
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6a905a337cc228a1f68f0b5416f52a7f" 
+
+inherit cmake pkgconfig
+
+DEPENDS = "highway brotli"
+
+SRC_URI = " \
+    gitsm://github.com/libjxl/libjxl.git;protocol=https;branch=v0.6.x \
+"
+
+PV = "0.6"
+SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = " \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DJPEGXL_ENABLE_PLUGINS=OFF \
+	-DBUILD_TESTING=OFF \
+	-DJPEGXL_WARNINGS_AS_ERRORS=OFF \
+	-DJPEGXL_ENABLE_SJPEG=OFF \
+	-DJPEGXL_ENABLE_BENCHMARK=OFF \
+	-DJPEGXL_ENABLE_EXAMPLES=OFF \
+	-DJPEGXL_ENABLE_MANPAGES=OFF \
+	-DJPEGXL_ENABLE_SKCMS=ON \
+	-DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
+	-DJPEGXL_FORCE_SYSTEM_HWY=ON \
+	-DJPEGXL_ENABLE_JNI=OFF \
+	-DJPEGXL_ENABLE_TCMALLOC=OFF \
+	-DJPEGXL_ENABLE_TOOLS=OFF \
+"	

recipes-graphics/libsdl2/libsdl2_%.bbappend

@@ -0,0 +1,7 @@
+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,5 +1,3 @@
-PV = "1.21"
-
-SRC_URI[md5sum] = "8196416baac07cd833bcb86b69da41a7"
-SRC_URI[sha256sum] = "b99945842d8be18817c26ee77dafa157883af89268e15f4a5a1a1ff3ffa4cde5"
+PV = "1.23"
+SRC_URI[sha256sum] = "6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76"
 

recipes-graphics/wayland/waylandpp_0.2.8.bb

@@ -4,8 +4,8 @@ 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"
+DEPENDS:append:class-native = " pugixml-native"
+DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl"
 
 S = "${WORKDIR}/git"
 PV = "0.2.8"
@@ -13,7 +13,7 @@ PV = "0.2.8"
 inherit cmake
 
 
-EXTRA_OECMAKE_append_class-native = " \
+EXTRA_OECMAKE:append:class-native = " \
     -DBUILD_SCANNER=ON \
     -DBUILD_LIBRARIES=OFF \
     -DBUILD_DOCUMENTATION=OFF \
@@ -21,7 +21,7 @@ EXTRA_OECMAKE_append_class-native = " \
     -DCMAKE_VERBOSE_MAKEFILE=TRUE \
     "
 
-EXTRA_OECMAKE_append_class-target = " \
+EXTRA_OECMAKE:append:class-target = " \
     -DBUILD_SCANNER=OFF \
     -DBUILD_LIBRARIES=ON \
     -DBUILD_DOCUMENTATION=OFF \
@@ -35,11 +35,11 @@ EXTRA_OECMAKE_append_class-target = " \
     -DCMAKE_EXE_LINKER_FLAGS="-Wl,--enable-new-dtags" \
     "
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${libdir}/libwayland*.so* \
     "
 
-FILES_${PN}-dev  = " \
+FILES:${PN}-dev  = " \
     ${includedir}/* \
     ${libdir}/pkgconfig/* \
     ${libdir}/cmake/waylandpp/* \
@@ -47,7 +47,7 @@ FILES_${PN}-dev  = " \
     "
 
 FILES_SOLIBSDEV = ""
-INSANE_SKIP_${PN} += "dev-so"
+INSANE_SKIP:${PN} += "dev-so"
 
 BBCLASSEXTEND += "native nativesdk"
 

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

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

recipes-graphics/xorg-xserver/xserver-xorg/0001-xwayland-Add-a-pkg-config-file-for-Xwayland.patch

@@ -1,179 +0,0 @@
-From dffc5939a0e77eae7a183c7790dc1209881c09aa Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 20 Apr 2020 11:29:16 +0200
-Subject: [PATCH] xwayland: Add a pkg-config file for Xwayland
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Xwayland is usually spawned by the Wayland compositor which sets the
-command line options.
-
-If a command line option is not supported, Xwayland will fail to start.
-
-That somehow makes the Xwayland command line option sort of ABI, the
-Wayland compositor need to know if a particular option is supported by
-Xwayland at build time.
-
-Also, currently, Xwayland is being installed along with the rest of the
-common executable programs that users may run, which is sub-optimal
-because, well, Xwayland is not a common executable program, it's meant
-to be a proxy between the Wayland compositor and the legacy X11 clients
-which wouldn't be able to run on Wayland otherwise.
-
-Xwayland would be better installed in `libexec` but that directory is
-(purposedly) not in the user `PATH` and therefore the Wayland compositor
-may not be able to find Xwayland in that case.
-
-To solve both problems (which options are supported by Xwayland and
-where to look for it), add a `pkg-config` file specifically for Xwayland
-which gives the full path to Xwayland (`xwayland`) and which options it
-supports (using `pkg-config` variables).
-
-The `pkg-config` file also provides the `Version` so the build scripts
-can check for a particular version if necessary.
-
-Obviously, Wayland compositors are not required to use the `pkg-config`
-file and can continue to use whatever mechanism they deem preferable.
-
-Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
-Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
-
----
- configure.ac               | 12 ++++++++++++
- hw/xwayland/Makefile.am    |  6 +++++-
- hw/xwayland/meson.build    | 15 +++++++++++++++
- hw/xwayland/xwayland.pc.in |  7 +++++++
- meson.build                |  5 +++++
- 5 files changed, 44 insertions(+), 1 deletion(-)
- create mode 100644 hw/xwayland/xwayland.pc.in
-
-diff --git a/configure.ac b/configure.ac
-index a51a0ee..1b73e75 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -591,6 +591,8 @@ AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest], [Build Xnest serv
- AC_ARG_ENABLE(xquartz,        AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
- AC_ARG_ENABLE(xwayland,       AS_HELP_STRING([--enable-xwayland], [Build Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto])
- AC_ARG_ENABLE(xwayland-eglstream, AS_HELP_STRING([--enable-xwayland-eglstream], [Build Xwayland eglstream support (default: no)]), [XWAYLAND_EGLSTREAM=$enableval], [XWAYLAND_EGLSTREAM=no])
-+AC_ARG_WITH(xwayland-path, AS_HELP_STRING([--with-xwayland-path=PATH], [Directory containing Xwayland executable (default: ${bindir})]),
-+					 [ xwayland_path="$withval" ], [ xwayland_path="$bindir" ])
- AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])
- AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
- AC_ARG_ENABLE(glamor,         AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: auto)]), [GLAMOR=$enableval], [GLAMOR=auto])
-@@ -2346,6 +2348,9 @@ if test "x$XWAYLAND" = xyes; then
- 	if test "x$GLAMOR" = xyes && test "x$GBM" = xyes; then
- 		AC_DEFINE(XWL_HAS_GLAMOR, 1,
- 			  [Build xwayland with glamor support])
-+		AC_SUBST(have_glamor, "true")
-+	else
-+		AC_SUBST(have_glamor, "false")
- 	fi
- 
- 	PKG_CHECK_MODULES(WAYLAND_EGLSTREAM, [wayland-eglstream-protocols >= 1.0.2], [have_wl_eglstream=yes], [have_wl_eglstream=no])
-@@ -2368,6 +2373,9 @@ if test "x$XWAYLAND" = xyes; then
- 		AC_SUBST(WAYLAND_EGLSTREAM_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-eglstream-protocols`)
- 		AC_DEFINE(XWL_HAS_EGLSTREAM, 1,
- 			  [Build xwayland with eglstream support])
-+		AC_SUBST(have_eglstream, "true")
-+	else
-+		AC_SUBST(have_eglstream, "false")
- 	fi
- 
- 	XWAYLAND_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB"
-@@ -2390,6 +2398,9 @@ if test "x$XWAYLAND" = xyes; then
-                           AC_SUBST(SCANNER_ARG, 'code'))
- 
- 	AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
-+
-+	AC_SUBST(xwayland_path)
-+
- fi
- AM_CONDITIONAL(XWAYLAND_EGLSTREAM, [test "x$XWAYLAND_EGLSTREAM" = "xyes"])
- 
-@@ -2546,6 +2557,7 @@ hw/kdrive/ephyr/Makefile
- hw/kdrive/ephyr/man/Makefile
- hw/kdrive/src/Makefile
- hw/xwayland/Makefile
-+hw/xwayland/xwayland.pc
- test/Makefile
- xserver.ent
- xorg-server.pc
-diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
-index bc1cb85..7c252db 100644
---- a/hw/xwayland/Makefile.am
-+++ b/hw/xwayland/Makefile.am
-@@ -1,3 +1,4 @@
-+bindir = @xwayland_path@
- bin_PROGRAMS = Xwayland
- 
- Xwayland_CFLAGS =				\
-@@ -84,7 +85,10 @@ endif
- nodist_Xwayland_SOURCES = $(Xwayland_built_sources)
- CLEANFILES = $(Xwayland_built_sources)
- 
--EXTRA_DIST = drm.xml
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = xwayland.pc
-+
-+EXTRA_DIST = xwayland.pc.in drm.xml
- 
- $(Xwayland_SOURCES): $(Xwayland_built_sources)
- 
-diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
-index 36bf213..40e8612 100644
---- a/hw/xwayland/meson.build
-+++ b/hw/xwayland/meson.build
-@@ -100,4 +100,19 @@ executable(
-         libglxvnd,
-     ],
-     install: true,
-+    install_dir: xwayland_path
-+)
-+
-+xwayland_data = configuration_data()
-+xwayland_data.set('PACKAGE_VERSION', meson.project_version())
-+xwayland_data.set('xwayland_path', xwayland_path)
-+xwayland_data.set('have_glamor', build_glamor ? 'true' : 'false')
-+xwayland_data.set('have_eglstream', build_eglstream ? 'true' : 'false')
-+configure_file(
-+    input: 'xwayland.pc.in',
-+    output: 'xwayland.pc',
-+    configuration: xwayland_data,
-+    install_dir: join_paths(get_option('prefix'),
-+                            get_option('libdir'),
-+                            'pkgconfig'),
- )
-diff --git a/hw/xwayland/xwayland.pc.in b/hw/xwayland/xwayland.pc.in
-new file mode 100644
-index 0000000..cd28026
---- /dev/null
-+++ b/hw/xwayland/xwayland.pc.in
-@@ -0,0 +1,7 @@
-+Name: Xwayland
-+Description: X Server for Wayland
-+Version: @PACKAGE_VERSION@
-+xwayland=@xwayland_path@/Xwayland
-+have_glamor=@have_glamor@
-+have_eglstream=@have_eglstream@
-+have_initfd=true
-diff --git a/meson.build b/meson.build
-index 0531463..c904e7f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -169,6 +169,11 @@ if (host_machine.system() != 'darwin' and
-     if get_option('xwayland') != 'false'
-         xwayland_required = get_option('xwayland') == 'true'
- 
-+        xwayland_path = get_option('xwayland-path')
-+        if (xwayland_path == '')
-+            xwayland_path = join_paths(get_option('prefix'), get_option('bindir'))
-+        endif
-+
-         xwayland_dep = [
-             dependency('wayland-client', version: '>= 1.3.0', required: xwayland_required),
-             dependency('wayland-protocols', version: '>= 1.10', required: xwayland_required),

recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend

@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/xserver-xorg:"
-
-# This backport is needed on hardknott to enable wlroots to create the xwayland backend
-SRC_URI_append = " file://0001-xwayland-Add-a-pkg-config-file-for-Xwayland.patch"
-

recipes-gtk/gimp/gegl_%.bbappend

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

recipes-gtk/gimp/gimp/0001-meson-make-gir-buildable.patch

@@ -0,0 +1,43 @@
+From c8f73f57d63779cfaad140e0521be40972fbec8f Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Wed, 1 Sep 2021 16:44:13 +0200
+Subject: [PATCH] meson: make gir buildable
+
+yocto/oe is capable of building gobject introspection despite cross-compiling.
+add an option to enable gir build even if cross-compiling
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ libgimp/meson.build | 2 +-
+ meson_options.txt   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgimp/meson.build b/libgimp/meson.build
+index 9e7b4fbbe3..99614733d7 100644
+--- a/libgimp/meson.build
++++ b/libgimp/meson.build
+@@ -384,7 +384,7 @@ libgimpui_introspectable_files = [
+   libgimpwidgets_introspectable,
+ ]
+ 
+-if meson.is_cross_build()
++if meson.is_cross_build() and not get_option('introspection')
+   have_gobject_introspection = false
+   gobject_introspection_warning = '\n      '.join(['',
+     'GObject Introspection is disabled while cross-compiling because',
+diff --git a/meson_options.txt b/meson_options.txt
+index 7b6ad78045..c29fdb5b40 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -52,7 +52,7 @@ option('headless-tests',    type: 'feature', value: 'auto', description: 'Use xv
+ option('gtk-doc',           type: 'boolean', value: true,   description: 'Build developer documentation')
+ option('gtk-doc-app',       type: 'boolean', value: false,  description: 'Build developer documentation for app')
+ option('g-ir-doc',          type: 'boolean', value: false,  description: 'Build developer documentation for introspected API')
+-
++option('introspection',   type: 'boolean', value: false,  description: 'GIR is buildable even if crosscompiling')
+ option('linux-input',       type: 'feature', value: 'auto', description: 'Linux input event controller module')
+ option('vec-icons',         type: 'boolean', value: true,   description: 'Use vector icons rather than raster ones')
+ 
+-- 
+2.25.1
+

recipes-gtk/gimp/gimp_2.99.8.bb

@@ -0,0 +1,118 @@
+SUMMARY = "The GIMP is the GNU Image Manipulation Program"
+HOMEPAGE = "http://www.gimp.org"
+SECTION = "graphics"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
+
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+
+DEPENDS = " \
+    appstream-glib \
+    atk \
+    babl \
+    bison-native \
+    cairo \
+    dbus-glib \
+    fontconfig \
+    freetype \
+    gdk-pixbuf-native \
+    gegl \
+    gegl-native \
+    gexiv2 \
+    gtk+3 \
+    harfbuzz \
+    intltool-native \
+    json-glib \
+    lcms \
+    libarchive \
+    libexif \
+    libmypaint \
+    libxslt-native \
+    mypaint-brushes-1.0 \
+    pango \
+    poppler \
+    poppler-data \
+"
+
+DEPENDS:append:libc-musl = " libexecinfo"
+RDEPENDS:${PN} = "mypaint-brushes-1.0 glib-networking"
+
+inherit meson gtk-icon-cache mime-xdg pkgconfig features_check gobject-introspection
+
+SRC_URI = " \
+    git://github.com/GNOME/gimp.git;protocol=https \
+    file://0001-meson-make-gir-buildable.patch \
+"
+
+S = "${WORKDIR}/git"
+SRCREV = "GIMP_2_99_8"
+
+PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib"
+PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
+PACKAGECONFIG[appdata-test] = "-Dappdata-test=enabled,-Dappdata-test=disabled,appstream-glib-native"
+PACKAGECONFIG[bzip2] = ",,bzip2"
+PACKAGECONFIG[cairo-pdf] = "-Dcairo-pdf=enabled,-Dcairo-pdf=disabled"
+PACKAGECONFIG[check-update] = "-Dcheck-update=yes,-Dcheck-update=no"
+PACKAGECONFIG[email] = ",,,xdg-utils"
+PACKAGECONFIG[enable-console-bin] = "-Denable-console-bin=true,-Denable-console-bin=false"
+PACKAGECONFIG[ghostscript] = "-Dghostscript=enabled,-Dghostscript=disabled,ghostscript"
+PACKAGECONFIG[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[gudev] = "-Dgudev=enabled,-Dgudev=disabled,libgudev"
+PACKAGECONFIG[javascript] = "-Djavascript=true,-Djavascript=false,,openjre-8"
+PACKAGECONFIG[jpeg2000] = "-Djpeg2000=enabled,-Djpeg2000=disabled,jasper"
+PACKAGECONFIG[jpeg] = ",,jpeg"
+PACKAGECONFIG[jpeg-xl] = ",,libjxl"
+PACKAGECONFIG[libunwind] = ",,libunwind"
+PACKAGECONFIG[libbacktrace] = ",,libbacktrace"
+PACKAGECONFIG[lua] = "-Dlua=true,-Dlua=false,,luajit lgi"
+PACKAGECONFIG[lzma] = ",,xz"
+PACKAGECONFIG[mng] = "-Dmng=enabled,-Dmng=disabled,libmng"
+PACKAGECONFIG[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[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
+PACKAGECONFIG[xcursor] = "-Dxcursor=enabled,-Dxcursor=disabled,libxcursor"
+PACKAGECONFIG[x11] = "-Dxpm=enabled,-Dxpm=disabled,libxpm libxmu libxext libxfixes"
+PACKAGECONFIG[zlib] = ",,zlib"
+
+PACKAGECONFIG ?= " \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
+    aa \
+    alsa \
+    bzip2 \
+    cairo-pdf \
+    gtk-doc-app \
+    gudev \
+    jpeg \
+    jpeg2000 \
+    jpeg-xl \
+    lua \
+    lzma \
+    mng \
+    png \
+    python \
+    rsvg \
+    tiff \
+    vec-icons \
+    webp \
+    zlib \
+"
+
+FILES:${PN} += " \
+    ${datadir}/metainfo \
+    ${datadir}/gir-1.0 \
+    ${datadir}/appdata \ 
+    ${libdir}/girepository-1.0 \
+"
+
+EXTRA_OEMESON += " \
+    -Dshmem-type=posix \
+    -Dlinux-input=enabled \
+    --buildtype release \
+"
+

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

@@ -1,6 +1,4 @@
 SUMMARY = "A library to write GTK applications that use Layer Shell"
-DESCRIPTION = "A library to write GTK applications that use Layer Shell. Layer Shell is a Wayland protocol for desktop shell components, such as panels, notifications and wallpapers."
-AUTHOR = ""
 HOMEPAGE = "https://github.com/wmww/gtk-layer-shell"
 BUGTRACKER = "https://github.com/www/gtk-layer-shell/issues"
 SECTION = "graphics"
@@ -14,20 +12,19 @@ DEPENDS += " \
 	gtk+3 \
 	wayland \
 	wayland-native \
-	gobject-introspection \
-	gobject-introspection-native \
-	qemu-native \
-	prelink-native \
 "
 
 SRC_URI = "git://github.com/wmww/gtk-layer-shell.git;protocol=https"
 
 S = "${WORKDIR}/git"
-PV = "0.6.0"
-SRCREV = "v${PV}"
+PV = "0.6.0+${SRCREV}"
+SRCREV = "b5e0bbc7f2ac632a65db29193fa384baeb23a96c"
 
-inherit meson pkgconfig features_check
-FILES_${PN} = "${datadir} ${libdir}"
+inherit meson pkgconfig features_check gobject-introspection
+
+EXTRA_OEMESON += "--buildtype release"
+
+FILES:${PN} = "${datadir} ${libdir}"
 
 BBCLASSEXTEND = ""
 

recipes-gtk/nwg-shell/azote_git.bb

@@ -6,7 +6,7 @@ SRC_URI = " \
 	git://github.com/nwg-piotr/azote.git;protocol=https \
 "
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
 	python3 \
 	gtk+3 \
 	python3-pygobject \
@@ -26,7 +26,7 @@ S = "${WORKDIR}/git"
 PV = "1.9.1"
 SRCREV = "v${PV}"
 
-do_install_append() {
+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
@@ -35,7 +35,7 @@ do_install_append() {
 	install -m 644 ${S}/dist/indicator_attention.png ${D}${datadir}/azote
 }
 
-FILES_${PN}_append = " \
+FILES:${PN}:append = " \
 	${datadir} \
 	${bindir} \
 "

recipes-gtk/nwg-shell/gopsuinfo_git.bb

@@ -0,0 +1,19 @@
+SUMMARY = "Go version of the psuinfo python script."
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=22ed6cb3c33862e689e075b45066a779"
+
+GO_IMPORT = "github.com/nwg-piotr/gopsuinfo.git"
+
+SRC_URI = "git://${GO_IMPORT};branch=main"
+
+SRCREV = "838b4893f48924bb03f5124701754836562d090a"
+
+inherit go go-mod
+
+GO_INSTALL = "${GO_IMPORT}"
+
+do_install:append() {
+	# remove precompiled x86 binary
+	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
+}
+

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

@@ -19,7 +19,7 @@ inherit go go-mod
 
 GO_INSTALL = "${GO_IMPORT}"
 
-do_install_append() {
+do_install:append() {
 	# remove precompiled x86 binary
 	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
 }

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

@@ -11,15 +11,16 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-dock.git"
 
 SRC_URI = "git://${GO_IMPORT};nobranch=1"
 
-PV = "0.1.5"
+PV = "0.2.0"
 SRCREV = "v${PV}"
 
 inherit go go-mod
 
 GO_INSTALL = "${GO_IMPORT}"
 
-do_install_append() {
-	# remove precompiled x86 binary
+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
 }
 

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

@@ -7,7 +7,7 @@ DEPENDS = " \
 	gtk-layer-shell \
 "
 
-RRECOMMENDS_${PN} = " \
+RRECOMMENDS:${PN} = " \
 	thunar \
 	foot \
 "
@@ -16,15 +16,16 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-drawer.git"
 
 SRC_URI = "git://${GO_IMPORT};nobranch=1"
 
-PV = "0.1.4"
+PV = "0.2.1"
 SRCREV = "v${PV}"
 
-inherit go go-mod
+inherit go go-mod pkgconfig
 
 GO_INSTALL = "${GO_IMPORT}"
 
-do_install_append() {
+do_install:append() {
 	# remove precompiled x86 binary
 	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
+	rm -r ${D}${libdir}/go/pkg/mod/github.com/dlasky/gotk3-layershell*/example
 }
 

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

@@ -26,10 +26,9 @@ PACKAGECONFIG ?= " \
 
 SRC_URI = " \
 	git://github.com/nwg-piotr/nwg-launchers.git;protocol=https \
-	file://0001-nwg_tools.cc-fix-build-without-gdk-x11.patch \
 "
 SRCREV = "v${PV}"
-PV = "0.5.0"
+PV = "0.6.3"
 
 S = "${WORKDIR}/git"
 

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

@@ -9,7 +9,7 @@ DEPENDS = " \
 	gtk-layer-shell \
 "
 
-RRECOMMENDS_${PN} = " \
+RRECOMMENDS:${PN} = " \
 	thunar \
 	foot \
 "
@@ -25,7 +25,7 @@ inherit go go-mod
 
 GO_INSTALL = "${GO_IMPORT}"
 
-do_install_append() {
+do_install:append() {
 	# remove precompiled x86 binary
 	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
 }

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

@@ -6,7 +6,7 @@ SRC_URI = " \
 	git://github.com/nwg-piotr/nwg-panel.git;protocol=https \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
 	light \
 	python3 \
 	python3-pygobject \
@@ -17,8 +17,12 @@ RDEPENDS_${PN} = "\
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "0.3.3"
+PV = "0.4.3"
 SRCREV = "v${PV}"
 
-INSANE_SKIP_${PN} = "file-rdeps"
+do_install:append() {
+	rm  ${D}${libdir}/python3.9/site-packages/nwg_panel/executors/arch_updates.py
+}
+
+INSANE_SKIP:${PN} = "file-rdeps"
 

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

@@ -7,7 +7,7 @@ SRC_URI = " \
 "
 
 DEPENDS = "python3"
-RDEPENDS_${PN} = "python3-pygobject"
+RDEPENDS:${PN} = "python3-pygobject"
 
 inherit setuptools3 gobject-introspection
 

recipes-gtk/srain/srain_git.bb

@@ -0,0 +1,37 @@
+SUMMARY = "Modern IRC client written in GTK."
+HOMEPAGE = "https://github.com/SrainApp/srain"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3d42081fffd0d03da6e4a8ee09ae1a18"
+
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+
+DEPENDS = " \
+    gtk+3 \
+    cairo \
+    gdk-pixbuf \
+    glib-2.0 \
+    libconfig \
+    libsoup-2.4 \
+    openssl \
+    libsecret \
+"
+
+UNKNOWN_CONFIGURE_WHITELIST:append = " introspection"
+
+inherit meson gtk-icon-cache mime-xdg pkgconfig features_check gobject-introspection
+
+SRC_URI = " \
+    git://github.com/SrainApp/srain.git;protocol=https \
+"
+
+S = "${WORKDIR}/git"
+PV = "1.3.0"
+SRCREV = "${PV}"
+
+EXTRA_OEMESON += " \
+    --buildtype release \
+    -Ddoc_builders= \
+"
+
+FILES:${PN} += "${datadir}/metainfo"
+

recipes-gtk/waybar/waybar_git.bb

@@ -11,12 +11,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=98f7e9dc79966298d76caf1b0a6d35c1"
 REQUIRED_DISTRO_FEATURES = "wayland gobject-introspection-data"
 
 DEPENDS += " \
+	fmt \
 	glib-2.0-native \
 	gtkmm3 \
 	jsoncpp \
+	libevdev \
 	libsigc++-3 \
-	fmt \
-	spdlog \
+	libxkbcommon \
 	gtk+3 \
 	gobject-introspection \
 	spdlog \
@@ -44,21 +45,21 @@ PACKAGECONFIG ?= " \
     date \
 "
 
-RRECOMMENDS_${PN} += " \
+RRECOMMENDS:${PN} += " \
 	font-awesome-otf \
 "
 
 SRC_URI = "git://github.com/Alexays/Waybar.git;protocol=https"
 
 S = "${WORKDIR}/git"
-PV = "0.9.7+${SRCREV}"
-SRCREV = "91cdf80c65dcecf16922e4ac724f37471cbad529"
+PV = "0.9.8+${SRCREV}"
+SRCREV = "6eb9606f239418d225c7367f9e0f44adca764f3c"
 
 inherit meson pkgconfig features_check
 
 PACKAGES += "${PN}-systemd"
 
-FILES_${PN}-systemd += "${libdir}/systemd"
+FILES:${PN}-systemd += "${libdir}/systemd"
 
 BBCLASSEXTEND = ""
 

recipes-support/asciinema/asciinema_git.bb

@@ -0,0 +1,18 @@
+SUMMARY = "Terminal session recorder and the best companion of asciinema.org."
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = " \
+	git://github.com/asciinema/asciinema.git;protocol=https \
+"
+
+RDEPENDS:${PN} = " \
+	python3 \
+"
+
+inherit setuptools3
+
+S = "${WORKDIR}/git"
+PV = "2.1.0"
+SRCREV = "v${PV}"
+

recipes-support/fnott/fnott_git.bb

@@ -24,7 +24,7 @@ DEPENDS = " \
 	wayland-protocols \
 "
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
 	fontconfig \
 	freetype \
 	wlroots \
@@ -39,6 +39,6 @@ SRCREV = "${PV}"
 EXTRA_OEMESON += "--buildtype release"
 
 PACKAGES += "${PN}-zsh-completion"
-FILES_${PN}-zsh-completion = "${datadir}/zsh"
+FILES:${PN}-zsh-completion = "${datadir}/zsh"
 
 BBCLASSEXTEND = ""

recipes-support/foot/foot_git.bb

@@ -6,8 +6,6 @@ LICENSE = "MIT"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3a7351a597a91e763901f7c76f21e798"
 
-REQUIRED_DISTRO_FEATURES = "wayland"
-
 DEPENDS = " \
 	fcft \
 	fontconfig \
@@ -16,29 +14,43 @@ DEPENDS = " \
 	pixman \
 	wayland \
 	wayland-native \
-	scdoc-native \
 "
 
-RRECOMMENDS_${PN} = "xdg-utils"
+RRECOMMENDS:${PN} = "xdg-utils"
 
 SRC_URI = " \
 	git://codeberg.org/dnkl/foot.git;protocol=https \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.8.2"
-SRCREV = "${PV}"
+PV = "1.10.0"
+SRCREV = "31966f5494ed82268c414b04b63b20e88d4fff16"
 
-PACKAGECONFIG[terminfo] = "-Dterminfo=enabled,-Dterminfo=disabled,ncurses-native"
 PACKAGECONFIG[grapheme-clustering] = "-Dgrapheme-clustering=enabled,-Dgrapheme-clustering=disabled,utf8proc"
+PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,scdoc-native"
+PACKAGECONFIG[themes] = "-Dthemes=true,-Dthemes=false"
 
 PACKAGECONFIG ?= " \
 	grapheme-clustering \
+	themes \
 "
 
-inherit meson pkgconfig features_check
+EXTRA_OEMESON += "--buildtype=release -Dterminfo=disabled"
 
-FILES_${PN} = " \
+
+# 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} \
 "

recipes-support/fuzzel/fuzzel_git.bb

@@ -24,7 +24,7 @@ DEPENDS = " \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.6.1"
+PV = "1.6.2"
 SRCREV = "${PV}"
 
 inherit meson pkgconfig features_check
@@ -42,6 +42,6 @@ PACKAGECONFIG ?= " \
 EXTRA_OEMESON += "--buildtype release"
 
 PACKAGES += "${PN}-zsh-completion"
-FILES_${PN}-zsh-completion = "${datadir}/zsh"
+FILES:${PN}-zsh-completion = "${datadir}/zsh"
 
 BBCLASSEXTEND = ""

recipes-support/imv/imv_git.bb

@@ -25,20 +25,21 @@ PACKAGECONFIG[x11] = "-Dwindows=all,-Dwindows=wayland,libx11 libglu xcb-util-ren
 PACKAGECONFIG[tiff] = ",,tiff"
 PACKAGECONFIG[png] = ",,libpng"
 PACKAGECONFIG[jpeg] = ",,libjpeg-turbo"
-#librsvg shipped in oe-core is too old ... requires v2.44
 PACKAGECONFIG[rsvg] = ",,librsvg"
+PACKAGECONFIG[doc] = ",,asciidoc-native"
 
 PACKAGECONFIG ?= " \
 	jpeg \
 	png \
 	tiff \
+	rsvg \
 "
 
 SRC_URI = "git://github.com/eXeC64/imv.git;protocol=https"
 
 S = "${WORKDIR}/git"
-PV = "4.2.0"
-SRCREV = "v${PV}"
+PV = "4.3.0"
+SRCREV = "f58e81288b2138d1b532cf11fb95bbcbac362a4e"
 
 inherit meson pkgconfig mime-xdg features_check
 

recipes-support/mako/mako_git.bb

@@ -21,9 +21,9 @@ DEPENDS = " \
 	wayland-protocols \
 "
 
-RDEPENDS_${PN} = "dbus"
+RDEPENDS:${PN} = "dbus"
 
-RRECOMMENDS_${PN} = "jq"
+RRECOMMENDS:${PN} = "jq"
 
 inherit meson pkgconfig features_check
 
@@ -45,7 +45,7 @@ SRCREV = "v${PV}"
 
 EXTRA_OEMESON += "--buildtype release"
 
-FILES_${PN} += "${datadir}"
+FILES:${PN} += "${datadir}"
 
 BBCLASSEXTEND = ""
 

recipes-support/nwg-shell/nwg-launchers/0001-nwg_tools.cc-fix-build-without-gdk-x11.patch

@@ -1,26 +0,0 @@
-From 2520ce268d028e775179f9a48903827c56399528 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Tue, 27 Jul 2021 03:47:22 +0200
-Subject: [PATCH] nwg_tools.cc: fix build without gdk-x11
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- common/nwg_tools.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/common/nwg_tools.cc b/common/nwg_tools.cc
-index 834a9e3..92bae6a 100644
---- a/common/nwg_tools.cc
-+++ b/common/nwg_tools.cc
-@@ -83,7 +83,7 @@ std::string detect_wm(const Glib::RefPtr<Gdk::Display>& display, const Glib::Ref
-      * but let's try to find a WM name if possible. If not, let it be just "other" */
-     std::string wm_name{"other"};
- 
--#ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_GDK_X11
-     {
-         auto* g_display = display->gobj();
-         auto* g_screen  = screen->gobj();
--- 
-2.25.1
-

recipes-support/spdlog/spdlog_%.bbappend

@@ -1,3 +0,0 @@
-PV = "1.8.5"
-SRCREV = "v${PV}"
-

recipes-support/swaybg/swaybg_git.bb

@@ -20,6 +20,9 @@ SRC_URI = " \
 	git://github.com/swaywm/swaybg.git;protocol=https \
 "
 
+# Reproducibility issue. Fix me!
+CFLAGS:append = " -Wno-error=date-time"
+
 S = "${WORKDIR}/git"
 PV = "1.1"
 SRCREV = "v${PV}"

recipes-support/swayidle/swayidle_git.bb

@@ -19,7 +19,7 @@ SRC_URI = " \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.6"
+PV = "1.7"
 SRCREV = "${PV}"
 
 inherit meson pkgconfig features_check
@@ -33,7 +33,10 @@ PACKAGECONFIG ?= " \
 	${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)} \
 "
 
-FILES_${PN} += "${datadir}"
+# Reproducibility issue. Fix me!
+CFLAGS:append = " -Wno-error=date-time"
+
+FILES:${PN} += "${datadir}"
 
 EXTRA_OEMESON += "--buildtype release"
 

recipes-support/swaylock/swaylock_git.bb

@@ -21,8 +21,8 @@ SRC_URI = " \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.5"
-SRCREV = "${PV}"
+PV = "1.5+${SRCREV}"
+SRCREV = "2bf76009e1d279a4194d37b9ee4f2bf0d9424d62"
 
 PACKAGECONFIG[pam] = ",,libpam"
 PACKAGECONFIG[gdk-pixbuf] = ",,gdk-pixbuf"
@@ -33,11 +33,14 @@ PACKAGECONFIG ?= " \
 	pam \
 "
 
+# Reproducibility issue. Fix me!
+CFLAGS:append = " -Wno-error=date-time"
+
 inherit meson pkgconfig features_check
 
 EXTRA_OEMESON += "--buildtype release"
 
-FILES_${PN} += "${datadir}"
+FILES:${PN} += "${datadir}"
 
 BBCLASSEXTEND = ""
 

recipes-support/virtboard/virtboard_git.bb

@@ -0,0 +1,33 @@
+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

@@ -28,7 +28,7 @@ inherit meson pkgconfig features_check
 EXTRA_OEMESON += "--buildtype release"
 GIR_EXTRA_LIBS_PATH="${WORKDIR}"
 
-FILES_${PN} += "${prefix}"
+FILES:${PN} += "${prefix}"
 
 BBCLASSEXTEND = ""
 

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

@@ -25,7 +25,7 @@ inherit meson pkgconfig features_check
 
 EXTRA_OEMESON += "--buildtype release"
 
-FILES_${PN} += "${datadir}"
+FILES:${PN} += "${datadir}"
 
 BBCLASSEXTEND = ""
 

recipes-support/yambar/yambar_git.bb

@@ -21,14 +21,14 @@ DEPENDS = " \
 	scdoc-native \
 "
 
-RRECOMMENDS_${PN} += " \
+RRECOMMENDS:${PN} += " \
 	font-awesome-otf \
 "
 
 inherit meson pkgconfig
 
 S = "${WORKDIR}/git"
-PV = "1.6.1"
+PV = "1.6.2"
 SRCREV = "${PV}"
 
 PACKAGECONFIG[wayland] = "-Dbackend-wayland=enabled,-Dbackend-wayland=disabled,wayland wayland-native wayland-protocols"
@@ -45,7 +45,7 @@ PACKAGECONFIG ?= " \
 EXTRA_OEMESON += "--buildtype release"
 
 PACKAGES += "${PN}-zsh-completion"
-FILES_${PN}-zsh-completion = "${datadir}/zsh"
+FILES:${PN}-zsh-completion = "${datadir}/zsh"
 
 BBCLASSEXTEND = ""
 

recipes-wlroots/sway/sway_git.bb

@@ -26,9 +26,9 @@ DEPENDS += " \
 	wayland-protocols \
 "
 # sways default config makes use of it
-RDEPENDS_${PN} ?= "swaybg"
+RDEPENDS:${PN} ?= "swaybg"
 
-RRECOMMENDS_${PN} ?= " \
+RRECOMMENDS:${PN} ?= " \
 	foot \
 	jq \
 	grim \
@@ -37,11 +37,11 @@ RRECOMMENDS_${PN} ?= " \
 "
 
 SRC_URI = " \
-	git://github.com/swaywm/sway.git;protocol=https;branch=v1.6 \
+	git://github.com/swaywm/sway.git;protocol=https;branch=master \
 "
 
-SRCREV = "${PV}"
-PV = "1.6.1"
+SRCREV = "119f31edb4f0c61fd074229040dd93e047ff7cb4"
+PV = "1.6.1+${SRCREV}"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
@@ -60,13 +60,15 @@ PACKAGECONFIG ?= " \
 	gdk-pixbuf \
 "
 
+# Reproducibility issue. Fix me!
+CFLAGS:append = " -Wno-error=date-time"
 EXTRA_OEMESON += "--buildtype release"
 
-do_install_append() {
+do_install:append() {
 	install -m 755 ${S}/contrib/grimshot ${D}${bindir}
 }
 
-FILES_${PN}_append = " \
+FILES:${PN}:append = " \
 	${datadir} \
 "
 

recipes-wlroots/wayfire/wayfire_git.bb

@@ -27,7 +27,7 @@ DEPENDS += " \
 	wayland-protocols \
 "
 
-RRECOMMENDS_${PN} += " \
+RRECOMMENDS:${PN} += " \
 	wlroots \
 	wcm \
 	wf-config \

recipes-wlroots/wayfire/wcm_0.7.0.bb

@@ -25,7 +25,7 @@ inherit meson pkgconfig features_check
 
 EXTRA_OEMESON += "--buildtype release"
 
-FILES_${PN} += "${prefix}"
+FILES:${PN} += "${prefix}"
 
 BBCLASSEXTEND = ""
 

recipes-wlroots/wayfire/wf-shell_0.7.0.bb

@@ -17,7 +17,7 @@ DEPENDS = " \
 	libnotify3 \
 "
 
-DEPENDS_append_class-target = " gobject-introspection-native qemu-native prelink-native"
+DEPENDS:append:class-target = " gobject-introspection-native qemu-native prelink-native"
 
 REQUIRED_DISTRO_FEATURES = "wayland gobject-introspection-data"
 
@@ -33,7 +33,7 @@ inherit meson pkgconfig features_check
 
 EXTRA_OEMESON += "--buildtype release"
 
-FILES_${PN} += "${prefix}"
+FILES:${PN} += "${prefix}"
 
 BBCLASSEXTEND = ""
 

recipes-wlroots/wlroots/wlroots_git.bb

@@ -1,9 +1,9 @@
 SUMMARY = "A modular Wayland compositor library"
 DESCRIPTION = "Pluggable, composable, unopinionated modules for building a \
-               Wayland compositor; or about 50,000 lines of code you were \
-               going to write anyway"
-HOMEPAGE = "https://github.com/swaywm/wlroots"
-BUGTRACKER = "https://github.com/swaywm/wlroots/issues"
+Wayland compositor; or about 50,000 lines of code you were \
+going to write anyway."
+HOMEPAGE = "https://gitlab.freedesktop.org/wlroots"
+BUGTRACKER = "https://gitlab.freedesktop.org/wlroots/wlroots/-/issues"
 SECTION = "graphics"
 LICENSE = "MIT"
 
@@ -13,7 +13,6 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 
 DEPENDS += " \
 	libdrm \
-	libinput \
 	libxkbcommon \
 	pixman \
 	seatd \
@@ -23,17 +22,25 @@ DEPENDS += " \
 	wayland-protocols \
 "
 
-PACKAGECONFIG[gles2] = "-Drenderers=gles2"
-PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,xcb-util-renderutil"
+PACKAGECONFIG[libinput] = ",,libinput"
+PACKAGECONFIG[gles] = ",,virtual/egl virtual/libgles2"
+PACKAGECONFIG[systemd] = ",,systemd"
+PACKAGECONFIG[sysvinit] = ",,eudev"
+PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang glslang-native"
+PACKAGECONFIG[x11] = ",,xcb-util-renderutil"
 PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg xcb-util-wm"
+PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false"
 
 PACKAGECONFIG ?= " \
-	gles2 \
+	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+	${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)} \
+	${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
+	${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
 "
 
-SRC_URI = "git://github.com/swaywm/wlroots.git;protocol=https"
-SRCREV = "${PV}"
-PV = "0.14.0"
+SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=master;protocol=https"
+SRCREV = "ebe3cfaceb77ca3b446fa52af6aedc89c98770e5"
+PV = "0.14.1+${SRCREV}"
 
 S = "${WORKDIR}/git"
 
@@ -41,12 +48,14 @@ inherit meson pkgconfig features_check
 
 EXTRA_OEMESON += "--buildtype release"
 
-FILES_${PN} = "${bindir} \
-               ${libdir} \
-              "
+FILES:${PN} = " \
+	${bindir} \
+	${libdir} \
+"
 
-FILES_${PN}-dev = "${includedir} \
-                   ${libdir}/libwlroots.so \
+FILES:${PN}-dev = " \
+	${includedir} \
+	${libdir}/libwlroots.so \
 "
 
 BBCLASSEXTEND = ""