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>
python3: move python link to python3-core package
2025-07-13 14:34:34 +02:00 · 2025-04-24 05:12:35 +02:00 · 2025-04-22 14:55:56 +02:00 · 2023-09-02 08:44:58 +02:00 · 2023-04-14 10:01:37 +02:00 · 2023-04-14 09:18:03 +02:00
170 changed files with 1243 additions and 4449 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ 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, cage, phosh, hyprland, 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

@ -18,12 +18,6 @@ This layer depends on:
        branch: master
        revision: HEAD

-optional for hyprlands desktop-portal:
-
-    URI: git://code.qt.io/cgit/yocto/meta-qt6
-        branch: master
-        revision: HEAD
-
 Building

 Follow the usual steps to setup OpenEmbedded and bitbake.
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -2,20 +2,15 @@
 BBPATH .= ":${LAYERDIR}"

 # We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend ${LAYERDIR}/recipes*/*/*/*.bb ${LAYERDIR}/recipes*/*/*/*.bbappend"
+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 = "styhead"
+LAYERSERIES_COMPAT_wayland = "mickledore"

 LAYERDEPENDS_wayland = " \
 	core \
 	openembedded-layer \
 "
-
-BBFILES_DYNAMIC += " \
-    qt6-layer:${LAYERDIR}/dynamic-layers/meta-qt6/*/*/*.bb \
-    qt6-layer:${LAYERDIR}/dynamic-layers/meta-qt6/*/*/*.bbappend \
-"
--- a/dynamic-layers/meta-qt6/recipes-qt/adwaita-qt/adwaita-qt_1.4.2.bb
+++ b/dynamic-layers/meta-qt6/recipes-qt/adwaita-qt/adwaita-qt_1.4.2.bb
@ -1,25 +0,0 @@
-SUMMARY = "A native style to bend Qt5/Qt6 applications to look like they belong into GNOME Shell.."
-HOMEPAGE = "https://github.com/FedoraQt/adwaita-qt"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
-
-DEPENDS = "qtbase"
-
-inherit qt6-cmake
-
-EXTRA_OECMAKE += "-DUSE_QT6=ON"
-
-SRC_URI = "git://github.com/FedoraQt/adwaita-qt.git;protocol=https;nobranch=1"
-
-S = "${WORKDIR}/git"
-SRCREV = "3807292acee096459a73732f663544916d9eb0e5"
-
-FILES:${PN} += "${libdir}/plugins/styles/adwaita.so"
-
-PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
-
-do_install:append() {
-    # add hack to unbreak crosscompile for qgnomeplatform
-    sed -i "s|include(\"\${CMAKE_CURRENT_LIST_DIR}\/AdwaitaQt6Targets.cmake\")||" ${D}${libdir}/cmake/AdwaitaQt6/AdwaitaQt6Config.cmake
-    sed -i -e 's|${STAGING_DIR_HOST}||g' ${D}${libdir}/cmake/AdwaitaQt6/AdwaitaQt6Targets.cmake
-}
--- a/dynamic-layers/meta-qt6/recipes-qt/hyprland-welcome/hyprland-welcome_git.bb
+++ b/dynamic-layers/meta-qt6/recipes-qt/hyprland-welcome/hyprland-welcome_git.bb
@ -1,15 +0,0 @@
-SUMMARY = "Hyprland's cute welcome app, written in qt6."
-HOMEPAGE = "https://hyprland.org/"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e6458723c467506fd0c4aea3be2bcf8a"
-
-SRC_URI = "git://github.com/hyprwm/hyprland-welcome.git;protocol=https;branch=main"
-
-PV = "0.0.1"
-SRCREV = "51561c00288775ad7afc20f47783bb068093ca5a"
-S = "${WORKDIR}/git"
-
-DEPENDS = "qtbase"
-RDEPENDS:${PN} = "qtwayland"
-
-inherit qt6-cmake
--- a/dynamic-layers/meta-qt6/recipes-qt/qAdwaitaDecorations/qadwaitadecorations_0.1.5.bb
+++ b/dynamic-layers/meta-qt6/recipes-qt/qAdwaitaDecorations/qadwaitadecorations_0.1.5.bb
@ -1,22 +0,0 @@
-SUMMARY = "Qt decoration plugin implementing Adwaita-like client-side decorations."
-HOMEPAGE = "https://github.com/FedoraQt/QAdwaitaDecorations"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742"
-
-DEPENDS = " \
-	qtbase \
-	qtsvg \
-	qtwayland \
-	qtwayland-native \
-"
-
-inherit qt6-cmake
-
-EXTRA_OECMAKE += "-DUSE_QT6=ON"
-
-SRC_URI = "git://github.com/FedoraQt/QAdwaitaDecorations.git;protocol=https;nobranch=1"
-
-S = "${WORKDIR}/git"
-SRCREV = "8f7357cf57b46216160cd3dc1f09f02a05fed172"
-
-FILES:${PN} += "${libdir}"
--- a/dynamic-layers/meta-qt6/recipes-qt/qgnomeplatform/qgnomeplatform_0.9.2.bb
+++ b/dynamic-layers/meta-qt6/recipes-qt/qgnomeplatform/qgnomeplatform_0.9.2.bb
@ -1,30 +0,0 @@
-SUMMARY = "QGnomePlatform is a Qt Platform Theme designed to use as many of the GNOME settings as possible in unmodified Qt applications"
-HOMEPAGE = "https://github.com/FedoraQt/QGnomePlatform"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=40d2542b8c43a3ec2b7f5da31a697b88"
-
-DEPENDS = " \
-	adwaita-qt \
-	glib-2.0 \
-	gsettings-desktop-schemas \
-	gtk+3 \
-	qtbase \
-	qtdeclarative \
-	qtdeclarative-native \
-	qtwayland \
-	qtwayland-native \
-"
-
-RDEPENDS:${PN} = "adwaita-qt"
-
-inherit qt6-cmake
-
-EXTRA_OECMAKE += "-DUSE_QT6=ON"
-
-SRC_URI = "git://github.com/FedoraQt/QGnomePlatform.git;protocol=https;nobranch=1"
-
-S = "${WORKDIR}/git"
-SRCREV = "71f1fe577b5b665bc19c7ab3736ffe8387fa52ee"
-
-FILES:${PN} += "${libdir} ${datadir}"
-FILES:${PN}-dev = ""
--- a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/hyprland-share-picker.bb
+++ b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/hyprland-share-picker.bb
@ -1,19 +0,0 @@
-SUMMARY = "Share picker for hyprlands screenshot/screencast xdg-desktop-portal backend"
-HOMEPAGE = "https://github.com/hyprwm/xdg-desktop-portal-hyprland"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=e0f1d50df739a9fb8eae12a8f37ce352"
-
-# Note: meta-qt6 is needed
-DEPENDS = "qtbase"
-RDEPENDS:${PN} = "qtwayland"
-RRECOMMENDS:${PN} = "qgnomeplatform"
-
-require xdg-desktop-portal-hyprland.inc
-
-inherit qt6-cmake features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl wayland"
-
-S = "${WORKDIR}/git/hyprland-share-picker"
-
-
--- a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb
+++ b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb
@ -1,36 +0,0 @@
-SUMMARY = "This provides screenshot/screencast xdg-desktop-portal backends for hyprland."
-HOMEPAGE = "https://github.com/hyprwm/xdg-desktop-portal-hyprland"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e0f1d50df739a9fb8eae12a8f37ce352"
-
-SRC_URI:append = " \
-	file://0001-meson.build-Dont-build-hyprland-share-picker-with-me.patch \
-"
-
-require xdg-desktop-portal-hyprland.inc
-
-# Note: meta-qt6 is needed
-DEPENDS = " \
-    hyprlang \
-    hyprutils \
-    hyprwayland-scanner-native \
-    libdrm \
-    pipewire \
-    sdbus-c++-1 \
-    virtual/libgbm \
-    wayland \
-    wayland-protocols \
-"
-
-RDEPENDS:${PN} = "hyprland-share-picker grim slurp hyprpicker hyprlang"
-RCONFLICTS:${PN} = "xdg-desktop-portal-wlr xdg-desktop-portal-gnome"
-
-inherit meson pkgconfig features_check
-REQUIRED_DISTRO_FEATURES = "opengl wayland"
-
-S = "${WORKDIR}/git"
-
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
-PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
-
-FILES:${PN} += "${systemd_user_unitdir} ${datadir}"
--- a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.inc
+++ b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.inc
@ -1,3 +0,0 @@
-SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1"
-SRCREV = "73b8c4f1150040644cf678aa8bbf2cec48a433cf"
-PV = "1.3.4"
--- a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland/0001-meson.build-Dont-build-hyprland-share-picker-with-me.patch
+++ b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland/0001-meson.build-Dont-build-hyprland-share-picker-with-me.patch
@ -1,22 +0,0 @@
-From 8d7b941147a48957d8464cce2058d52f37040d26 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Wed, 20 Sep 2023 16:56:17 +0200
-Subject: [PATCH] meson.build: Dont build hyprland-share-picker with meson
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 77c1a80..3169e9c 100644
--- a/meson.build
-+++ b/meson.build
-@@ -66,4 +66,3 @@ inc = include_directories('.', 'protocols')
- 
- subdir('protocols')
- subdir('src')
-subdir('hyprland-share-picker')
-- 
-2.42.0
-
--- a/recipes-core/elogind/elogind_git.bb
+++ b/recipes-core/elogind/elogind_git.bb
@ -9,7 +9,7 @@ SRC_URI = "git://github.com/elogind/elogind.git;protocol=https;nobranch=1"

 DEPENDS += " \
 	acl dbus \
-	${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'eudev', d)} \
+	eudev \
 	gperf-native \
 	libcap \
 	libpam \
@ -21,8 +21,8 @@ DEPENDS += " \


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

 inherit meson pkgconfig

@ -33,13 +33,5 @@ do_install:prepend() {
 	install -d ${D}${libdir}/elogind/system-sleep
 }

-FILES:${PN} += "${prefix}"
+FILES:${PN} += "/usr"

-EXTRA_OEMESON:class-target += "--cross-file=${WORKDIR}/meson-${PN}.cross"
-
-do_write_config:append:class-target() {
-    cat >${WORKDIR}/meson-${PN}.cross <<EOF
-[binaries]
-nologin = '${sbindir}/nologin'
-EOF
-}
--- a/recipes-core/sdbus-c++/sdbus-c++-1/run-ptest
+++ b/recipes-core/sdbus-c++/sdbus-c++-1/run-ptest
@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-
-./sdbus-c++-unit-tests 2>&1 && echo "PASS: sdbus-c++-unit-tests" || echo "FAIL: sdbus-c++-unit-tests"
-
-./sdbus-c++-integration-tests 2>&1 && echo "PASS: sdbus-c++-integration-tests" || echo "FAIL: sdbus-c++-integration-tests"
--- a/recipes-core/sdbus-c++/sdbus-c++-1_1.6.0.bb
+++ b/recipes-core/sdbus-c++/sdbus-c++-1_1.6.0.bb
@ -1,51 +0,0 @@
-SUMMARY = "sdbus-c++"
-DESCRIPTION = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API in modern C++"
-
-SECTION = "libs"
-
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742"
-
-inherit cmake pkgconfig systemd ptest
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-external-libsystemd', 'with-builtin-libsystemd', d)} \
-                   ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}"
-PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap,basu"
-PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd"
-PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DTESTS_INSTALL_PATH=${PTEST_PATH},-DBUILD_TESTS=OFF,googletest gmock"
-
-DEPENDS += "expat"
-
-PV .= "+git"
-SRCREV = "7450515d0bc632b871d0d3f549ddb24783dd008f"
-SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \
-           file://run-ptest"
-
-EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \
-                 -DBUILD_DOC=ON \
-                 -DBUILD_DOXYGEN_DOC=OFF"
-
-S = "${WORKDIR}/git"
-
-# Link libatomic on architectures without 64bit atomics fixes
-# libsdbus-c++.so.1.1.0: undefined reference to `__atomic_load_8'
-LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
-LDFLAGS:append:powerpc = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
-LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
-
-do_install:append() {
-    if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then
-        rm -rf ${D}${sysconfdir}/dbus-1
-    fi
-}
-
-do_install_ptest() {
-    DESTDIR='${D}' cmake_runcmake_build --target tests/install
-}
-
-FILES:${PN}-ptest =+ "${sysconfdir}/dbus-1/system.d/"
-FILES:${PN}-dev += "${bindir}/sdbus-c++-xml2cpp"
-
-RDEPENDS:${PN}-ptest += "dbus"
-# It adds -isystem which is spurious, no idea where it gets it from
-CCACHE_DISABLE = "1"
--- a/recipes-devtools/cxxopts/cxxopts_git.bb
+++ b/recipes-devtools/cxxopts/cxxopts_git.bb
@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8de00431559a76a1b43f6fd44f8f6689"
 SRC_URI = "git://github.com/jarro2783/cxxopts.git;protocol=https;branch=master"

 S = "${WORKDIR}/git"
-PV = "3.2.1"
-SRCREV = "4bf61f08697b110d9e3991864650a405b3dd515d"
+PV = "3.0.0"
+SRCREV = "c74846a891b3cc3bfa992d588b1295f528d43039"

 inherit cmake

--- a/recipes-devtools/python/python-brotli_git.bb
+++ b/recipes-devtools/python/python-brotli_git.bb
@ -0,0 +1,18 @@
+SUMMARY = "Python Module for the Brotli compression algorithm."
+HOMEPAGE = "https://github.com/google/brotli/" 
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=941ee9cd1609382f946352712a319b4b" 
+
+inherit cmake setuptools3
+
+SRC_URI = " \
+    git://github.com/google/brotli.git;protocol=https;branch=master \
+"
+
+PV = "1.0.9"
+SRCREV = "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release"
+
--- a/recipes-devtools/python/python3-chevron_git.bb
+++ b/recipes-devtools/python/python3-chevron_git.bb
@ -1,12 +0,0 @@
-SUMMARY = "A python implementation of the mustache templating language."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4a2d7b4be06609e1a683e7d895c75c02"
-
-SRC_URI = "git://github.com/noahmorrison/chevron;protocol=https;branch=main"
-
-inherit setuptools3
-
-S = "${WORKDIR}/git"
-PV = "0.13.1"
-SRCREV = "d7f6bd54a296620068570fb83b91a43958ee5e37"
-
--- a/recipes-devtools/python/python3-geopy_git.bb
+++ b/recipes-devtools/python/python3-geopy_git.bb
@ -13,6 +13,6 @@ RDEPENDS:${PN} = " \
 inherit setuptools3

 S = "${WORKDIR}/git"
-PV = "2.4.1"
-SRCREV = "f495974c32a7a7b1eb433e7b8c87166e96375c32"
+PV = "2.2.0"
+SRCREV = "ade9c1b68c83a1fc76d90bc0ff603f6b34dfbbbf"

--- a/recipes-devtools/python/pywayfire_git.bb
+++ b/recipes-devtools/python/pywayfire_git.bb
@ -1,11 +0,0 @@
-SUMMARY = "Python ipc bindings for wayfire"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://license;md5=12a8965e31d96ba989d4294f1e2cd525"
-
-inherit python_setuptools_build_meta
-
-SRC_URI = "git://github.com/WayfireWM/pywayfire.git;protocol=https;branch=main"
-SRCREV = "af2d7a187c8479c114102d6c9413ad25316b199a"
-PV = "0.3"
-
-S = "${WORKDIR}/git"
--- a/recipes-devtools/stb/stb_git.bb
+++ b/recipes-devtools/stb/stb_git.bb
@ -1,18 +0,0 @@
-SUMMARY = "stb is a set of single-file libraries for C/C++"
-HOMEPAGE = "https://github.com/nothings/stb"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fb994481c55623ef338885280e676f3b"
-
-SRC_URI = "git://github.com/nothings/stb.git;protocol=https;branch=master"
-SRCREV = "013ac3beddff3dbffafd5177e7972067cd2b5083"
-S = "${WORKDIR}/git"
-
-do_install() {
-	install -d ${D}${includedir}/stb
-	for file in ${S}/*.h; do
-		install -m 0644 $file ${D}${includedir}/stb
-	done
-	# needed for gamescope
-	install -m 0644 deprecated/stb_image_resize.h ${D}${includedir}/stb
-}
-
--- a/recipes-devtools/tomlplusplus/tomlplusplus_git.bb
+++ b/recipes-devtools/tomlplusplus/tomlplusplus_git.bb
@ -1,14 +0,0 @@
-SUMMARY = "toml config parser and seriaizer for c++."
-HOMEPAGE = "https://github.com/marzer/tomlplusplus"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=90960f22c10049c117d56ed2ee5ee167"
-
-SRC_URI = "git://github.com/marzer/tomlplusplus.git;protocol=https;branch=master"
-
-PV = "3.4.0"
-SRCREV = "30172438cee64926dc41fdd9c11fb3ba5b2ba9de"
-S = "${WORKDIR}/git"
-
-DEPENDS = "cmake-native"
-
-inherit meson
--- a/recipes-extended/autotiling/autotiling_git.bb
+++ b/recipes-extended/autotiling/autotiling_git.bb
@ -13,6 +13,6 @@ RDEPENDS:${PN} = "python-i3ipc"
 inherit setuptools3

 S = "${WORKDIR}/git"
-PV = "1.9.3"
-SRCREV = "b6a8b9af52892a04d75118f79d2aad4edc3df963"
+PV = "1.8"
+SRCREV = "2eb65aeecdcd3985414d580c82e5e1c277c1cf8d"

--- a/recipes-extended/callaudiod/callaudiod_git.bb
+++ b/recipes-extended/callaudiod/callaudiod_git.bb
@ -11,8 +11,8 @@ inherit meson pkgconfig
 SRC_URI = "git://gitlab.com/mobian1/callaudiod.git;protocol=https;branch=master"

 S = "${WORKDIR}/git"
-PV = "0.1.10"
-SRCREV = "56831297817afb6b30062b7cee3e40225ac39cac"
+PV = "0.1.7"
+SRCREV = "92cf20a93903fe3d7969f4002643b011011243f7"

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

--- a/recipes-extended/date/date_git.bb
+++ b/recipes-extended/date/date_git.bb
@ -1,4 +1,5 @@
 SUMMARY = "A date and time library based on C++11/14/17."
+AUTHOR = "Howard Hinnant"
 HOMEPAGE = "https://github.com/HowardHinnant/date.git"
 SECTION = "libs"
 LICENSE = "MIT"
--- a/recipes-extended/date/files/pkgconfig.patch
+++ b/recipes-extended/date/files/pkgconfig.patch
@ -3,7 +3,6 @@ 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

-Upstream-Status: Pending []
 ---
 CMakeLists.txt | 15 +++++++++++++++
 date.pc.in     | 10 ++++++++++
--- a/recipes-extended/ddcutil/ddcutil_git.bb
+++ b/recipes-extended/ddcutil/ddcutil_git.bb
@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"

 SRC_URI = "git://github.com/rockowitz/ddcutil.git;protocol=https;branch=master"

-DEPENDS = "i2c-tools glib-2.0 kmod jansson"
+DEPENDS = "i2c-tools glib-2.0 kmod"

 S = "${WORKDIR}/git"
-PV = "2.1.4"
-SRCREV = "ca610f91d5483e19bfdae88bb0094973cc81fc95"
+PV = "1.3.0"
+SRCREV = "207f6c75b01924bf5aa7faa4a6688eb2c14dfebf"

 inherit autotools pkgconfig gobject-introspection

@ -30,5 +30,5 @@ do_install:append () {
 	cp -rf ${D}${datadir}/ddcutil/data/* ${D}${sysconfdir}/udev/rules.d
 }

-FILES:${PN} += "${sysconfdir} ${libdir}/modules-load.d/ddcutil.conf"
+FILES:${PN} += "${sysconfdir}"

--- a/recipes-extended/fcft/fcft/0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch
+++ b/recipes-extended/fcft/fcft/0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch
@ -8,8 +8,6 @@ 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)
-
-Upstream-Status: Inappropriate [oe-specific]
 ---
 generate-version.sh | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)
--- a/recipes-extended/fcft/fcft_git.bb
+++ b/recipes-extended/fcft/fcft_git.bb
@ -20,8 +20,8 @@ SRC_URI = " \
 "

 S = "${WORKDIR}/git"
-PV = "3.1.8"
-SRCREV = "8e32809e440c9c75861a2ebbdb0adc348e72fbea"
+PV = "3.1.5"
+SRCREV = "b3877795cdf1c9fc75338792aeaa3f31b56abbe8"

 inherit meson pkgconfig

--- a/recipes-extended/feedbackd/feedbackd_git.bb
+++ b/recipes-extended/feedbackd/feedbackd_git.bb
@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"

 DEPENDS = " \
-    gmobile \
    gsound \
    libgudev \
    glib-2.0 \
@ -20,8 +19,8 @@ inherit meson pkgconfig features_check gobject-introspection vala
 SRC_URI = "gitsm://source.puri.sm/Librem5/feedbackd.git;protocol=https;nobranch=1"

 S = "${WORKDIR}/git"
-PV = "0.4.0"
-SRCREV = "09396c7d64ee047849e65eb7ce1b7aa88763a902"
+PV = "0.1.1"
+SRCREV = "ce10466203f3d07f31a506219dfa4af0953f69a5"

 EXTRA_OEMESON += "-Dtests=false"

--- a/recipes-extended/font-awesome/font-awesome-otf_git.bb
+++ b/recipes-extended/font-awesome/font-awesome-otf_git.bb
@ -4,15 +4,15 @@ HOMEPAGE = "https://fontawesome.com/"
 SECTION = "base/fonts"

 LICENSE = "CC-BY-4.0 & OFL-1.1"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9b9d97c72a232b7715f2aed4bf4a4d45"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4186e0f8172f263065437f80932efbe1"

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

 S = "${WORKDIR}/git"
-PV = "6.6.0"
-SRCREV = "37eff7fa00de26db41183a3ad8ed0e9119fbc44b"
+PV = "6.4.0"
+SRCREV = "0698449d50f2b95517562295a59d414afc68b369"


 do_install () {
--- a/recipes-extended/gmobile/gmobile_git.bb
+++ b/recipes-extended/gmobile/gmobile_git.bb
@ -1,16 +0,0 @@
-SUMMARY = "gmobile carries some helpers for GNOME on mobile devices"
-LICENSE = "GPL-3.0-only & LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-inherit meson pkgconfig gobject-introspection
-
-DEPENDS = "glib-2.0 json-glib"
-
-SRC_URI = "git://gitlab.gnome.org/World/Phosh/gmobile.git;protocol=https;branch=main"
-S = "${WORKDIR}/git"
-SRCREV = "ca8db41bb39a3117461614ae4558a3e3019a19be"
-PV = "0.2.1"
-
-do_install:append() {
-	install -m 0644 ${B}/gm-config.h ${D}${includedir}
-}
--- a/recipes-extended/highway/highway_git.bb
+++ b/recipes-extended/highway/highway_git.bb
@ -0,0 +1,18 @@
+SUMMARY = "Highway is a C++ library for SIMD (Single Instruction, Multiple Data)"
+HOMEPAGE = "https://github.com/google/highway/" 
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9" 
+
+inherit cmake
+
+SRC_URI = " \
+    git://github.com/google/highway.git;protocol=https;branch=master \
+"
+
+PV = "1.0.2"
+SRCREV = "293693e8894bcca7d41dc336565309e0a15b205a"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release"
+CXXFLAGS:append:arm = " -mfp16-format=ieee"
--- a/recipes-extended/libcall-ui/libcall-ui/0001-build-as-package.patch
+++ b/recipes-extended/libcall-ui/libcall-ui/0001-build-as-package.patch
@ -1,32 +0,0 @@
-From 02fee99a4be76b1db07f27cad68986061168e7e1 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Tue, 20 Aug 2024 11:57:39 +0200
-Subject: [PATCH] build as package
-
---
- meson.build | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index d33614b..d3e068d 100644
--- a/meson.build
-+++ b/meson.build
-@@ -19,6 +19,8 @@ systemduserdir = join_paths(systemddir, 'user')
- 
- root_inc = include_directories('.')
- 
-+pkgconfig = import ('pkgconfig')
-+
- cc = meson.get_compiler('c')
- 
- global_c_args = []
-@@ -113,4 +115,6 @@ summary = [
-   '-----------',
- ]
- 
-+pkgconfig.generate(call_ui_lib)
-+
- message('\n'.join(summary))
-- 
-2.45.2
-
--- a/recipes-extended/libcall-ui/libcall-ui_git.bb
+++ b/recipes-extended/libcall-ui/libcall-ui_git.bb
@ -1,30 +0,0 @@
-SUMMARY = "Libcall-ui carries common user interface parts for call handling. It is meant to be used as a git submodule."
-HOMEPAGE = "https://gitlab.gnome.org/World/Phosh/libcall-ui"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS = "glib-2.0 libhandy gtk+3 callaudiod"
-
-inherit meson pkgconfig gi-docgen gobject-introspection
-
-SRC_URI = " \
-	git://gitlab.gnome.org/World/Phosh/libcall-ui.git;protocol=https;branch=libcall-ui-0.1.x \
-	file://0001-build-as-package.patch \
-"
-
-S = "${WORKDIR}/git"
-PV = "0.1.3"
-SRCREV = "60870e871e480e111e6a2fa50de67d1dd358d65a"
-
-GIR_MESON_OPTION = ''
-
-do_install:append() {
-install -d ${D}${includedir}
-	install -m 0644 ${B}/src/libcall-ui.a ${D}${libdir}
-	cp -rf ${B}/src/libcall-ui.a.p ${D}${libdir}
-	install -m 0644 ${B}/cui-config.h ${D}${includedir}
-	install -m 0644 ${S}/src/*.h ${D}${includedir}
-	install -m 0644 ${B}/src/*.h ${D}${includedir}
-}
-
-FILES:${PN} += "${libdir}/libcall-ui.a.p"
--- a/recipes-extended/libdbusmenu/libdbusmenu-glib_git.bb
+++ b/recipes-extended/libdbusmenu/libdbusmenu-glib_git.bb
@ -1,27 +0,0 @@
-SUMMARY = "This is a small library designed to make sharing and displaying of menu structures over DBus simple and easy to use."
-HOMEPAGE = "https://github.com/AyatanaIndicators/libdbusmenu"
-LICENSE = "LGPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-
-SRC_URI = "git://github.com/JetBrains/libdbusmenu.git;protocol=https;branch=master"
-
-DEPENDS = "glib-2.0 json-glib dbus intltool-native libxslt-native"
-
-S = "${WORKDIR}/git"
-PV = "16.0.4"
-SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
-EXTRA_OECONF += "--disable-dumper --disable-gtk --disable-gtk-doc"
-
-CFLAGS += "-Wno-error"
-
-inherit autotools pkgconfig gettext gobject-introspection vala gtk-doc
-
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	oe_runmake -j1 -C libdbusmenu-glib DESTDIR="${D}" install
-}
-
-FILES:${PN} += "${datadir}"
--- a/recipes-extended/libdbusmenu/libdbusmenu-gtk_git.bb
+++ b/recipes-extended/libdbusmenu/libdbusmenu-gtk_git.bb
@ -1,29 +0,0 @@
-SUMMARY = "This is a small library designed to make sharing and displaying of menu structures over DBus simple and easy to use."
-HOMEPAGE = "https://github.com/AyatanaIndicators/libdbusmenu"
-LICENSE = "LGPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-
-SRC_URI = "git://github.com/JetBrains/libdbusmenu.git;protocol=https;branch=master"
-
-DEPENDS = "glib-2.0 json-glib dbus gtk+ gtk+3 libdbusmenu-glib intltool-native libxslt-native"
-RDEPENDS:${PN} = "libdbusmenu-glib"
-
-S = "${WORKDIR}/git"
-PV = "16.0.4"
-SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
-
-EXTRA_OECONF += "--disable-dumper --disable-gtk-doc"
-
-inherit autotools pkgconfig gettext gobject-introspection vala gtk-doc
-
-CFLAGS += "-Wno-error"
-
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	oe_runmake -j1 -C libdbusmenu-gtk DESTDIR="${D}" install
-}
-
-FILES:${PN} += "${datadir}"
--- a/recipes-extended/libdisplay-info/libdisplay-info_git.bb
+++ b/recipes-extended/libdisplay-info/libdisplay-info_git.bb
@ -13,7 +13,5 @@ SRCREV = "92b031749c0fe84ef5cdf895067b84a829920e25"

 inherit meson pkgconfig

-PACKAGECONFIG ?= ""
-PACKAGECONFIG[test] = ",,edid-decode-native"
-
 BBCLASSEXTEND = "native"
+
--- a/recipes-extended/libliftoff/libliftoff_git.bb
+++ b/recipes-extended/libliftoff/libliftoff_git.bb
@ -3,12 +3,12 @@ HOMEPAGE = "https://gitlab.freedesktop.org/emersion/libliftoff"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=706cd9899438a9385250ab6773c1fa53"

-SRC_URI = "git://gitlab.freedesktop.org/emersion/libliftoff.git;branch=master;protocol=https"
+SRC_URI = "git://gitlab.freedesktop.org/emersion/libliftoff.git;branch=v0.4;protocol=https"

 DEPENDS = "libdrm"

 S = "${WORKDIR}/git"
-PV = "0.5.0"
-SRCREV = "8b08dc1c14fd019cc90ddabe34ad16596b0691f4"
+PV = "0.4.1"
+SRCREV = "e045589f37835d66e3ffe8130a597bb4eb9ee08f"

 inherit meson pkgconfig
--- a/recipes-extended/libvarlink/libvarlink_git.bb
+++ b/recipes-extended/libvarlink/libvarlink_git.bb
@ -2,7 +2,7 @@ SUMMARY = "varlink is an interface description format and protocol accessible to
 HOMEPAGE = "https://varlink.org"
 LICENSE = "Apache-2.0 & BSD-3-Clause"

-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1"

 SRC_URI = " \
 	git://github.com/varlink/libvarlink.git;protocol=https;branch=master \
--- a/recipes-extended/light/light_git.bb
+++ b/recipes-extended/light/light_git.bb
@ -4,11 +4,13 @@ SECTION = "libs"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

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

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

 CFLAGS += " -fcommon"

--- a/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch
+++ b/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch
@ -1,27 +0,0 @@
-From 2cac433806d9622dbc005fe5738f1ae8c33a98cb Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Thu, 13 Jul 2023 19:26:40 +0200
-Subject: [PATCH] Makefile: dont add -static to LDFLAGS
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-
-Upstream-Status: Inappropriate [oe-specific]
---
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 60a80b8..49021fa 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,6 @@
- VERSION=1.11.2
- CFLAGS?=-g
- MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter
-LDFLAGS+=-static
- INCLUDE+=-Iinclude
- PREFIX?=/usr/local
- BINDIR?=$(PREFIX)/bin
-- 
-2.39.3
-
--- a/recipes-extended/scdoc/scdoc_git.bb
+++ b/recipes-extended/scdoc/scdoc_git.bb
@ -7,14 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d"

 SRC_URI = " \
 	git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \
-	file://0001-Makefile-dont-add-static-to-LDFLAGS.patch \
 "

 DEPENDS = "scdoc-native"

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

 EXTRA_OEMAKE:class-native = "PREFIX=${prefix}"
 EXTRA_OEMAKE:class-target = "PREFIX=${prefix} HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc"
--- a/recipes-extended/sofia-sip/sofia-sip_git
+++ b/recipes-extended/sofia-sip/sofia-sip_git
@ -8,8 +8,8 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=03068f550c635f6520e0f0252da412fc"

 S = "${WORKDIR}/git"
-SRCREV = "6198851a610b7889c17e2d98fb84617bc1dd7aec"
-PV = "1.13.17"
+SRCREV = "3f17604d0c427a276839ea96b6dc31d7da69d27c"
+PV = "1.13.14"

 SRC_URI = "git://github.com/freeswitch/sofia-sip.git;protocol=https;branch=master"

@ -17,5 +17,3 @@ inherit autotools pkgconfig

 EXTRA_OECONF += "--with-glib"

-CFLAGS += "-Wno-incompatible-pointer-types"
-
--- a/recipes-extended/xcur2png/xcur2png/0001-fix-wrong-math.patch
+++ b/recipes-extended/xcur2png/xcur2png/0001-fix-wrong-math.patch
@ -1,29 +0,0 @@
-From cda8f7af382f5c5f1e9a395eb03e2b819770d499 Mon Sep 17 00:00:00 2001
-From: Yuji Saeki <44311901+YujiSaeki@users.noreply.github.com>
-Date: Mon, 1 Jun 2020 22:32:16 +0200
-Subject: [PATCH 1/1] fix wrong math
-
-Signed-off-by: Christian Hesse <mail@eworm.de>
-
-Upstream-Status: Pending []
---
- xcur2png.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/xcur2png.c b/xcur2png.c
-index 8723a10..f7dd95d 100644
--- a/xcur2png.c
-+++ b/xcur2png.c
-@@ -586,9 +586,9 @@ int writePngFileFromXcur (const XcursorDim width, const XcursorDim height,
-     unsigned int red = (pixels[i]>>16) & 0xff;
-     unsigned int green = (pixels[i]>>8) & 0xff;
-     unsigned int blue = pixels[i] & 0xff;
-    red = (div (red * 256, alpha).quot) & 0xff;
-    green = (div (green * 256,  alpha).quot) & 0xff;
-    blue = (div (blue * 256, alpha).quot) & 0xff;
-+    red = (div (red * 255, alpha).quot) & 0xff;
-+    green = (div (green * 255,  alpha).quot) & 0xff;
-+    blue = (div (blue * 255, alpha).quot) & 0xff;
-     pix[i] = (alpha << 24) + (red << 16) + (green << 8) + blue;
-   }
- 
--- a/recipes-extended/xcur2png/xcur2png_git.bb
+++ b/recipes-extended/xcur2png/xcur2png_git.bb
@ -5,16 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

 DEPENDS = "libxcursor libpng"

-SRC_URI = " \
-	git://github.com/eworm-de/xcur2png.git;protocol=https;branch=master \
-	file://0001-fix-wrong-math.patch \
-"
-
 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

-CFLAGS += "-Wno-implicit-int"
-
--- a/recipes-graphics/aalib/aalib/aalib-aalinuxkbd-return.patch
+++ b/recipes-graphics/aalib/aalib/aalib-aalinuxkbd-return.patch
@ -1,12 +0,0 @@
-diff -Nur aalib-1.4.0-orig/src/aalinuxkbd.c aalib-1.4.0/src/aalinuxkbd.c
--- aalib-1.4.0-orig/src/aalinuxkbd.c	2001-04-26 16:37:31.000000000 +0200
-+++ aalib-1.4.0/src/aalinuxkbd.c	2005-07-01 22:57:59.000000000 +0200
-@@ -200,7 +200,7 @@
- static int rawmode_init(void)
- {
-     if (!closed)
-	return;
-+	return 1;
-     mypid = getpid();
-     if (tty_fd == -1) {
- 	tty_fd = fileno(stdin);
--- a/recipes-graphics/aalib/aalib/aalib-c99.patch
+++ b/recipes-graphics/aalib/aalib/aalib-c99.patch
@ -1,106 +0,0 @@
-Add additional system header #include directives for more
-function prototypes.  This avoids implicit function declarations
-and build failures with future compilers.
-
-diff --git a/src/aafire.c b/src/aafire.c
-index 4f36149aa84fba57..a59b5c5fa58e085b 100644
--- a/src/aafire.c
-+++ b/src/aafire.c
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <stdlib.h>
- #include "aalib.h"
- 
- #define XSIZ aa_imgwidth(context)
-diff --git a/src/aainfo.c b/src/aainfo.c
-index d3f6d50f34590638..f4250ee37ae46134 100644
--- a/src/aainfo.c
-+++ b/src/aainfo.c
-@@ -1,3 +1,4 @@
-+#include <stdlib.h>
- 
- #include "aalib.h"
- #include "aaint.h"
-diff --git a/src/aakbdreg.c b/src/aakbdreg.c
-index def65fe25646d75a..682616313c1b6ebd 100644
--- a/src/aakbdreg.c
-+++ b/src/aakbdreg.c
-@@ -1,4 +1,5 @@
- #include <malloc.h>
-+#include <string.h>
- #include "config.h"
- #include "aalib.h"
- #include "aaint.h"
-diff --git a/src/aalib.c b/src/aalib.c
-index 11fecc8fe8ef6b59..1ef12c0dfa9026a4 100644
--- a/src/aalib.c
-+++ b/src/aalib.c
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <malloc.h>
- #include "aalib.h"
-diff --git a/src/aalinuxkbd.c b/src/aalinuxkbd.c
-index c7f388abfe9e8c7f..ea988154518dfc8e 100644
--- a/src/aalinuxkbd.c
-+++ b/src/aalinuxkbd.c
-@@ -8,6 +8,7 @@
-  */
- 
- #include "config.h"
-+#include <stdlib.h>
- #ifdef LINUX_DRIVER
- #include <sys/time.h>
- #include <sys/types.h>
-diff --git a/src/aamoureg.c b/src/aamoureg.c
-index 03808289eb59b928..6d807416ae0d3dc2 100644
--- a/src/aamoureg.c
-+++ b/src/aamoureg.c
-@@ -1,4 +1,5 @@
- #include <malloc.h>
-+#include <string.h>
- #include "config.h"
- #include "aalib.h"
- #include "aaint.h"
-diff --git a/src/aaregist.c b/src/aaregist.c
-index 54abec0b9797533a..768b8ce29e286b00 100644
--- a/src/aaregist.c
-+++ b/src/aaregist.c
-@@ -1,4 +1,5 @@
- #include <malloc.h>
-+#include <string.h>
- #include "config.h"
- #include "aalib.h"
- #include "aaint.h"
-diff --git a/src/aasavefont.c b/src/aasavefont.c
-index b00e1e6d7f181952..864ba225d5ef626c 100644
--- a/src/aasavefont.c
-+++ b/src/aasavefont.c
-@@ -1,3 +1,4 @@
-+#include <stdlib.h>
- #include "aalib.h"
- int main(int argc, char **argv)
- {
-diff --git a/src/aatest.c b/src/aatest.c
-index 9816f5d855134894..89933cfba6344270 100644
--- a/src/aatest.c
-+++ b/src/aatest.c
-@@ -1,3 +1,5 @@
-+#include <stdlib.h>
-+#include <string.h>
- #include "aalib.h"
- int main(int argc, char **argv)
- {
-diff --git a/src/aaxkbd.c b/src/aaxkbd.c
-index f16afc63bb565512..44b91458b4bef3bc 100644
--- a/src/aaxkbd.c
-+++ b/src/aaxkbd.c
-@@ -7,6 +7,7 @@
- #include <X11/Xlib.h>
- #include <X11/keysymdef.h>
- #include <X11/keysym.h>
-+#include <X11/Xutil.h>
- #include "aalib.h"
- #include "aaint.h"
- #include "aaxint.h"
--- a/recipes-graphics/aalib/aalib/aalib-fix-aarender.patch
+++ b/recipes-graphics/aalib/aalib/aalib-fix-aarender.patch
@ -1,34 +0,0 @@
-This bug can be seen very clearly with e.g. mplayer -vo aa -monitoraspect 3
-in which case a big part of the picture is missing or there is even completely
-black output.
-
-The reason for this is, when drawing only a part of the picture via aarender()
-the first X coordinate is used for the loop count, but it is not applied to the
-destination and source image index, thus instead of (re)drawing the middle part
-of the image, it draws always the left part.
-
-Actual Results: 
-only the left part of the image is draw (depending on the video, only the left
-black bar might be draw, so you will see nothing at all - if so use a slightly
-smaller value for -monitoraspect).
-
-Expected Results:
-All of the image should be drawn, and -monitoraspect should only squeeze the
-image, not cause part of it to miss.
-
-Gentoo-bug: http://bugs.gentoo.org/id=214142
-Reported-by: Reimar Döffinger
-Fixed-by: Reimar Döffinger
--- a/src/aarender.c.orig	2008-03-18 23:55:32.000000000 +0100
-+++ b/src/aarender.c	2008-03-18 23:55:50.000000000 +0100
-@@ -94,8 +94,8 @@
- 	gamma = randomval / 2;
-     mval = (c->parameters[c->filltable[255]].p[4]);
-     for (y = y1; y < y2; y++) {
-	pos = 2 * y * wi;
-	pos1 = y * aa_scrwidth(c);
-+	pos = 2 * (y * wi + x1);
-+	pos1 = y * aa_scrwidth(c) + x1;
- 	esum = 0;
- 	for (x = x1; x < x2; x++) {
- 	    i1 = table[((((int) c->imagebuffer[pos])))];
--- a/recipes-graphics/aalib/aalib/aalib-free-offset-pointer.patch
+++ b/recipes-graphics/aalib/aalib/aalib-free-offset-pointer.patch
@ -1,14 +0,0 @@
--- a/src/aarender.c
-+++ b/src/aarender.c
-@@ -63,10 +63,10 @@ void aa_renderpalette(aa_context * c, __
- 	errors[0] = calloc(1, (x2 + 5) * sizeof(int));
- 	if (errors[0] == NULL)
- 	    dither = AA_ERRORDISTRIB;
-	errors[0] += 3;
- 	errors[1] = calloc(1, (x2 + 5) * sizeof(int));
- 	if (errors[1] == NULL)
- 	    free(errors[0]), dither = AA_ERRORDISTRIB;
-+	errors[0] += 3;
- 	errors[1] += 3;
- 	cur = 0;
-     }
--- a/recipes-graphics/aalib/aalib/aalib-key-down-OOB.patch
+++ b/recipes-graphics/aalib/aalib/aalib-key-down-OOB.patch
@ -1,23 +0,0 @@
-diff -Naur a/src/aalinuxkbd.c b/src/aalinuxkbd.c
--- a/src/aalinuxkbd.c	2016-12-19 12:40:26.660039735 +0100
-+++ b/src/aalinuxkbd.c	2016-12-19 12:42:21.692045971 +0100
-@@ -114,6 +114,7 @@
- static int vtswitch_allowed;
- 
- static char key_down[128];
-+static size_t key_down_size = 128;
- static int closed = 1;
- static int mypid;
- 
-@@ -165,10 +166,7 @@
- 
- static void blank_key_down(void)
- {
-    int f;
-
-    for (f = 0; f < NR_KEYS; f++)
-	key_down[f] = 0;
-+    memset(key_down, 0, key_down_size);
- }
- 
- 
--- a/recipes-graphics/aalib/aalib/aalib-m4.patch
+++ b/recipes-graphics/aalib/aalib/aalib-m4.patch
@ -1,25 +0,0 @@
-Index: aalib.m4
-===================================================================
-RCS file: /cvsroot/aa-project/aalib/aalib.m4,v
-retrieving revision 1.2
-diff -u -r1.2 aalib.m4
--- a/aalib.m4	3 May 2001 14:56:44 -0000	1.2
-+++ b/aalib.m4	28 Mar 2017 08:36:42 -0000
-@@ -40,14 +40,14 @@
-   if test "$AALIB_CONFIG" = "no" ; then
-     no_aalib=yes
-   else
-    AALIB_CFLAGS=`$AALIB_CONFIG $aalibconf_args --cflags`
-    AALIB_LIBS=`$AALIB_CONFIG $aalibconf_args --libs`
-+    AALIB_CFLAGS=`$AALIB_CONFIG $aalib_args --cflags`
-+    AALIB_LIBS=`$AALIB_CONFIG $aalib_args --libs`
- 
-     aalib_major_version=`$AALIB_CONFIG $aalib_args --version | \
-            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-     aalib_minor_version=`$AALIB_CONFIG $aalib_args --version | \
-            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    aalib_micro_version=`$AALIB_CONFIG $aalib_config_args --version | \
-+    aalib_micro_version=`$AALIB_CONFIG $aalib_args --version | \
-            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-     if test "x$enable_aalibtest" = "xyes" ; then
-       ac_save_CFLAGS="$CFLAGS"
--- a/recipes-graphics/aalib/aalib/aalib-mouse.patch
+++ b/recipes-graphics/aalib/aalib/aalib-mouse.patch
@ -1,39 +0,0 @@
-From 6125c3438e6cf30e1ebd70ca6ac3f1e04481c7a7 Mon Sep 17 00:00:00 2001
-From: Gergely Nagy <algernon@madhouse-project.org>
-Date: Sat, 30 Jun 2012 13:08:13 +0200
-Subject: [PATCH] Typo fix: KEY_MOUDE => KEY_MOUSE
-
-Patch by Sam Hocevar <sam@zoy.org> 17 Nov 2003
-
-Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=221243
---
- src/aacurkbd.c | 2 +-
- src/aastdin.c  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/aacurkbd.c b/src/aacurkbd.c
-index 801897b..418b6a3 100644
--- a/src/aacurkbd.c
-+++ b/src/aacurkbd.c
-@@ -112,7 +112,7 @@ static int curses_getchar(aa_context * c1, int wait)
- 	return (AA_UP);
-     case KEY_DOWN:
- 	return (AA_DOWN);
-#ifdef KEY_MOUDE
-+#ifdef KEY_MOUSE
-     case KEY_MOUSE:
- #ifdef GPM_MOUSEDRIVER
- 	if (!__curses_usegpm)
-diff --git a/src/aastdin.c b/src/aastdin.c
-index 696d87b..e2dabe4 100644
--- a/src/aastdin.c
-+++ b/src/aastdin.c
-@@ -88,7 +88,7 @@ static int stdin_getchar(aa_context * c1, int wait)
-     if (c > 0 && c < 127 && c != 127)
- 	return (c);
-     switch (c) {
-#ifdef KEY_MOUDE
-+#ifdef KEY_MOUSE
-     case KEY_MOUSE:
- 	return AA_MOUSE
- #endif
--- a/recipes-graphics/aalib/aalib/aalib-opaque-ncurses-fix.patch
+++ b/recipes-graphics/aalib/aalib/aalib-opaque-ncurses-fix.patch
@ -1,14 +0,0 @@
-diff -up aalib-1.4.0/src/aacurses.c.opaque-ncurses-fix aalib-1.4.0/src/aacurses.c
--- aalib-1.4.0/src/aacurses.c.opaque-ncurses-fix	2024-02-10 06:32:32.008267145 -0500
-+++ aalib-1.4.0/src/aacurses.c	2024-02-10 06:33:38.648245270 -0500
-@@ -71,8 +71,8 @@ static void curses_getsize(aa_context *
- {
-     if (__resized_curses)
- 	curses_uninit(c), curses_init(&c->params, NULL,&c->driverparams, NULL), __resized_curses = 0;
-    *width = stdscr->_maxx + 1;
-    *height = stdscr->_maxy + 1;
-+    *width = getmaxx(stdscr);
-+    *height = getmaxy(stdscr);
- #ifdef GPM_MOUSEDRIVER
-     gpm_mx = *width;
-     gpm_my = *height;
--- a/recipes-graphics/aalib/aalib/aclocal-fixes.patch
+++ b/recipes-graphics/aalib/aalib/aclocal-fixes.patch
@ -1,11 +0,0 @@
--- a/aalib.m4	2006-03-05 13:58:21.000000000 +0000
-+++ b/aalib.m4	2006-03-05 13:58:32.000000000 +0000
-@@ -9,7 +9,7 @@
- dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
- dnl
-AC_DEFUN(AM_PATH_AALIB,
-+AC_DEFUN([AM_PATH_AALIB],
- [dnl 
- dnl Get the cflags and libraries from the aalib-config script
- dnl
--- a/recipes-graphics/aalib/aalib_1.4.0.bb
+++ b/recipes-graphics/aalib/aalib_1.4.0.bb
@ -9,19 +9,10 @@ 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 \
-	file://aalib-aalinuxkbd-return.patch \
-	file://aalib-free-offset-pointer.patch \
-	file://aalib-key-down-OOB.patch \
-	file://aalib-opaque-ncurses-fix.patch \
-	file://aclocal-fixes.patch \
-	file://aalib-c99.patch \
-	file://aalib-fix-aarender.patch \
-	file://aalib-m4.patch \
-	file://aalib-mouse.patch \
-"
+SRC_URI = "${SOURCEFORGE_MIRROR}/projects/aa-project/files/aa-lib/1.4rc5/aalib-1.4rc5.tar.gz"
 SRC_URI[sha256sum] = "fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee"

 inherit autotools

+CFLAGS:append = " -fPIC "
+
--- a/recipes-graphics/libjxl/libjxl_git.bb
+++ b/recipes-graphics/libjxl/libjxl_git.bb
@ -0,0 +1,38 @@
+SUMMARY = "Reference implementation of JPEG XL (encoder and decoder)"
+HOMEPAGE = "https://github.com/libjxl/libjxl/" 
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6a905a337cc228a1f68f0b5416f52a7f" 
+
+inherit cmake pkgconfig
+
+DEPENDS = "highway brotli"
+
+SRC_URI = " \
+    gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1 \
+"
+
+PV = "0.7"
+SRCREV = "f95da131cf7c7ccd4da256356fde2fec1fa23bb5"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = " \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DJPEGXL_ENABLE_PLUGINS=OFF \
+	-DBUILD_TESTING=OFF \
+	-DJPEGXL_WARNINGS_AS_ERRORS=OFF \
+	-DJPEGXL_ENABLE_SIZELESS_VECTORS=ON \
+	-DJPEGXL_ENABLE_SJPEG=OFF \
+	-DJPEGXL_ENABLE_BENCHMARK=OFF \
+	-DJPEGXL_ENABLE_EXAMPLES=OFF \
+	-DJPEGXL_ENABLE_MANPAGES=OFF \
+	-DJPEGXL_ENABLE_SKCMS=ON \
+	-DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
+	-DJPEGXL_FORCE_SYSTEM_HWY=ON \
+	-DJPEGXL_ENABLE_JNI=OFF \
+	-DJPEGXL_ENABLE_TCMALLOC=OFF \
+	-DJPEGXL_ENABLE_TOOLS=OFF \
+"
+
+CXXFLAGS:append:arm = " -mfp16-format=ieee"
+ 
--- a/recipes-graphics/mpvpaper/mpvpaper_git.bb
+++ b/recipes-graphics/mpvpaper/mpvpaper_git.bb
@ -13,8 +13,8 @@ DEPENDS = " \
 "

 S = "${WORKDIR}/git"
-SRCREV = "0069bc236e47f35605c5326a81c3a163fb0c988e"
-PV = "1.7"
+SRCREV = "5dcdfc70ce542626e052b58278840e9018b329d9"
+PV = "1.3"

 inherit meson pkgconfig

--- a/recipes-gtk/calls/calls_git.bb
+++ b/recipes-gtk/calls/calls_git.bb
@ -28,8 +28,8 @@ DEPENDS = " \
 SRC_URI = "gitsm://gitlab.gnome.org/GNOME/calls.git;protocol=https;nobranch=1"

 S = "${WORKDIR}/git"
-SRCREV = "db9b771c19a22cf1ee46e1bce60c69a6c4c0e155"
-PV = "46.0"
+SRCREV = "89632184788aa951ee9ba413bf43c9ac9f116dcb"
+PV = "44.0"

 inherit meson vala pkgconfig mime-xdg gtk-icon-cache

--- a/recipes-gtk/gbar/gbar_git.bb
+++ b/recipes-gtk/gbar/gbar_git.bb
@ -1,29 +0,0 @@
-SUMMARY = "Blazingly fast and efficient status bar + widgets written for gtk3"
-HOMEPAGE = "https://github.com/scorpion-26/gBar"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=15efb84d5f4a09189d30d2682a2373ec"
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-SRC_URI = "git://github.com/scorpion-26/gBar.git;protocol=https;branch=master"
-
-S = "${WORKDIR}/git"
-SRCREV = "b1e2c2ed26a62058c502db3a03ac615f2567942e"
-
-DEPENDS += " \
-	gtk+3 \
-	gtk-layer-shell \
-	pulseaudio \
-	wayland \
-	wayland-native \
-	wayland-protocols \
-"
-
-inherit meson pkgconfig features_check
-
-PACKAGECONFIG ?= "sass ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth', d)}"
-PACKAGECONFIG[bluetooth] = "-DWithBlueZ=true,-DWithBlueZ=false,bluez5"
-PACKAGECONFIG[dbusmenu] = "-DWithSNI=true,-DWithSNI=false,libdbusmenu-gtk"
-PACKAGECONFIG[sass] = "-DWithLibSass=true,-DWithLibSass=false,libsass"
-
-FILES:${PN} += "${datadir}"
--- a/recipes-gtk/gimp/gimp_git.bb
+++ b/recipes-gtk/gimp/gimp_git.bb
@ -4,6 +4,8 @@ SECTION = "graphics"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"

+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+
 DEPENDS = " \
    appstream-glib \
    atk \
@ -19,6 +21,7 @@ DEPENDS = " \
    gexiv2 \
    gtk+3 \
    harfbuzz \
+    intltool-native \
    json-glib \
    lcms \
    libarchive \
@ -36,21 +39,16 @@ DEPENDS = " \
 DEPENDS:append:libc-musl = " libexecinfo"
 RDEPENDS:${PN} = "mypaint-brushes-1.0 glib-networking"

-inherit meson gtk-icon-cache mime-xdg pkgconfig gettext gobject-introspection vala
+inherit meson gtk-icon-cache mime-xdg pkgconfig features_check gobject-introspection vala
+GIR_MESON_OPTION = ''

-GIR_MESON_OPTION = 'can-crosscompile-gir'
-VALA_MESON_OPTION = "vala"
-VALA_MESON_ENABLE_FLAG = "enabled"
-VALA_MESON_DISABLE_FLAG = "disabled"
-GIDOCGEN_MESON_OPTION = "gi-docgen"
-GIDOCGEN_MESON_ENABLE_FLAG = "enabled"
-GIDOCGEN_MESON_DISABLE_FLAG = "disabled"
-
-SRC_URI = "git://github.com/GNOME/gimp.git;protocol=https;branch=master"
+SRC_URI = " \
+    git://github.com/GNOME/gimp.git;protocol=https;branch=master \
+"

 S = "${WORKDIR}/git"
-SRCREV = "f94c4cb5dbf9766b27ecb5016b7a39497cc74ddc"
-PV = "2.99.18"
+SRCREV = "a0811ff614ec8361e570b2570dee05de6fc5a078"
+PV = "2.99.14"

 PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib"
 PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
@ -58,22 +56,25 @@ PACKAGECONFIG[appdata-test] = "-Dappdata-test=enabled,-Dappdata-test=disabled,ap
 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,ghostscript"
+PACKAGECONFIG[ghostscript] = "-Dghostscript=enabled,-Dghostscript=disabled,ghostscript"
+PACKAGECONFIG[gi-docgen] = "-Dgi-docgen=enabled,-Dgi-docgen=disabled,gi-docgen-native"
 PACKAGECONFIG[gudev] = "-Dgudev=enabled,-Dgudev=disabled,libgudev"
 PACKAGECONFIG[iso-codes] = ",,iso-codes"
-PACKAGECONFIG[javascript] = "-Djavascript=enabled,-Djavascript=disabled,gjs"
+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=enabled,-Dlua=disabled,luajit"
+PACKAGECONFIG[lua] = "-Dlua=true,-Dlua=false,,luajit lgi"
 PACKAGECONFIG[lzma] = ",,xz"
 PACKAGECONFIG[mng] = "-Dmng=enabled,-Dmng=disabled,libmng"
-PACKAGECONFIG[python] = "-Dpython=enabled,-Dpython=disabled,,python3-core python3-pygobject"
+PACKAGECONFIG[python] = "-Dpython=true,-Dpython=false,,python3 python3-pygobject"
 PACKAGECONFIG[rsvg] = ",,librsvg"
 PACKAGECONFIG[tiff] = ",,tiff"
+PACKAGECONFIG[vala-plugins] = "-Dvala-plugins=enabled,-Dvala-plugins=disabled"
 PACKAGECONFIG[vector-icons] = "-Dvector-icons=true,-Dvector-icons=false,librsvg shared-mime-info"
 PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
 PACKAGECONFIG[xcursor] = "-Dxcursor=enabled,-Dxcursor=disabled,libxcursor"
@ -86,30 +87,33 @@ PACKAGECONFIG ?= " \
    alsa \
    bzip2 \
    cairo-pdf \
-    ghostscript \
    gudev \
    jpeg \
    jpeg2000 \
    jpeg-xl \
+    lua \
    lzma \
    mng \
    python \
    rsvg \
    tiff \
+    vala-plugins \
    vector-icons \
    webp \
    zlib \
 "

-FILES:${PN} += "${datadir}/metainfo"
+FILES:${PN} += " \
+    ${datadir}/metainfo \
+    ${datadir}/gir-1.0 \
+    ${datadir}/appdata \ 
+    ${libdir}/girepository-1.0 \
+"

 EXTRA_OEMESON += " \
    -Dshmem-type=posix \
    -Dlinux-input=enabled \
+    -Dcan-crosscompile-gir=true \
    --buildtype release \
 "

-do_configure:append () {
-    sed -i -e "s|${RECIPE_SYSROOT_NATIVE}||" ${B}/config.h
-    sed -i -e "s|${RECIPE_SYSROOT_NATIVE}||" ${B}/config.h
-}
--- a/recipes-gtk/granite/granite6_git.bb
+++ b/recipes-gtk/granite/granite6_git.bb
@ -1,23 +0,0 @@
-SUMMARY = "Granite is a companion library for GTK and GLib."
-HOMEPAGE = "https://github.com/elementary/granite"
-LICENSE = "LGPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-
-DEPENDS = " \
-	gtk+3 \
-	glib-2.0 \
-	libgee \
-"
-
-REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
-
-SRC_URI = "git://github.com/elementary/granite.git;protocol=https;nobranch=1"
-
-S = "${WORKDIR}/git"
-PV = "6.2.0"
-SRCREV = "4ab145c28bb3db6372fe519e8bd79c645edfcda3"
-
-inherit meson pkgconfig gobject-introspection vala features_check
-
-FILES:${PN} += "${datadir}"
--- a/recipes-gtk/granite/granite_git.bb
+++ b/recipes-gtk/granite/granite_git.bb
@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"


 DEPENDS = " \
-	gtk4 \
+	gtk+3 \
 	glib-2.0 \
 	libgee \
-	sassc-native \
 "

 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
@ -16,8 +15,8 @@ REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 SRC_URI = "git://github.com/elementary/granite.git;protocol=https;nobranch=1"

 S = "${WORKDIR}/git"
-PV = "7.4.0"
-SRCREV = "949703f8649013695c6d32eb84a6b541ac0da4db"
+PV = "6.2.0"
+SRCREV = "4ab145c28bb3db6372fe519e8bd79c645edfcda3"

 inherit meson pkgconfig gobject-introspection vala features_check

--- a/recipes-gtk/gtk-layer-shell/gtk-layer-shell/0001-protocol-meson.build-dont-use-pkgconfig-for-wayland-.patch
+++ b/recipes-gtk/gtk-layer-shell/gtk-layer-shell/0001-protocol-meson.build-dont-use-pkgconfig-for-wayland-.patch
@ -0,0 +1,23 @@
+From 25e9ac8ce8aba85f0c4e3c643d517fecc6e2fd96 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Sat, 9 Jul 2022 01:08:21 +0200
+Subject: [PATCH] protocol/meson.build: dont use pkgconfig for wayland-scanner
+
+wayland-scanner path gets read from target waylands .pc file. Avoid it
+---
+ protocol/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/protocol/meson.build b/protocol/meson.build
+index 2ce0e0c..12f389f 100644
+--- a/protocol/meson.build
+++ b/protocol/meson.build
+@@ -1,4 +1,4 @@
+-if wayland_scanner.found()
+if false
+     prog_wayland_scanner = find_program(wayland_scanner.get_pkgconfig_variable('wayland_scanner'))
+ else
+     prog_wayland_scanner = find_program('wayland-scanner')
+-- 
+2.25.1
+
--- a/recipes-gtk/gtk-layer-shell/gtk-layer-shell_git.bb
+++ b/recipes-gtk/gtk-layer-shell/gtk-layer-shell_git.bb
@ -17,11 +17,12 @@ DEPENDS += " \

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

 S = "${WORKDIR}/git"
-PV = "0.8.2"
-SRCREV = "91e5ef02b557f93337bcc11ffe8c0a251aa9ab52"
+PV = "0.8.0"
+SRCREV = "08bef6b08ef7fd7c3380747e4a0d84c68209f21e"

 inherit meson pkgconfig features_check gobject-introspection vala

--- a/recipes-gtk/gtk-layer-shell/gtk4-layer-shell_git.bb
+++ b/recipes-gtk/gtk-layer-shell/gtk4-layer-shell_git.bb
@ -1,33 +0,0 @@
-SUMMARY = "A library to write GTK applications that use Layer Shell"
-HOMEPAGE = "https://github.com/wmww/gtk-layer-shell"
-BUGTRACKER = "https://github.com/www/gtk-layer-shell/issues"
-SECTION = "graphics"
-LICENSE = "MIT"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c10fc088fd05226381f6a90310ef75b5"
-
-REQUIRED_DISTRO_FEATURES = "wayland gobject-introspection-data"
-
-DEPENDS += " \
-	gtk4 \
-	wayland \
-	wayland-native \
-	wayland-protocols \
-"
-
-SRC_URI = " \
-	git://github.com/wmww/gtk4-layer-shell.git;protocol=https;branch=main \
-"
-
-S = "${WORKDIR}/git"
-PV = "1.0.2"
-SRCREV = "a689a399d37d174f2e93442e3adc931a9d8dee90"
-
-inherit meson pkgconfig features_check gobject-introspection vala
-
-EXTRA_OEMESON += "--buildtype release"
-
-FILES:${PN} = "${datadir} ${libdir}"
-
-BBCLASSEXTEND = ""
-
--- a/recipes-gtk/gtklock/gtklock_git.bb
+++ b/recipes-gtk/gtklock/gtklock_git.bb
@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
 REQUIRED_DISTRO_FEATURES = "wayland pam"

 DEPENDS = " \
-	glib-2.0-native \
 	gtk+3 \
 	gtk-layer-shell \
 	libpam \
@ -21,8 +20,8 @@ DEPENDS = " \
 SRC_URI = "git://github.com/jovanlanik/gtklock.git;protocol=https;branch=master"

 S = "${WORKDIR}/git"
-PV = "2.1.0"
-SRCREV = "3b2ae2b087aea30e464eed92e2cd011984a9b051"
+PV = "1.3.0"
+SRCREV = "533799037bab53e47c16f3d7da97efbeb8f4cb0d"

 inherit autotools-brokensep pkgconfig features_check

--- a/recipes-gtk/libgnome-volume-control/libgnome-volume-control/0001-build-as-package.patch
+++ b/recipes-gtk/libgnome-volume-control/libgnome-volume-control/0001-build-as-package.patch
@ -1,39 +0,0 @@
-From db03d3455c9db082c373318c08f2377c03a62e99 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Tue, 20 Aug 2024 12:22:55 +0200
-Subject: [PATCH] meson.build: allow shared build
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
- meson.build | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index a1a2af5..97f43c1 100644
--- a/meson.build
-+++ b/meson.build
-@@ -3,12 +3,14 @@ project('gvc', 'c',
-   default_options: ['static=true']
- )
- 
-assert(meson.is_subproject(), 'This project is only intended to be used as a subproject!')
-+#assert(meson.is_subproject(), 'This project is only intended to be used as a subproject!')
- 
- gnome = import('gnome')
- 
- pkglibdir = get_option('pkglibdir')
- pkgdatadir = get_option('pkgdatadir')
-+pkgconfig = import ('pkgconfig')
-+
- 
- cdata = configuration_data()
- cdata.set_quoted('GETTEXT_PACKAGE', get_option('package_name'))
-@@ -135,3 +137,5 @@ configure_file(
-   output: 'config.h',
-   configuration: cdata
- )
-+
-+pkgconfig.generate(libgvc)
-- 
-2.45.2
-
--- a/recipes-gtk/libgnome-volume-control/libgnome-volume-control_git.bb
+++ b/recipes-gtk/libgnome-volume-control/libgnome-volume-control_git.bb
@ -1,30 +0,0 @@
-SUMMARY = "libgnome-volume-control is a copy library"
-HOMEPAGE = "http://www.gimp.org"
-SECTION = "graphics"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
-
-DEPENDS = " \
-	    glib-2.0 \
-	    pulseaudio \
-"
-
-inherit meson pkgconfig
-
-SRC_URI = " \
-	git://gitlab.gnome.org/GNOME/libgnome-volume-control.git;protocol=https;branch=master \
-	file://0001-build-as-package.patch \
-"
-
-S = "${WORKDIR}/git"
-SRCREV = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6"
-
-do_install:append() {
-	install -d ${D}${includedir}
-	install -m 0644 ${B}/libgvc.a ${D}${libdir}
-	cp -rf ${B}/libgvc.a.p ${D}${libdir}
-	install -m 0644 ${S}/*.h ${D}${includedir}
-	install -m 0644 ${B}/*.h ${D}${includedir}
-}
-
-FILES:${PN} += "${libdir}/libgvc.a.p"
--- a/recipes-gtk/nwg-shell/azote_git.bb
+++ b/recipes-gtk/nwg-shell/azote_git.bb
@ -15,6 +15,7 @@ RDEPENDS:${PN} = " \
 	python3-pillow \
 	python3-pkg-resources \
 	python3-send2trash \
+	imagemagick \
 	grim \
 	slurp \
 	swaybg \
@ -24,15 +25,23 @@ RDEPENDS:${PN} = " \
 inherit setuptools3

 S = "${WORKDIR}/git"
-PV = "1.13.0"
-SRCREV = "05be4c908a468e6392ecb8695a5211b68f310df1"
+PV = "1.11.0"
+SRCREV = "95372d8eac96c322d2c8e6a186c8481fc504dca4"

-do_install:append() {
-	install -d ${D}${datadir}/azote ${D}${datadir}/pixmaps ${D}${datadir}/applications
-	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
+do_configure:prepend() {
+	[ -d ${S}/dist ] && mv ${S}/dist ${S}/distrib
 }

-FILES:${PN} += "${datadir}"
+do_install:append() {
+	install -d ${D}${bindir} ${D}${datadir}/azote ${D}${datadir}/pixmaps ${D}${datadir}/applications
+	install -m 755 ${S}/distrib/azote ${D}${bindir}
+	install -m 644 ${S}/distrib/azote.desktop ${D}${datadir}/applications
+	install -m 644 ${S}/distrib/azote.svg ${D}${datadir}/pixmaps
+	install -m 644 ${S}/distrib/indicator_active.png ${D}${datadir}/azote
+	install -m 644 ${S}/distrib/indicator_attention.png ${D}${datadir}/azote
+}
+
+FILES:${PN}:append = " \
+	${datadir} \
+	${bindir} \
+"
--- a/recipes-gtk/nwg-shell/ddcpopup_git.bb
+++ b/recipes-gtk/nwg-shell/ddcpopup_git.bb
@ -12,19 +12,19 @@ RDEPENDS:${PN} = "ddcutil"

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

-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
+
 PV = "0.1"
 SRCREV = "8fab5132e49e08a1eeaa7a0dd3350d06f4399200"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"

 inherit go go-mod pkgconfig

 GO_INSTALL = "${GO_IMPORT}"
-GO_LINKSHARED = ""

 do_compile[network] = "1"

 do_install:append() {
 	mv ${D}${bindir}/main ${D}${bindir}/ddcpopup
+	# remove precompiled x86 binaries
+	rm -r ${D}${libdir}/go/pkg/mod/github.com/dlasky/gotk3-layershell@*/example
 }
--- a/recipes-gtk/nwg-shell/gopsuinfo_git.bb
+++ b/recipes-gtk/nwg-shell/gopsuinfo_git.bb
@ -4,16 +4,13 @@ LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=22ed6cb3c33862e689e075b4

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

-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};branch=main;protocol=https"
-PV = "0.1.5"
-SRCREV = "60e4f83b6c4d84955e0a07f7bdc63d8089b4ba1e"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+SRC_URI = "git://${GO_IMPORT};branch=main;protocol=https"
+PV = "0.1.2"
+SRCREV = "8380a5bd8e200b14badb8e75762bf84a25ab1dd9"

 inherit go go-mod

 GO_INSTALL = "${GO_IMPORT}"
-GO_LINKSHARED = ""

 do_compile[network] = "1"

--- a/recipes-gtk/nwg-shell/nwg-bar_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-bar_git.bb
@ -11,16 +11,15 @@ RDEPENDS:${PN} = "go-runtime"

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

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

-PV = "0.1.5"
-SRCREV = "86f75d0856193c1ba1505f6afbc1b73d34c7093a"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+PV = "0.1.2"
+SRCREV = "c1da3927c7d55c933d321689a5f47539d7ac258d"

 inherit go go-mod pkgconfig

 GO_INSTALL = "${GO_IMPORT}"
-GO_LINKSHARED = ""

 do_compile[network] = "1"
+
+PRIVATE_LIBS:${PN}:append = " libstd.so"
--- a/recipes-gtk/nwg-shell/nwg-displays_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-displays_git.bb
@ -11,14 +11,13 @@ RDEPENDS:${PN} = "\
 	python3 \
 	python3-pygobject \
 	python-i3ipc \
-	wlr-randr \
 "

 inherit setuptools3

 S = "${WORKDIR}/git"
-PV = "0.3.19"
-SRCREV = "74e907f1a8e9cb2f8e649d7439da11e00c249856"
+PV = "0.3.1"
+SRCREV = "832505d0c2053733c6feba379af0846b9e4ff63e"

 do_install:append() {
 	install -d ${D}${datadir}/pixmaps ${D}${datadir}/applications
--- a/recipes-gtk/nwg-shell/nwg-dock-hyprland_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-dock-hyprland_git.bb
@ -1,52 +0,0 @@
-SUMMARY = "GTK3-based dock for hyprland."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=fffa55ad1c828db5e334374fb1182530"
-
-DEPENDS = " \
-	gtk+3 \
-	gtk-layer-shell \
-"
-RDEPENDS:${PN} = "go-runtime"
-
-GO_IMPORT = "github.com/nwg-piotr/nwg-dock-hyprland.git"
-
-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
-
-PV = "0.2.1"
-SRCREV = "95225b4bd747c02b1ed7be49f52893a9fd0bcad3"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
-
-inherit go go-mod pkgconfig
-
-GO_INSTALL = "${GO_IMPORT}"
-GO_LINKSHARED = ""
-
-do_install:append() {
-	# remove precompiled x86 binaries
-	rm -rf ${D}${libdir}/go/src/${GO_IMPORT}/bin
-	rm -rf ${D}${libdir}/go/pkg/mod/github.com/dlasky/gotk3-layershell*/example
-	install -d ${D}${datadir}/nwg-dock-hyprland ${D}${systemd_user_unitdir}
-	install -m 0644 ${S}/src/${GO_IMPORT}/config/style.css ${D}${datadir}/nwg-dock-hyprland
-	cp -rf ${S}/src/${GO_IMPORT}/images ${D}${datadir}/nwg-dock-hyprland
-	cat >${D}${systemd_user_unitdir}/nwg-dock-hyprland.service <<EOF
-[Unit]
-Description=nwg-dock-hyprland
-
-[Service]
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-NoNewPrivileges=yes
-RestrictNamespaces=yes
-Type=simple
-ExecStart= /usr/bin/nwg-dock-hyprland -mb 6 -d -hd 2000
-Restart=on-failure
-
-[Install]
-WantedBy=graphical-session.target
-EOF
-}
-
-do_compile[network] = "1"
-
-FILES:${PN} += "${systemd_user_unitdir}"
--- a/recipes-gtk/nwg-shell/nwg-dock_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-dock_git.bb
@ -6,21 +6,17 @@ DEPENDS = " \
 	gtk+3 \
 	gtk-layer-shell \
 "
-RDEPENDS:${PN} = "go-runtime"

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

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

-PV = "0.4.1"
-SRCREV = "3f010171ab8596552efdc2f03d5f09c0042bbb64"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+PV = "0.3.3"
+SRCREV = "a8c40de275ea0c49a9b9527f4d3d440644c14a53"

 inherit go go-mod pkgconfig

 GO_INSTALL = "${GO_IMPORT}"
-GO_LINKSHARED = ""

 do_install:append() {
 	# remove precompiled x86 binaries
@ -29,3 +25,4 @@ do_install:append() {
 }

 do_compile[network] = "1"
+
--- a/recipes-gtk/nwg-shell/nwg-drawer_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-drawer_git.bb
@ -11,17 +11,14 @@ RDEPENDS:${PN} = "go-runtime"

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

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

-PV = "0.4.7"
-SRCREV = "0cd48d1631eecb3043ee2c1fed9dfa25ca855375"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+PV = "0.3.9"
+SRCREV = "e383f7a4703f0ea89ab8cd3a2da8a6e3d94b257c"

 inherit go go-mod pkgconfig

 GO_INSTALL = "${GO_IMPORT}"
-GO_LINKSHARED = ""

 do_install:append() {
 	# remove precompiled x86 binary
@ -30,3 +27,5 @@ do_install:append() {
 }

 do_compile[network] = "1"
+
+PRIVATE_LIBS:${PN}:append = " libstd.so"
--- a/recipes-gtk/nwg-shell/nwg-hello_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-hello_git.bb
@ -1,36 +0,0 @@
-SUMMARY = "nwg-hello is a GTK3-based greeter for the greetd daemon, written in python."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b0ad99c75f37a759e329c5da4c8a7fcb"
-
-SRC_URI = "git://github.com/nwg-piotr/nwg-hello.git;protocol=https;branch=main"
-
-RDEPENDS:${PN} = " \
-	python3 \
-	greetd \
-	gtk+3 \
-	gtk-layer-shell \
-"
-
-RRECOMMENDS:${PN} = "gnome-themes-extra"
-
-inherit setuptools3 useradd
-
-S = "${WORKDIR}/git"
-PV = "0.2.0"
-SRCREV = "aa6a9e4a9024dba8ebaa98af53df82b3c19d379a"
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system  --no-create-home --shell /bin/bash greeter"
-
-do_install:append() {
-	install -D -m 644 -t ${D}${sysconfdir}/nwg-hello/ nwg-hello-default.json
-	install -D -m 644 -t ${D}${sysconfdir}/nwg-hello/ nwg-hello-default.css
-	install -D -m 644 -t ${D}${sysconfdir}/nwg-hello/ hyprland.conf
-	install -D -m 644 -t ${D}${sysconfdir}/nwg-hello/ sway-config
-	install -D -m 644 -t ${D}${sysconfdir}/nwg-hello/ README
-	install -D -m 644 -t ${D}${datadir}/nwg-hello/ nwg.jpg
-	install -D -m 644 -t ${D}${datadir}/nwg-hello/ img/*
-
-	install -d ${D}${localstatedir}/nwg-hello
-	install -D -m 644 -t ${D}${localstatedir}/nwg-hello cache.json -o greeter
-}
--- a/recipes-gtk/nwg-shell/nwg-look_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-look_git.bb
@ -1,24 +1,20 @@
 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=453b3e96b1052c0e1d1460b0134b9287"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=2e53cad864b84be468b2fc0b511942ce"

 DEPENDS = "xcur2png gtk+3"
 RDEPENDS:${PN} = "xcur2png go-runtime"

 GO_IMPORT = "github.com/nwg-piotr/nwg-look"

-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};branch=main;protocol=https"
-SRCREV = "88f2639445084bf265ad71dba1c7af507c471762"
-PV = "0.2.7"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+SRC_URI = "git://${GO_IMPORT};branch=main;protocol=https"
+SRCREV = "c72a383cf0f3b4130629a649058b680caf619f53"
+PV = "0.2.1"

 inherit go go-mod pkgconfig gtk-icon-cache

 GO_INSTALL = "${GO_IMPORT}"

-GO_LINKSHARED = ""
-
 do_install:append() {
 	install -d ${D}${datadir}/nwg-look/langs ${D}${datadir}/applications ${D}${datadir}/pixmaps
 	install -m 0644 ${S}/src/${GO_IMPORT}/stuff/main.glade ${D}${datadir}/nwg-look
@ -31,3 +27,4 @@ FILES:${PN} += "${datadir}"

 do_compile[network] = "1"

+PRIVATE_LIBS:${PN}:append = " libstd.so"
--- a/recipes-gtk/nwg-shell/nwg-menu_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-menu_git.bb
@ -10,22 +10,20 @@ DEPENDS = " \
 "

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

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

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

-PV = "0.1.3"
-SRCREV = "fd8b92ad1ad0c0c7a23fc7a0be942ca0cbe7f7e0"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+PV = "0.1.1"
+SRCREV = "b76362d971490cb8279b40d9c2d543c5e69232ef"

 inherit go go-mod pkgconfig

 GO_INSTALL = "${GO_IMPORT}"
-GO_LINKSHARED = ""

 do_install:append() {
 	# remove precompiled x86 binary
--- a/recipes-gtk/nwg-shell/nwg-panel_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-panel_git.bb
@ -1,6 +1,6 @@
 SUMMARY = "GTK3-based panel for wayland."
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=da62111cfafe45015704951c9d602bb2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=dcdbccfd08fcfd7002d16ca7fa5ad5cb"

 SRC_URI = " \
 	git://github.com/nwg-piotr/nwg-panel.git;protocol=https;branch=master \
@ -20,6 +20,6 @@ RDEPENDS:${PN} = "\
 inherit setuptools3

 S = "${WORKDIR}/git"
-PV = "0.9.31"
-SRCREV = "dffae7319c59ae55c515fafb150a0f10be21f3cf"
+PV = "0.8.2"
+SRCREV = "78c51ce6a5336301e351230de210f55479cafa77"

--- a/recipes-gtk/nwg-shell/nwg-shell-config_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-shell-config_git.bb
@ -17,6 +17,6 @@ RDEPENDS:${PN} = "\
 inherit setuptools3

 S = "${WORKDIR}/git"
-PV = "0.5.46"
-SRCREV = "21970c25b819bf26c3d3149fd7cc8345b5e99f78"
+PV = "0.4.21"
+SRCREV = "cb67dcbc805d60a262a6aaa4c9128d489f1de7e5"

--- a/recipes-gtk/nwg-shell/nwg-shell-wallpapers_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-shell-wallpapers_git.bb
@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032"
 SRC_URI = "git://github.com/nwg-piotr/nwg-shell-wallpapers.git;protocol=https;nobranch=1"

 S = "${WORKDIR}/git"
-PV = "1.5"
-SRCREV = "a20ad99467e9d1a9427efd5dccfd58d440db96c2"
+PV = "1.1"
+SRCREV = "56a177afe8b8e10d9963a6793fa8bc27b6c063cc"

 do_install() {
 	install -d ${D}${datadir}/backgrounds/sway
--- a/recipes-gtk/nwg-shell/nwgocc_git.bb
+++ b/recipes-gtk/nwg-shell/nwgocc_git.bb
@ -13,17 +13,14 @@ RRECOMMENDS:${PN} = " \

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

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

 PV = "0.0.1"
 SRCREV = "782a37014de40f63115825c0b5bd343dee2ba668"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"

 inherit go go-mod pkgconfig gtk-icon-cache

 GO_INSTALL = "${GO_IMPORT}"
-GO_LINKSHARED = ""

 do_install:append() {
 	install -d \
--- a/recipes-gtk/phosh/phosh/0001-meson-build-without-subproject-wrap.patch
+++ b/recipes-gtk/phosh/phosh/0001-meson-build-without-subproject-wrap.patch
@ -1,72 +0,0 @@
-From da96ea97125c7486eb3604844ef453d2b8b2442c Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Tue, 20 Aug 2024 12:41:01 +0200
-Subject: [PATCH] meson: build without subproject wrap
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
- meson.build | 38 +++++++++++++++++++-------------------
- 1 file changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 9dabba8c..32a568ec 100644
--- a/meson.build
-+++ b/meson.build
-@@ -147,35 +147,35 @@ gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas', version:
- gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
- gtk_wayland_dep = dependency('gtk+-wayland-3.0', version: '>=3.22')
- gudev_dep = dependency('gudev-1.0')
-libcall_ui = subproject('libcall-ui',
-  default_options: [
-    'examples=false',
-    'gtk_doc=false',
-    'tests=false',
-    'install-i18n=@0@'.format(get_option('callui-i18n')),
-  ])
-+#libcall_ui = subproject('libcall-ui',
-+#  default_options: [
-+#    'examples=false',
-+#    'gtk_doc=false',
-+#    'tests=false',
-+#    'install-i18n=@0@'.format(get_option('callui-i18n')),
-+#  ])
- libfeedback_dep = dependency('libfeedback-0.0',
-   version: '>= 0.4.0',
-   fallback: ['libfeedback', 'libfeedback_dep'],
-   default_options: ['introspection=disabled', 'daemon=false', 'gtk_doc=false']
-   )
-libgvc = subproject('gvc',
-  default_options: [
-    'package_name=' + meson.project_name(),
-    'package_version=' + meson.project_version(),
-    'pkgdatadir=' + pkgdatadir,
-    'pkglibdir=' + pkglibdir,
-    'static=true',
-    'introspection=false',
-    'alsa=false'
-  ])
-libgvc_dep = libgvc.get_variable('libgvc_dep')
-+#libgvc = subproject('gvc',
-+#  default_options: [
-+#    'package_name=' + meson.project_name(),
-+#    'package_version=' + meson.project_version(),
-+#    'pkgdatadir=' + pkgdatadir,
-+#    'pkglibdir=' + pkglibdir,
-+#    'static=true',
-+#    'introspection=false',
-+#    'alsa=false'
-+#  ])
-+libgvc_dep = dependency('gvc')
- libhandy_dep = dependency('libhandy-1',
-   version: '>=1.1.90',
-   fallback: ['libhandy', 'libhandy_dep'],
-   default_options: ['introspection=disabled']
-   )
-libcall_ui_dep = libcall_ui.get_variable('libcall_ui_dep')
-+libcall_ui_dep = dependency('call-ui')
- libnm_dep = dependency('libnm', version: '>= 1.14')
- libpolkit_agent_dep = dependency('polkit-agent-1', version: '>= 0.105')
- libsoup_dep = dependency('libsoup-3.0', version: '>= 3.0')
-- 
-2.45.2
-
--- a/recipes-gtk/phosh/phosh/0001-meson.build-dont-read-includedir-from-pkg-config.patch
+++ b/recipes-gtk/phosh/phosh/0001-meson.build-dont-read-includedir-from-pkg-config.patch
@ -1,33 +0,0 @@
-From a2d3acc00525815dc84069c830606823d66935aa Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Thu, 6 Jun 2024 21:21:19 +0200
-Subject: [PATCH] meson.build: dont read includedir from pkg-config
-
-This sets includedir to /usr/include which is inappropriate for cross-compiling.
---
- src/meson.build | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 5a772b89..7f94379a 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -366,12 +366,12 @@ libphosh_sources = files(
- ]
- 
- # See https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/394
-if libsoup_dep.version().version_compare('< 3.5.1')
-  libsoup_dep = declare_dependency (
-    include_directories: libsoup_dep.get_variable(pkgconfig: 'includedir') / 'libsoup-3.0',
-    dependencies: cc.find_library('soup-3.0', required: true),
-  )
-endif
-+#if libsoup_dep.version().version_compare('< 3.5.1')
-+#  libsoup_dep = declare_dependency (
-+#    include_directories: libsoup_dep.get_variable(pkgconfig: 'includedir') / 'libsoup-3.0',
-+#    dependencies: cc.find_library('soup-3.0', required: true),
-+#  )
-+#endif
- 
- 
- # Headers are bundled as they're not shipped by gnome-bluetooth
--- a/recipes-gtk/phosh/phosh/phosh.pam
+++ b/recipes-gtk/phosh/phosh/phosh.pam
@ -0,0 +1,6 @@
+#%PAM-1.0
+auth        required    pam_unix.so
+account     required    pam_unix.so
+password    required    pam_unix.so
+session     required    pam_unix.so
+
--- a/recipes-gtk/phosh/phosh_git.bb
+++ b/recipes-gtk/phosh/phosh_git.bb
@ -6,25 +6,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 REQUIRED_DISTRO_FEATURES = "wayland polkit pam pulseaudio"

 DEPENDS = " \
-    libcall-ui \
-    evolution-data-server \
+    callaudiod \
    evince \
+    evolution-data-server \
    feedbackd \
    fribidi \
+    gcr \
+    git-native \
    glib-2.0 \
-    gmobile \
-    gnome-bluetooth \
    gnome-desktop \
-    gtk+3 \
-    gcr3 \
+    gtk4 \
+    libadwaita \
    libgudev \
    libhandy \
-    libgnome-volume-control \
+    libpam \
    libsecret \
+    libxml2 \
    networkmanager \
    polkit \
    pulseaudio \
-    libsoup-3.0 \
    upower \
    wayland \
    wayland-native \
@ -32,35 +32,39 @@ DEPENDS = " \
 "

 RDEPENDS:${PN} = " \
-    polkit-gnome \
+    gnome-control-center \
+    gnome-session \
+    gnome-settings-daemon \
    gsettings-desktop-schemas \
    phoc \
-    squeekboard \
-    gnome-desktop \
-    gnome-session \
-    wl-clipboard \
-    calls \
 "

 PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false"
-PACKAGECONFIG[phoc_tests] = "-Dphoc_tests=enabled,-Dphoc_tests=disabled"
 PACKAGECONFIG[tools] = "-Dtools=true,-Dtools=false"
+# install systemd service files ?
+PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false"

-PACKAGECONFIG ?= ""
+PACKAGECONFIG ?= " \
+	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+	tools \
+"

-inherit features_check gsettings meson pkgconfig gtk-icon-cache gobject-introspection gi-docgen
+inherit features_check gsettings meson pkgconfig gtk-icon-cache

 SRC_URI = " \
-    git://gitlab.gnome.org/World/Phosh/phosh.git;protocol=https;nobranch=1 \
-    file://0001-meson.build-dont-read-includedir-from-pkg-config.patch \
-    file://0001-meson-build-without-subproject-wrap.patch \
+    gitsm://gitlab.gnome.org/World/Phosh/phosh.git;protocol=https;nobranch=1 \
+    file://phosh.pam \
 "

 S = "${WORKDIR}/git"
-PV = "0.41.1"
-SRCREV = "01a217b334e7839839c212e6ec82b263f43e35b3"
+PV = "0.25.2"
+SRCREV = "0878301c83028b2e5ef75acb92485a6eebfd86bd"

 EXTRA_OEMESON += "--buildtype=release"

+do_install:append() {
+    install -Dm 644 ${WORKDIR}/phosh.pam ${D}${sysconfdir}/pam.d/phosh
+}
+
 FILES:${PN} += "${datadir} ${libdir}"

--- a/recipes-gtk/squeekboard/squeekboard_1.17.1.bb
+++ b/recipes-gtk/squeekboard/squeekboard_1.17.1.bb
@ -1,169 +0,0 @@
-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} \
-    git://source.puri.sm/dorota.czaplejewicz/fragile.git;protocol=https;nobranch=1;name=fragile;destsuffix=fragile \
-    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 \
-    "
-
-SRC_URI[atk-sys-0.9.1.sha256sum] = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f"
-SRC_URI[atk-0.7.0.sha256sum] = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a"
-SRC_URI[autocfg-1.0.1.sha256sum] = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-SRC_URI[bitflags-1.2.1.sha256sum] = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-SRC_URI[cairo-rs-0.7.1.sha256sum] = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c"
-SRC_URI[cairo-sys-rs-0.9.2.sha256sum] = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
-SRC_URI[cc-1.0.72.sha256sum] = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
-SRC_URI[clap-2.33.3.sha256sum] = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
-SRC_URI[dtoa-0.4.8.sha256sum] = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
-SRC_URI[fragile-0.3.0.sha256sum] = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
-SRC_URI[gdk-pixbuf-sys-0.9.1.sha256sum] = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0"
-SRC_URI[gdk-pixbuf-0.7.0.sha256sum] = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc"
-SRC_URI[gdk-sys-0.9.1.sha256sum] = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb"
-SRC_URI[gdk-0.11.0.sha256sum] = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5"
-SRC_URI[gio-sys-0.9.1.sha256sum] = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
-SRC_URI[gio-0.7.0.sha256sum] = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3"
-SRC_URI[glib-sys-0.9.1.sha256sum] = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
-SRC_URI[glib-0.8.2.sha256sum] = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b"
-SRC_URI[gobject-sys-0.9.1.sha256sum] = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
-SRC_URI[gtk-sys-0.9.2.sha256sum] = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1"
-SRC_URI[gtk-0.7.0.sha256sum] = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60"
-SRC_URI[hashbrown-0.8.1.sha256sum] = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
-SRC_URI[indexmap-1.5.2.sha256sum] = "4e47a3566dd4fd4eec714ae6ceabdee0caec795be835c223d92c2d40f1e8cf1c"
-SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-SRC_URI[libc-0.2.107.sha256sum] = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"
-SRC_URI[linked-hash-map-0.5.4.sha256sum] = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
-SRC_URI[maplit-1.0.2.sha256sum] = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-SRC_URI[memmap-0.7.0.sha256sum] = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-SRC_URI[pango-sys-0.9.1.sha256sum] = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d"
-SRC_URI[pango-0.7.0.sha256sum] = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786"
-SRC_URI[pkg-config-0.3.22.sha256sum] = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
-SRC_URI[proc-macro2-1.0.32.sha256sum] = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
-SRC_URI[quote-1.0.10.sha256sum] = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
-SRC_URI[regex-syntax-0.6.25.sha256sum] = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-SRC_URI[regex-1.3.9.sha256sum] = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
-SRC_URI[serde-1.0.130.sha256sum] = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
-SRC_URI[serde_derive-1.0.130.sha256sum] = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
-SRC_URI[serde_yaml-0.8.21.sha256sum] = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af"
-SRC_URI[syn-1.0.81.sha256sum] = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966"
-SRC_URI[textwrap-0.11.0.sha256sum] = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-SRC_URI[unicode-width-0.1.9.sha256sum] = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-SRC_URI[unicode-xid-0.2.2.sha256sum] = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-SRC_URI[xkbcommon-0.4.0.sha256sum] = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
-SRC_URI[yaml-rust-0.4.5.sha256sum] = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-
-# Modify these as desired
-PV = "1.17.1"
-SRCREV = "2faa98d85f1142383ec8ad1487616c1a7ad1882f"
-BRANCH = "1.17"
-
-SRCREV_FORMAT .= "_fragile"
-SRCREV_fragile = "51048ca11824279c2114c77fef5bcb950838fc09"
-EXTRA_OECARGO_PATHS += "${WORKDIR}/fragile"
-
-S = "${WORKDIR}/git"
-
-inherit cargo meson rust pkgconfig
-
-EXTRA_OEMESON = "\
-    -Dcargo-flags=[\'--target\',\'${RUST_HOST_SYS}\',\'-v\'] \
-    -Dtests=false \
-    -Ddepdatadir=${datadir} \
-    -Donline=true \
-"
-
-export CARGO_FEATURE_STD = "1"
-
-do_compile[network] = "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
-}
--- a/recipes-gtk/squeekboard/squeekboard_git.bb
+++ b/recipes-gtk/squeekboard/squeekboard_git.bb
@ -1,352 +0,0 @@
-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-only & GPL-3.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
-                    file://debian/copyright;md5=4dbf2d985c407c84a6622b9c95f23802"
-
-DEPENDS = "\
-    feedbackd \
-    glib-2.0 \
-    glib-2.0-native \
-    gnome-desktop \
-    gtk+3 \
-    libbsd \
-    libxkbcommon \
-    wayland \
-    wayland-native \
-    wayland-protocols \
-    "
-
-SRC_URI = "\
-    git://gitlab.gnome.org/World/Phosh/squeekboard.git;protocol=https;nobranch=1 \
-    file://0001-Pass-additional-arguments-to-cargo.patch \
-    crate://crates.io/anstyle/1.0.8 \
-    crate://crates.io/async-io/1.13.0 \
-    crate://crates.io/async-lock/2.8.0 \
-    crate://crates.io/atk-sys/0.18.0 \
-    crate://crates.io/atk/0.18.0 \
-    crate://crates.io/autocfg/1.3.0 \
-    crate://crates.io/bitflags/1.3.2 \
-    crate://crates.io/bitflags/2.6.0 \
-    crate://crates.io/byteorder/1.5.0 \
-    crate://crates.io/cairo-rs/0.18.5 \
-    crate://crates.io/cairo-sys-rs/0.18.2 \
-    crate://crates.io/cc/1.1.11 \
-    crate://crates.io/cfg-expr/0.15.8 \
-    crate://crates.io/cfg-if/1.0.0 \
-    crate://crates.io/clap/4.5.15 \
-    crate://crates.io/clap_builder/4.5.15 \
-    crate://crates.io/clap_lex/0.7.2 \
-    crate://crates.io/concurrent-queue/2.5.0 \
-    crate://crates.io/crossbeam-utils/0.8.20 \
-    crate://crates.io/derivative/2.2.0 \
-    crate://crates.io/enumflags2/0.6.4 \
-    crate://crates.io/enumflags2_derive/0.6.4 \
-    crate://crates.io/equivalent/1.0.1 \
-    crate://crates.io/errno/0.3.9 \
-    crate://crates.io/event-listener/2.5.3 \
-    crate://crates.io/fastrand/1.9.0 \
-    crate://crates.io/field-offset/0.3.6 \
-    crate://crates.io/futures-channel/0.3.30 \
-    crate://crates.io/futures-core/0.3.30 \
-    crate://crates.io/futures-executor/0.3.30 \
-    crate://crates.io/futures-io/0.3.30 \
-    crate://crates.io/futures-lite/1.13.0 \
-    crate://crates.io/futures-macro/0.3.30 \
-    crate://crates.io/futures-sink/0.3.30 \
-    crate://crates.io/futures-task/0.3.30 \
-    crate://crates.io/futures-util/0.3.30 \
-    crate://crates.io/futures/0.3.30 \
-    crate://crates.io/gdk-pixbuf-sys/0.18.0 \
-    crate://crates.io/gdk-pixbuf/0.18.5 \
-    crate://crates.io/gdk-sys/0.18.0 \
-    crate://crates.io/gdk/0.18.0 \
-    crate://crates.io/gio-sys/0.18.1 \
-    crate://crates.io/gio/0.18.4 \
-    crate://crates.io/glib-macros/0.18.5 \
-    crate://crates.io/glib-sys/0.18.1 \
-    crate://crates.io/glib/0.18.5 \
-    crate://crates.io/gobject-sys/0.18.0 \
-    crate://crates.io/gtk-sys/0.18.0 \
-    crate://crates.io/gtk/0.18.1 \
-    crate://crates.io/gtk3-macros/0.18.0 \
-    crate://crates.io/hashbrown/0.14.5 \
-    crate://crates.io/heck/0.4.1 \
-    crate://crates.io/heck/0.5.0 \
-    crate://crates.io/hermit-abi/0.3.9 \
-    crate://crates.io/indexmap/2.4.0 \
-    crate://crates.io/instant/0.1.13 \
-    crate://crates.io/io-lifetimes/1.0.11 \
-    crate://crates.io/itoa/1.0.11 \
-    crate://crates.io/libc/0.2.155 \
-    crate://crates.io/linux-raw-sys/0.3.8 \
-    crate://crates.io/log/0.4.22 \
-    crate://crates.io/maplit/1.0.2 \
-    crate://crates.io/memchr/2.7.4 \
-    crate://crates.io/memmap2/0.8.0 \
-    crate://crates.io/memoffset/0.6.5 \
-    crate://crates.io/memoffset/0.9.1 \
-    crate://crates.io/nb-connect/1.2.0 \
-    crate://crates.io/nix/0.22.3 \
-    crate://crates.io/once_cell/1.19.0 \
-    crate://crates.io/pango-sys/0.18.0 \
-    crate://crates.io/pango/0.18.3 \
-    crate://crates.io/parking/2.2.0 \
-    crate://crates.io/pin-project-lite/0.2.14 \
-    crate://crates.io/pin-utils/0.1.0 \
-    crate://crates.io/pkg-config/0.3.30 \
-    crate://crates.io/polling/2.8.0 \
-    crate://crates.io/proc-macro-crate/0.1.5 \
-    crate://crates.io/proc-macro-crate/1.3.1 \
-    crate://crates.io/proc-macro-crate/2.0.2 \
-    crate://crates.io/proc-macro-error-attr/1.0.4 \
-    crate://crates.io/proc-macro-error/1.0.4 \
-    crate://crates.io/proc-macro2/1.0.86 \
-    crate://crates.io/quote/1.0.36 \
-    crate://crates.io/rustc_version/0.4.0 \
-    crate://crates.io/rustix/0.37.27 \
-    crate://crates.io/ryu/1.0.18 \
-    crate://crates.io/scoped-tls/1.0.1 \
-    crate://crates.io/semver/1.0.23 \
-    crate://crates.io/serde/1.0.207 \
-    crate://crates.io/serde_derive/1.0.207 \
-    crate://crates.io/serde_repr/0.1.19 \
-    crate://crates.io/serde_spanned/0.6.7 \
-    crate://crates.io/serde_yaml/0.9.34+deprecated \
-    crate://crates.io/shlex/1.3.0 \
-    crate://crates.io/slab/0.4.9 \
-    crate://crates.io/smallvec/1.13.2 \
-    crate://crates.io/socket2/0.4.10 \
-    crate://crates.io/static_assertions/1.1.0 \
-    crate://crates.io/syn/1.0.109 \
-    crate://crates.io/syn/2.0.74 \
-    crate://crates.io/system-deps/6.2.2 \
-    crate://crates.io/target-lexicon/0.12.16 \
-    crate://crates.io/thiserror-impl/1.0.63 \
-    crate://crates.io/thiserror/1.0.63 \
-    crate://crates.io/toml/0.5.11 \
-    crate://crates.io/toml/0.8.2 \
-    crate://crates.io/toml_datetime/0.6.3 \
-    crate://crates.io/toml_edit/0.19.15 \
-    crate://crates.io/toml_edit/0.20.2 \
-    crate://crates.io/unicode-ident/1.0.12 \
-    crate://crates.io/unsafe-libyaml/0.2.11 \
-    crate://crates.io/version-compare/0.2.0 \
-    crate://crates.io/version_check/0.9.5 \
-    crate://crates.io/waker-fn/1.2.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.9 \
-    crate://crates.io/windows-sys/0.48.0 \
-    crate://crates.io/windows-sys/0.52.0 \
-    crate://crates.io/windows-targets/0.48.5 \
-    crate://crates.io/windows-targets/0.52.6 \
-    crate://crates.io/windows_aarch64_gnullvm/0.48.5 \
-    crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
-    crate://crates.io/windows_aarch64_msvc/0.48.5 \
-    crate://crates.io/windows_aarch64_msvc/0.52.6 \
-    crate://crates.io/windows_i686_gnu/0.48.5 \
-    crate://crates.io/windows_i686_gnu/0.52.6 \
-    crate://crates.io/windows_i686_gnullvm/0.52.6 \
-    crate://crates.io/windows_i686_msvc/0.48.5 \
-    crate://crates.io/windows_i686_msvc/0.52.6 \
-    crate://crates.io/windows_x86_64_gnu/0.48.5 \
-    crate://crates.io/windows_x86_64_gnu/0.52.6 \
-    crate://crates.io/windows_x86_64_gnullvm/0.48.5 \
-    crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
-    crate://crates.io/windows_x86_64_msvc/0.48.5 \
-    crate://crates.io/windows_x86_64_msvc/0.52.6 \
-    crate://crates.io/winnow/0.5.40 \
-    crate://crates.io/xkbcommon/0.7.0 \
-    crate://crates.io/xkeysym/0.2.1 \
-    crate://crates.io/zbus/1.9.3 \
-    crate://crates.io/zbus_macros/1.9.3 \
-    crate://crates.io/zvariant/2.10.0 \
-    crate://crates.io/zvariant_derive/2.10.0 \
-"
-
-SRC_URI[anstyle-1.0.8.sha256sum] = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
-SRC_URI[async-io-1.13.0.sha256sum] = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
-SRC_URI[async-lock-2.8.0.sha256sum] = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
-SRC_URI[atk-sys-0.18.0.sha256sum] = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009"
-SRC_URI[atk-0.18.0.sha256sum] = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4"
-SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-SRC_URI[cairo-rs-0.18.5.sha256sum] = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
-SRC_URI[cairo-sys-rs-0.18.2.sha256sum] = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
-SRC_URI[cc-1.1.11.sha256sum] = "5fb8dd288a69fc53a1996d7ecfbf4a20d59065bff137ce7e56bbd620de191189"
-SRC_URI[cfg-expr-0.15.8.sha256sum] = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
-SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-SRC_URI[clap-4.5.15.sha256sum] = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
-SRC_URI[clap_builder-4.5.15.sha256sum] = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
-SRC_URI[clap_lex-0.7.2.sha256sum] = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
-SRC_URI[concurrent-queue-2.5.0.sha256sum] = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-SRC_URI[crossbeam-utils-0.8.20.sha256sum] = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-SRC_URI[derivative-2.2.0.sha256sum] = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-SRC_URI[enumflags2-0.6.4.sha256sum] = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
-SRC_URI[enumflags2_derive-0.6.4.sha256sum] = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
-SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-SRC_URI[errno-0.3.9.sha256sum] = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-SRC_URI[event-listener-2.5.3.sha256sum] = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-SRC_URI[fastrand-1.9.0.sha256sum] = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-SRC_URI[field-offset-0.3.6.sha256sum] = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
-SRC_URI[futures-channel-0.3.30.sha256sum] = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-SRC_URI[futures-core-0.3.30.sha256sum] = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-SRC_URI[futures-executor-0.3.30.sha256sum] = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-SRC_URI[futures-io-0.3.30.sha256sum] = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-SRC_URI[futures-lite-1.13.0.sha256sum] = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-SRC_URI[futures-macro-0.3.30.sha256sum] = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-SRC_URI[futures-sink-0.3.30.sha256sum] = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-SRC_URI[futures-task-0.3.30.sha256sum] = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-SRC_URI[futures-util-0.3.30.sha256sum] = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-SRC_URI[futures-0.3.30.sha256sum] = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-SRC_URI[gdk-pixbuf-sys-0.18.0.sha256sum] = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
-SRC_URI[gdk-pixbuf-0.18.5.sha256sum] = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec"
-SRC_URI[gdk-sys-0.18.0.sha256sum] = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2"
-SRC_URI[gdk-0.18.0.sha256sum] = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646"
-SRC_URI[gio-sys-0.18.1.sha256sum] = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
-SRC_URI[gio-0.18.4.sha256sum] = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73"
-SRC_URI[glib-macros-0.18.5.sha256sum] = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
-SRC_URI[glib-sys-0.18.1.sha256sum] = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
-SRC_URI[glib-0.18.5.sha256sum] = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
-SRC_URI[gobject-sys-0.18.0.sha256sum] = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
-SRC_URI[gtk-sys-0.18.0.sha256sum] = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722"
-SRC_URI[gtk-0.18.1.sha256sum] = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c"
-SRC_URI[gtk3-macros-0.18.0.sha256sum] = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e"
-SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-SRC_URI[hermit-abi-0.3.9.sha256sum] = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-SRC_URI[indexmap-2.4.0.sha256sum] = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
-SRC_URI[instant-0.1.13.sha256sum] = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-SRC_URI[io-lifetimes-1.0.11.sha256sum] = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-SRC_URI[itoa-1.0.11.sha256sum] = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-SRC_URI[linux-raw-sys-0.3.8.sha256sum] = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-SRC_URI[log-0.4.22.sha256sum] = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-SRC_URI[maplit-1.0.2.sha256sum] = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-SRC_URI[memmap2-0.8.0.sha256sum] = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
-SRC_URI[memoffset-0.6.5.sha256sum] = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-SRC_URI[nb-connect-1.2.0.sha256sum] = "b1bb540dc6ef51cfe1916ec038ce7a620daf3a111e2502d745197cd53d6bca15"
-SRC_URI[nix-0.22.3.sha256sum] = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
-SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-SRC_URI[pango-sys-0.18.0.sha256sum] = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
-SRC_URI[pango-0.18.3.sha256sum] = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
-SRC_URI[parking-2.2.0.sha256sum] = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-SRC_URI[pin-project-lite-0.2.14.sha256sum] = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
-SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-SRC_URI[pkg-config-0.3.30.sha256sum] = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-SRC_URI[polling-2.8.0.sha256sum] = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-SRC_URI[proc-macro-crate-0.1.5.sha256sum] = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
-SRC_URI[proc-macro-crate-1.3.1.sha256sum] = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-SRC_URI[proc-macro-crate-2.0.2.sha256sum] = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
-SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
-SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-SRC_URI[rustix-0.37.27.sha256sum] = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
-SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-SRC_URI[scoped-tls-1.0.1.sha256sum] = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-SRC_URI[semver-1.0.23.sha256sum] = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-SRC_URI[serde-1.0.207.sha256sum] = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2"
-SRC_URI[serde_derive-1.0.207.sha256sum] = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e"
-SRC_URI[serde_repr-0.1.19.sha256sum] = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
-SRC_URI[serde_spanned-0.6.7.sha256sum] = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
-SRC_URI[serde_yaml-0.9.34+deprecated.sha256sum] = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
-SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-SRC_URI[slab-0.4.9.sha256sum] = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-SRC_URI[socket2-0.4.10.sha256sum] = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-SRC_URI[syn-2.0.74.sha256sum] = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
-SRC_URI[system-deps-6.2.2.sha256sum] = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
-SRC_URI[target-lexicon-0.12.16.sha256sum] = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
-SRC_URI[thiserror-impl-1.0.63.sha256sum] = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
-SRC_URI[thiserror-1.0.63.sha256sum] = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
-SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-SRC_URI[toml-0.8.2.sha256sum] = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
-SRC_URI[toml_datetime-0.6.3.sha256sum] = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
-SRC_URI[toml_edit-0.19.15.sha256sum] = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-SRC_URI[toml_edit-0.20.2.sha256sum] = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
-SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-SRC_URI[unsafe-libyaml-0.2.11.sha256sum] = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
-SRC_URI[version-compare-0.2.0.sha256sum] = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
-SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-SRC_URI[waker-fn-1.2.0.sha256sum] = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
-SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-SRC_URI[winnow-0.5.40.sha256sum] = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-SRC_URI[xkbcommon-0.7.0.sha256sum] = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e"
-SRC_URI[xkeysym-0.2.1.sha256sum] = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
-SRC_URI[zbus-1.9.3.sha256sum] = "9cbeb2291cd7267a94489b71376eda33496c1b9881adf6b36f26cc2779f3fc49"
-SRC_URI[zbus_macros-1.9.3.sha256sum] = "fa3959a7847cf95e3d51e312856617c5b1b77191176c65a79a5f14d778bbe0a6"
-SRC_URI[zvariant-2.10.0.sha256sum] = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525"
-SRC_URI[zvariant_derive-2.10.0.sha256sum] = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9"
-
-# Modify these as desired
-PV = "1.41.0"
-SRCREV = "35785f3d41def08106a3a563fa1ea4e3c8e9b2c7"
-
-S = "${WORKDIR}/git"
-
-inherit cargo meson rust pkgconfig
-
-EXTRA_OEMESON = "\
-    -Dcargo-flags=[\'--target\',\'${RUST_HOST_SYS}\',\'-v\'] \
-    -Dtests=false \
-    -Ddepdatadir=${datadir} \
-"
-
-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
-}
--- a/recipes-gtk/srain/srain_git.bb
+++ b/recipes-gtk/srain/srain_git.bb
@ -11,28 +11,27 @@ DEPENDS = " \
    gdk-pixbuf \
    glib-2.0 \
    libconfig \
-    libsecret \
-    libsoup-3.0 \
+    libsoup-2.4 \
    openssl \
-    python3-sphinx-native \
+    libsecret \
 "

 GIR_MESON_OPTION = ""

 inherit meson gtk-icon-cache mime-xdg pkgconfig features_check gobject-introspection

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

 S = "${WORKDIR}/git"
-PV = "1.7.0"
-SRCREV = "008f05b4c66de37440e44325f6ab6affa2397cba"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[app_indicator] = "-Dapp_indicator=true,-Dapp_indicator=false,libayatana-appindicator"
+PV = "1.5.1"
+SRCREV = "46ba1e2690b9e22fcc35f921375b346a0130e05c"

 EXTRA_OEMESON += " \
    --buildtype release \
-    -Ddoc_builders=man \
+    -Ddoc_builders= \
 "

 FILES:${PN} += "${datadir}/metainfo"
+
--- a/recipes-gtk/swaync/swaync_git.bb
+++ b/recipes-gtk/swaync/swaync_git.bb
@ -6,13 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"


 DEPENDS = " \
+            gtk+3 \
            gtk-layer-shell \
-            granite6 \
            json-glib \
            libhandy \
            libgee \
            pulseaudio \
-            sassc-native \
 "

 SRC_URI = " \
@ -20,8 +19,8 @@ SRC_URI = " \
 "

 S = "${WORKDIR}/git"
-PV = "0.10.1"
-SRCREV = "4275fa3915c12ad2731ff78027188b4b7ceaad64"
+PV = "0.8.0"
+SRCREV = "2fc7d780130fa08b48dcffd23d4a39f6b4e48501"

 PACKAGECONFIG[bash] = "-Dbash-completions=true,-Dbash-completions=false"
 PACKAGECONFIG[fish] = "-Dfish-completions=true,-Dfish-completions=false"
@ -36,8 +35,6 @@ PACKAGECONFIG ?= " \

 inherit meson pkgconfig vala

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

 FILES:${PN} += "${datadir}"
--- a/recipes-gtk/swaysettings/swaysettings_git.bb
+++ b/recipes-gtk/swaysettings/swaysettings_git.bb
@ -6,23 +6,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"

 DEPENDS = " \
 	accountsservice \
-	gtk+3 \
 	glib-2.0 \
-	granite6 \
+	granite \
+	gtk+3 \
 	gtk-layer-shell \
 	json-glib \
 	libgee \
 	libhandy \
 	libxml2 \
-	pulseaudio \
 	xkeyboard-config \
 "

 SRC_URI = "git://github.com/ErikReider/SwaySettings.git;protocol=https;nobranch=1"

 S = "${WORKDIR}/git"
-PV = "0.4.0"
-SRCREV = "8fb6210ad123654f3988cb8f3f59ab629bb0a747"
+PV = "0.3.0"
+SRCREV = "8c7ac50f78eadd65086b68c662514f95e02f8559"

 inherit meson pkgconfig vala

--- a/recipes-gtk/waybar/waybar_git.bb
+++ b/recipes-gtk/waybar/waybar_git.bb
@ -1,5 +1,6 @@
 SUMMARY = "Wayland bar for Wlroots based compositors"
 DESCRIPTION = "Highly customizable Wayland bar for Sway and Wlroots based compositors."
+AUTHOR = ""
 HOMEPAGE = "https://github.com/Alexays/Waybar"
 BUGTRACKER = "https://github.com/Alexays/Waybar/issues"
 SECTION = "graphics"
@ -15,8 +16,8 @@ SRC_URI = " \
 "

 S = "${WORKDIR}/git"
-PV = "0.11.0"
-SRCREV = "d56dd6ee7fdf8c5ba4e90790af62b7f7829d3a47"
+PV = "0.9.17"
+SRCREV = "f0bead34d4f3a36cb9c94d60152d22dc6a773d60"

 DEPENDS += " \
 	date \
@ -27,7 +28,6 @@ DEPENDS += " \
 	libsigc++-3 \
 	libxkbcommon \
 	gtk+3 \
-	gtk-layer-shell \
 	gobject-introspection \
 	spdlog \
 	wayland \
@ -38,18 +38,17 @@ DEPENDS += " \
 inherit meson pkgconfig features_check

 PACKAGECONFIG[libcxx] = "-Dlibcxx=true,-Dlibcxx=false,libcxx clang-tidy"
-PACKAGECONFIG[dbusmenu-gtk] = "-Ddbusmenu-gtk=enabled,-Ddbusmenu-gtk=disabled,libdbusmenu-gtk"
 PACKAGECONFIG[evdev] = "-Dlibevdev=enabled,-Dlibevdev=disabled,libevdev"
 PACKAGECONFIG[experimental] = "-Dexperimental=true,-Dexperimental=false"
-PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack"
+PACKAGECONFIG[gtk-layer-shell] = "-Dgtk-layer-shell=enabled,-Dgtk-layer-shell=disabled,gtk-layer-shell"
+PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,pipewire"
 PACKAGECONFIG[libinput] = "-Dlibinput=enabled,-Dlibinput=disabled,libinput"
 PACKAGECONFIG[logind] = "-Dlogind=enabled,-Dlogind=disabled,systemd"
-PACKAGECONFIG[man_pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native"
+PACKAGECONFIG[mpd] = "-Dman_pages=enabled,-Dman_pages=disabled,scdoc-native"
 PACKAGECONFIG[mpd] = "-Dmpd=enabled,-Dmpd=disabled,libmpdclient"
 PACKAGECONFIG[mpris] = "-Dmpris=enabled,-Dmpris=disabled,playerctl"
 PACKAGECONFIG[network] = "-Dlibnl=enabled,-Dlibnl=disabled,libnl"
 PACKAGECONFIG[pulseaudio] = "-Dpulseaudio=enabled,-Dpulseaudio=disabled,pulseaudio"
-PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
 PACKAGECONFIG[rfkill] = "-Drfkill=enabled,-Drfkill=disabled"
 PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
 PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled,catch2"
@ -60,8 +59,9 @@ PACKAGECONFIG[wireplumber] = "-Dwireplumber=enabled,-Dwireplumber=disabled,wirep
 PACKAGECONFIG ?= " \
    ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd logind udev', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'pipewire wireplumber', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'wireplumber', '', d)} \
    evdev \
+    gtk-layer-shell \
    libinput  \
    mpris \
    network \
@ -70,7 +70,7 @@ PACKAGECONFIG ?= " \
 "

 do_install:append() {
-	install -m 0644 ${UNPACKDIR}/waybar.service ${D}${systemd_user_unitdir}
+	install -m 0644 ${WORKDIR}/waybar.service ${D}${systemd_user_unitdir}
 }

 FILES:${PN} += "${systemd_user_unitdir}"
--- a/recipes-gtk/waypaper/waypaper_git.bb
+++ b/recipes-gtk/waypaper/waypaper_git.bb
@ -1,15 +0,0 @@
-SUMMARY = "GUI wallpaper setter for Wayland and Xorg window managers."
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
-
-SRC_URI = "git://github.com/anufrievroman/waypaper.git;protocol=https;branch=main"
-
-RDEPENDS:${PN} = "python3-pygobject python3-importlib-metadata python3-platformdirs python3-pillow python3-pathlib2"
-
-inherit python_setuptools_build_meta
-
-S = "${WORKDIR}/git"
-PV = "2.2"
-SRCREV = "bbdca8a4d96208c748af7307fbcf3d61e46bc64e"
-
-FILES:${PN} += "${datadir}"
--- a/recipes-support/asciinema/asciinema_git.bb
+++ b/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;nobranch=1 \
+	git://github.com/asciinema/asciinema.git;protocol=https;branch=master \
 "

 RDEPENDS:${PN} = " \
@ -14,5 +14,5 @@ RDEPENDS:${PN} = " \
 inherit python_setuptools_build_meta

 S = "${WORKDIR}/git"
-PV = "2.3.0"
-SRCREV = "791916d87d06b25ded09fefde33288d5c069c96d"
+PV = "2.2.0"
+SRCREV = "f3af768f569e0b363bcced11d266d4ed857e21e7"
--- a/recipes-support/fnott/fnott_git.bb
+++ b/recipes-support/fnott/fnott_git.bb
@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3a7351a597a91e763901f7c76f21e798"
 REQUIRED_DISTRO_FEATURES = "wayland"

 SRC_URI = " \
-	git://codeberg.org/dnkl/fnott.git;protocol=https;branch=releases/1.7 \
+	git://codeberg.org/dnkl/fnott.git;protocol=https;branch=release/1.4 \
 "

 DEPENDS = " \
@ -24,15 +24,21 @@ DEPENDS = " \
 	wayland-protocols \
 "

+RDEPENDS:${PN} = " \
+	fontconfig \
+	freetype \
+	wlroots \
+"
+
 inherit meson pkgconfig features_check

 S = "${WORKDIR}/git"
-PV = "1.7.0"
-SRCREV = "2821dd2fcece876d401db2efe04cae17efd67f30"
+PV = "1.4.0"
+SRCREV = "f728d986ffac89db3bae63459b09f049720e7051"

 EXTRA_OEMESON += "--buildtype release"

 PACKAGES += "${PN}-zsh-completion"
-FILES:${PN} += "${datadir}/dbus-1 ${systemd_user_unitdir}"
 FILES:${PN}-zsh-completion = "${datadir}/zsh"

+BBCLASSEXTEND = ""
--- a/recipes-support/foot/foot/0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch
+++ b/recipes-support/foot/foot/0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch
@ -3,7 +3,6 @@ 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

-Upstream-Status: Inappropriate [oe-specific]
 ---
 generate-version.sh | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)
--- a/recipes-support/foot/foot/0001-wayland-handle-enum-value-XDG_TOPLEVEL_STATE_SUSPEND.patch
+++ b/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
+
--- a/recipes-support/foot/foot_git.bb
+++ b/recipes-support/foot/foot_git.bb
@ -21,11 +21,12 @@ RRECOMMENDS:${PN} = "ncurses-terminfo"
 SRC_URI = " \
 	git://codeberg.org/dnkl/foot.git;protocol=https;branch=master \
 	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.18.1"
-SRCREV = "ce9c9f6be6bc0226741b5e114167a53e135ae885"
+PV = "1.14.0"
+SRCREV = "ae6bbce6c2527db40177585cc3c3d797d68c104a"

 PACKAGECONFIG[grapheme-clustering] = "-Dgrapheme-clustering=enabled,-Dgrapheme-clustering=disabled,utf8proc"
 PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,scdoc-native"
@ -40,6 +41,8 @@ EXTRA_OEMESON += "--buildtype=release -Dterminfo=disabled"

 inherit meson pkgconfig

+CFLAGS += "-Wno-unused-but-set-variable"
+
 FILES:${PN} = " \
 	${bindir} \
 	${datadir} \
--- a/recipes-support/fuzzel/fuzzel_git.bb
+++ b/recipes-support/fuzzel/fuzzel_git.bb
@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3a7351a597a91e763901f7c76f21e798"
 REQUIRED_DISTRO_FEATURES = "wayland"

 SRC_URI = " \
-	git://codeberg.org/dnkl/fuzzel.git;protocol=https;branch=releases/1.10 \
+	git://codeberg.org/dnkl/fuzzel.git;protocol=https;branch=releases/1.9 \
 "

 DEPENDS = " \
@ -24,8 +24,8 @@ DEPENDS = " \
 "

 S = "${WORKDIR}/git"
-PV = "1.10.2"
-SRCREV = "a4964aac0d6ee657649cb15807520bd040c26252"
+PV = "1.9.1"
+SRCREV = "eeb901c720a4ce009a9d208b3c220efceba0076a"

 inherit meson pkgconfig features_check

--- a/recipes-support/greetd/greetd/greetd.pam
+++ b/recipes-support/greetd/greetd/greetd.pam
@ -1,9 +1,6 @@
 #%PAM-1.0
-auth     requisite      pam_nologin.so
-auth     include        common-auth
-account  include        common-account
-password include        common-password
-session  required       pam_loginuid.so
-session  optional       pam_keyinit.so force revoke
-session  include        common-session
+auth        required    pam_unix.so
+account     required    pam_unix.so
+password    required    pam_unix.so
+session     required    pam_unix.so

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ludovic Jozeau	d700db4aa6	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>	2025-04-24 05:12:35 +02:00
Markus Volk	e43505a79b	python3: move python link to python3-core package fixes: https://codeberg.org/flk/meta-wayland/issues/13	2025-04-22 14:55:56 +02:00
Markus Volk	e2d141488e	foot: add backport patch to fix build for x11	2023-09-02 08:44:58 +02:00
Markus Volk	181cad568b	waybar: rework	2023-04-14 10:01:37 +02:00
Markus Volk	060691e203	hyprland: update	2023-04-14 09:18:03 +02:00
Markus Volk	52921db329	gtkgreet: fix build fix PV	2023-04-12 21:38:58 +02:00
Markus Volk	9fb0d258c6	add SRC_URI checksum to various rust recipes	2023-04-12 21:38:04 +02:00
Markus Volk	3191fedfc6	sirula: add SRC_URI checksums	2023-04-12 18:59:59 +02:00
Markus Volk	7885ae290c	inih: remove duplicate recipe	2023-04-11 16:17:59 +02:00
Markus Volk	c630d562ff	fuzzel: update	2023-04-11 13:40:07 +02:00
Markus Volk	3a4c6f285f	fnott: update	2023-04-11 13:39:41 +02:00
Markus Volk	447da16bcc	foot: update 1.13.1 -> 1.14.0	2023-04-11 13:20:59 +02:00
Markus Volk	e26a1d7d8f	nwg-bar: update	2023-04-10 15:02:17 +02:00
Markus Volk	813436e1e5	nwg-shell-config: update	2023-04-10 15:02:17 +02:00
Markus Volk	dab8577e82	nwg-panel: update	2023-04-10 15:02:17 +02:00
Markus Volk	77c5eb5eec	nwg-displays: update - add support for hyprland	2023-04-10 15:02:17 +02:00
Markus Volk	fd5acfad61	swaync: update	2023-04-10 15:02:17 +02:00
Markus Volk	8d14c7fbc5	sofia-sip: update	2023-04-10 09:00:19 +02:00
Markus Volk	7550851554	font-awesome: update	2023-04-10 09:00:03 +02:00
Markus Volk	02d75bfeb5	hyprland: update 0.23_beta -> 0.24 Signed-off-by: Markus Volk <f_l_k@t-online.de>	2023-04-09 18:18:33 +02:00
Markus Volk	f4f1514618	layer.conf: set to mickledore	2023-04-04 10:34:49 +02:00