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:10:54 +02:00 · 2025-04-22 14:53:02 +02:00 · 2024-01-21 16:09:41 +01:00 · 2024-01-21 16:09:04 +01:00 · 2024-01-21 16:08:19 +01:00
104 changed files with 388 additions and 1144 deletions
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -2,13 +2,13 @@
 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 = "scarthgap"
+LAYERSERIES_COMPAT_wayland = "nanbield"

 LAYERDEPENDS_wayland = " \
 	core \
--- 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
@ -12,14 +12,8 @@ EXTRA_OECMAKE += "-DUSE_QT6=ON"
 SRC_URI = "git://github.com/FedoraQt/adwaita-qt.git;protocol=https;nobranch=1"

 S = "${WORKDIR}/git"
-SRCREV = "3807292acee096459a73732f663544916d9eb0e5"
+SRCREV = "07859143fd733cfefae687f6967795c7f50d4ca8"

 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
-}
+BBCLASSEXTEND = "native"
--- 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
@ -4,7 +4,7 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=40d2542b8c43a3ec2b7f5da31a697b88"

 DEPENDS = " \
-	adwaita-qt \
+	adwaita-qt-native \
 	glib-2.0 \
 	gsettings-desktop-schemas \
 	gtk+3 \
--- 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
@ -12,14 +12,13 @@ DEPENDS = " \
    wayland \
    wayland-native \
    wayland-protocols \
-    hyprlang \
    libdrm \
    pipewire \
-    sdbus-c++-1 \
+    sdbus-c++ \
    virtual/libgbm \
 "

-RDEPENDS:${PN} = "hyprland-share-picker grim slurp hyprpicker hyprlang"
+RDEPENDS:${PN} = "hyprland-share-picker"
 RCONFLICTS:${PN} = "xdg-desktop-portal-wlr xdg-desktop-portal-gnome"

 inherit meson pkgconfig features_check
--- 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 +1,3 @@
 SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1"
-SRCREV = "15fd76cb6ebb0e3c3b2c3a3daf452e7b781c6e8a"
-PV = "1.3.1"
+SRCREV = "3606b35a0733015c8e3da5aca2dde4641b515720"
+PV = "1.2.2"
--- 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/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-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/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 = "f4a71b13373436a2866c5d68f8f80ac6f0bc1ffe"
-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/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.6"
+SRCREV = "63845bdce3cf31f879c8be44088807b6750e1158"

 inherit meson pkgconfig

--- a/recipes-extended/feedbackd/feedbackd_git.bb
+++ b/recipes-extended/feedbackd/feedbackd_git.bb
@ -19,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.2.1"
-SRCREV = "1104cef50acb0b18a0d545e6a09773e3feb42e5b"
+PV = "0.2.0"
+SRCREV = "eadcfb16c3d6e648e471d0342a43075dfdf4143a"

 EXTRA_OEMESON += "-Dtests=false"

--- a/recipes-extended/gmobile/gmobile/0001-meson.build-create-a-pkgconfig-.pc-file.patch
+++ b/recipes-extended/gmobile/gmobile/0001-meson.build-create-a-pkgconfig-.pc-file.patch
@ -18,6 +18,13 @@ diff --git a/meson.build b/meson.build
 index e9f6c62..7e94496 100644
 --- a/meson.build
 +++ b/meson.build
+@@ -1,5 +1,5 @@
+ project('gmobile', 'c',
+-        version: '0.0.1',
+        version: '0.0.3',
+         license: 'LGPLv2.1+',
+         meson_version: '>= 0.56.1',
+         default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],
@@ -99,3 +99,7 @@ summary({
   bool_yn: true,
   section: 'Build',
--- a/recipes-extended/gmobile/gmobile_git.bb
+++ b/recipes-extended/gmobile/gmobile_git.bb
@ -7,12 +7,12 @@ inherit meson pkgconfig
 DEPENDS = "glib-2.0 json-glib"

 SRC_URI = " \
-	git://gitlab.gnome.org/World/Phosh/gmobile.git;protocol=https;branch=main \
+	git://gitlab.gnome.org/guidog/gmobile.git;protocol=https;nobranch=1 \
 	file://0001-meson.build-create-a-pkgconfig-.pc-file.patch \
 "
 S = "${WORKDIR}/git"
-SRCREV = "d5ed9ed758bf0deeb050d861fb08518295a42767"
-PV = "0.0.4"
+SRCREV = "f1b50f0f90604e0f125412932dae9b1e08d57ddc"
+PV = "0.0.3"

 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.7"
+SRCREV = "ba0900a4957b929390ab73827235557959234fea"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release"
+CXXFLAGS:append:arm = " -mfp16-format=ieee"
--- 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/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 = "1a31b18b38715b14d0f3f97039a12e272c71b98a"
+PV = "1.13.15"

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

--- 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.8.2"
+SRCREV = "954b460768c08a147abf47689ad69b0e7beff65e"
+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 = "8678234c163d0b0b616ec9ff6e5e0e1c87e0e6f4"
-PV = "1.4"
+SRCREV = "61ec53db765c9bffe2869d870e0d9e29e36bb37e"
+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 = "936d36287324163b958c6ea0c4297c7a607ee18c"
+PV = "45.0"

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

--- 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 gi-docgen 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_git.bb
+++ b/recipes-gtk/gtk-layer-shell/gtk-layer-shell_git.bb
@ -20,8 +20,8 @@ SRC_URI = " \
 "

 S = "${WORKDIR}/git"
-PV = "0.8.2"
-SRCREV = "91e5ef02b557f93337bcc11ffe8c0a251aa9ab52"
+PV = "0.8.1"
+SRCREV = "0ed957ce262c1063a011b16b59cda5c5de4b3b47"

 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
@ -20,8 +20,8 @@ SRC_URI = " \
 "

 S = "${WORKDIR}/git"
-PV = "1.0.2"
-SRCREV = "a689a399d37d174f2e93442e3adc931a9d8dee90"
+PV = "1.0.1"
+SRCREV = "98c693d0a7ea74620e3cec1115bbc66d33d8b843"

 inherit meson pkgconfig features_check gobject-introspection vala

--- 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/nwg-shell/azote_git.bb
+++ b/recipes-gtk/nwg-shell/azote_git.bb
@ -25,8 +25,8 @@ RDEPENDS:${PN} = " \
 inherit setuptools3

 S = "${WORKDIR}/git"
-PV = "1.12.7"
-SRCREV = "73a3cf3cbf3ea059e605c6f5f8f5c25a8e734170"
+PV = "1.12.3"
+SRCREV = "4952f35141eddf5c64693b2faf25a76a485372bb"

 do_configure:prepend() {
 	[ -d ${S}/dist ] && mv ${S}/dist ${S}/distrib
--- a/recipes-gtk/nwg-shell/nwg-bar_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-bar_git.bb
@ -13,12 +13,13 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-bar.git"

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

-PV = "0.1.5"
-SRCREV = "86f75d0856193c1ba1505f6afbc1b73d34c7093a"
+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
@ -17,8 +17,8 @@ RDEPENDS:${PN} = "\
 inherit setuptools3

 S = "${WORKDIR}/git"
-PV = "0.3.16"
-SRCREV = "f785c41bdb2e979efee516b6da2d83f2a3296672"
+PV = "0.3.7"
+SRCREV = "1fa84c1d0ad899f8c7c3154733fdbff228af0d8a"

 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
@ -12,13 +12,12 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-dock-hyprland.git"

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

-PV = "0.1.8"
-SRCREV = "08f399f4baf580274249e42d46e2d788dc28d6a8"
+PV = "0.1.6"
+SRCREV = "dfc3a25492f25daa1891a586ca3abb259debbbbf"

 inherit go go-mod pkgconfig

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

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

 do_compile[network] = "1"
+
+PRIVATE_LIBS:${PN}:append = " libstd.so"
--- a/recipes-gtk/nwg-shell/nwg-dock_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-dock_git.bb
@ -12,13 +12,12 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-dock.git"

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

-PV = "0.3.9"
-SRCREV = "6fdd055eaff282298ea5496d203514b5f99314a0"
+PV = "0.3.7"
+SRCREV = "8a06a482b204740c8635c394ade5ce252bf9b9b6"

 inherit go go-mod pkgconfig

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

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

 do_compile[network] = "1"
+
+PRIVATE_LIBS:${PN}:append = " libstd.so"
--- a/recipes-gtk/nwg-shell/nwg-drawer_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-drawer_git.bb
@ -13,13 +13,12 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-drawer.git"

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

-PV = "0.4.7"
-SRCREV = "0cd48d1631eecb3043ee2c1fed9dfa25ca855375"
+PV = "0.3.9"
+SRCREV = "fd26bb39e8452da9b4482751a8a78f706cb1f883"

 inherit go go-mod pkgconfig

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

 do_install:append() {
 	# remove precompiled x86 binary
@ -28,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.1.8"
-SRCREV = "0d207e17ba6e911a7d1536a9a0a8d5c627511709"
-
-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,6 +1,6 @@
 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"
@ -8,15 +8,13 @@ RDEPENDS:${PN} = "xcur2png go-runtime"
 GO_IMPORT = "github.com/nwg-piotr/nwg-look"

 SRC_URI = "git://${GO_IMPORT};branch=main;protocol=https"
-SRCREV = "88f2639445084bf265ad71dba1c7af507c471762"
-PV = "0.2.7"
+SRCREV = "46502054da8ebbe629858e8eaa6e2d683d00ca79"
+PV = "0.2.3"

 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
@ -29,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
@ -18,13 +18,12 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-menu.git"

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

-PV = "0.1.3"
-SRCREV = "fd8b92ad1ad0c0c7a23fc7a0be942ca0cbe7f7e0"
+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.9.12"
+SRCREV = "d5e25d2b229037519fe18f9d38ccd91f5824bcbf"

--- 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.37"
-SRCREV = "0137ed8f8c999eb72b4dd3db996d25a241e161a8"
+PV = "0.5.18"
+SRCREV = "1a3aa395263dca131a8c65293ca5131efc10109a"

--- 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.2"
+SRCREV = "dfe38ac5af580900f70861f7e7eb8c0074548d09"

 do_install() {
 	install -d ${D}${datadir}/backgrounds/sway
--- 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
@ -7,19 +7,21 @@ REQUIRED_DISTRO_FEATURES = "wayland polkit pam pulseaudio"

 DEPENDS = " \
    callaudiod \
-    evolution-data-server \
    evince \
+    evolution-data-server \
    feedbackd \
    fribidi \
    gcr \
+    git-native \
    glib-2.0 \
    gnome-desktop \
-    gtk+3 \
    gtk4 \
    libadwaita \
    libgudev \
    libhandy \
+    libpam \
    libsecret \
+    libxml2 \
    networkmanager \
    polkit \
    pulseaudio \
@ -30,12 +32,11 @@ DEPENDS = " \
 "

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

 PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false"
@ -52,11 +53,12 @@ inherit features_check gsettings meson pkgconfig gtk-icon-cache

 SRC_URI = " \
    gitsm://gitlab.gnome.org/World/Phosh/phosh.git;protocol=https;nobranch=1 \
+    file://phosh.pam \
 "

 S = "${WORKDIR}/git"
-PV = "0.36.0"
-SRCREV = "62a4ba9d8a38750a49ae6187f3497c54a030be45"
+PV = "0.31.0"
+SRCREV = "8ecfd6831b7e4b610b064e2183e0498141c69939"

 EXTRA_OEMESON += "--buildtype=release"

--- 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-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.6.0"
-SRCREV = "bffc387af79503382584b7c064e164994fbd8cb0"
-
-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.9.0"
+SRCREV = "deaf9a68b7425e0a0945a029bcbac767a7a72ae4"

 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
@ -15,8 +15,8 @@ SRC_URI = " \
 "

 S = "${WORKDIR}/git"
-PV = "0.10.0"
-SRCREV = "cc084f5f86776b3b5b9708a99bed49b991eb48af"
+PV = "0.9.22"
+SRCREV = "e30fba0b8f875c7f35e3173be2b9f6f3ffe3641e"

 DEPENDS += " \
 	date \
@ -27,7 +27,6 @@ DEPENDS += " \
 	libsigc++-3 \
 	libxkbcommon \
 	gtk+3 \
-	gtk-layer-shell \
 	gobject-introspection \
 	spdlog \
 	wayland \
@ -38,10 +37,10 @@ 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"
@ -49,7 +48,6 @@ 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 +58,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 +69,6 @@ PACKAGECONFIG ?= " \
 "

 do_install:append() {
-	install -d ${D}${systemd_user_unitdir}
 	install -m 0644 ${WORKDIR}/waybar.service ${D}${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 setuptools3
-
-S = "${WORKDIR}/git"
-PV = "2.1.1"
-SRCREV = "fda591d59c6ed5a50444c32cd5403260afd2d94b"
-
-FILES:${PN} += "${datadir}"
--- 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.5 \
+	git://codeberg.org/dnkl/fnott.git;protocol=https;branch=release/1.4 \
 "

 DEPENDS = " \
@ -33,8 +33,8 @@ RDEPENDS:${PN} = " \
 inherit meson pkgconfig features_check

 S = "${WORKDIR}/git"
-PV = "1.5.0"
-SRCREV = "e950a0b102bab47b09a40b13bd50a5f565ca7792"
+PV = "1.4.1"
+SRCREV = "627a7b6c3dd696b6ceaee82af9c9eb14f5bd1c88"

 EXTRA_OEMESON += "--buildtype release"

--- a/recipes-support/foot/foot_git.bb
+++ b/recipes-support/foot/foot_git.bb
@ -24,8 +24,8 @@ SRC_URI = " \
 "

 S = "${WORKDIR}/git"
-PV = "1.17.2"
-SRCREV = "b88f0d672f04a835812125ac97ea55240f70de1f"
+PV = "1.15.3"
+SRCREV = "f3146999454b0d28f19f61491bb33f203fe7c53e"

 PACKAGECONFIG[grapheme-clustering] = "-Dgrapheme-clustering=enabled,-Dgrapheme-clustering=disabled,utf8proc"
 PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,scdoc-native"
--- 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.2"
+SRCREV = "f9793b209461278fe7910e00d20115c7b58271ec"

 inherit meson pkgconfig features_check

--- a/recipes-support/grim/grim_git.bb
+++ b/recipes-support/grim/grim_git.bb
@ -21,8 +21,8 @@ DEPENDS += " \
 SRC_URI = "git://git.sr.ht/~emersion/grim;protocol=https;branch=master"

 S = "${WORKDIR}/git"
-PV = "1.4.1"
-SRCREV = "7ba46364ab95141c79e0e18093aa66597256182c"
+PV = "1.4.0"
+SRCREV = "89e02e663fabc534b7e7039514f60a8c5d70070d"

 inherit meson pkgconfig features_check

--- a/recipes-support/hyprland-borderplusplus/hyprland-borders-plus-plus_git.bb
+++ b/recipes-support/hyprland-borderplusplus/hyprland-borders-plus-plus_git.bb
@ -2,7 +2,9 @@ SUMMARY = "Allows you to add one or two additional borders to your windows."
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=e6458723c467506fd0c4aea3be2bcf8a"

-require hyprland-plugins.inc
+SRC_URI = " \
+	git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main \
+"

 DEPENDS = " \
    pixman \
@ -11,6 +13,7 @@ DEPENDS = " \
 "

 S = "${WORKDIR}/git/borders-plus-plus"
+SRCREV = "b378b7baa66e0ba1f7cc5c00505cca252f53f420"

 inherit meson pkgconfig

--- a/recipes-support/hyprland-contrib/hyprland-contrib_git.bb
+++ b/recipes-support/hyprland-contrib/hyprland-contrib_git.bb
@ -7,17 +7,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a0836e8f0d25d383d1195ea44fdd185d"
 SRC_URI = "git://github.com/hyprwm/contrib.git;protocol=https;branch=main"

 S = "${WORKDIR}/git"
-SRCREV = "536f00c5895015da1e7aa85bbee9aa6dcd149e69"
+SRCREV = "bef073cff65917ba2d888aa4dc39bd9868e2b0a4"
 PV = "0.1"

 DEPENDS = "scdoc-native"
-RDEPENDS:${PN} = "bash sed jq libnotify grim slurp wl-clipboard"
+RDEPENDS:${PN} = "bash sed rofi jq libnotify grim slurp wl-clipboard"

 EXTRA_OEMAKE += "DESTDIR=${D} PREFIX=${prefix} BINDIR=${D}${bindir} MANDIR=${D}${datadir}/man MAN1DIR=${D}${datadir}/man1"

 do_install() {
-	for dir in hyprprop hdrop shellevents try_swap_workspace scratchpad grimblast; do
-		cd $dir && oe_runmake && oe_runmake install && cd ${S}
+	for dir in grimblast hyprprop scratchpad shellevents try_swap_workspace; do
+		cd $dir && oe_runmake install && cd ${S}
 	done
 }

--- a/recipes-support/hyprland-csgo-vulkan/hyprland-csgo-vulkan_git.bb
+++ b/recipes-support/hyprland-csgo-vulkan/hyprland-csgo-vulkan_git.bb
@ -2,7 +2,9 @@ SUMMARY = "Fix for CS:GO with -vulkan."
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=e6458723c467506fd0c4aea3be2bcf8a"

-require hyprland-plugins.inc
+SRC_URI = " \
+	git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main \
+"

 DEPENDS = " \
    pixman \
@ -11,6 +13,7 @@ DEPENDS = " \
 "

 S = "${WORKDIR}/git/csgo-vulkan-fix"
+SRCREV = "b378b7baa66e0ba1f7cc5c00505cca252f53f420"

 inherit meson pkgconfig

--- a/recipes-support/hyprland-hyprbars/hyprland-hyprbars_git.bb
+++ b/recipes-support/hyprland-hyprbars/hyprland-hyprbars_git.bb
@ -2,18 +2,18 @@ SUMMARY = "Adds simple title bars to windows."
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=e6458723c467506fd0c4aea3be2bcf8a"

-require hyprland-plugins.inc
+SRC_URI = " \
+	git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main \
+"

 DEPENDS = " \
-    libinput \
-    udev \
    pixman \
    libdrm \
    hyprland \
-    wayland-native \
 "

 S = "${WORKDIR}/git/hyprbars"
+SRCREV = "b378b7baa66e0ba1f7cc5c00505cca252f53f420"

 inherit meson pkgconfig

--- a/recipes-support/hyprland/hyprcursor_git.bb
+++ b/recipes-support/hyprland/hyprcursor_git.bb
@ -1,15 +0,0 @@
-SUMMARY = "The hyprland cursor format, library and utilities."
-HOMEPAGE = "https://github.com/hyprwm/hyprcursor"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
-
-SRC_URI = "git://github.com/hyprwm/hyprcursor.git;protocol=https;branch=main"
-
-DEPENDS = "cairo librsvg libzip hyprlang tomlplusplus"
-
-S = "${WORKDIR}/git"
-SRCREV = "6742e9d3e2d2e155f8222ae654f03fd1faa1314e"
-PV = "0.1.7"
-
-inherit cmake pkgconfig
--- a/recipes-support/hyprland/hypridle_git.bb
+++ b/recipes-support/hyprland/hypridle_git.bb
@ -1,17 +0,0 @@
-SUMMARY = "Hyprland's idle daemon"
-HOMEPAGE = "https:/github.com/hyprwm/hypridle"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
-
-SRC_URI = "git://github.com/hyprwm/hypridle.git;protocol=https;branch=main"
-
-DEPENDS = "wayland wayland-native wayland-protocols hyprlang sdbus-c++-1"
-
-S = "${WORKDIR}/git"
-SRCREV = "7cff4581a3753154fc5b41f39a098fad49b777b1"
-PV = "0.1.2"
-
-inherit cmake pkgconfig
-
-FILES:${PN} += "${systemd_user_unitdir}"
--- a/recipes-support/hyprland/hyprland-hyprtrails.bb
+++ b/recipes-support/hyprland/hyprland-hyprtrails.bb
@ -1,18 +0,0 @@
-SUMMARY = "A neat, but useless plugin to add trails behind windows."
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=e6458723c467506fd0c4aea3be2bcf8a"
-
-require hyprland-plugins.inc
-
-DEPENDS = " \
-    pixman \
-    libdrm \
-    hyprland \
-"
-
-S = "${WORKDIR}/git/hyprtrails"
-
-inherit meson pkgconfig
-
-FILES:${PN} += "${libdir}/libhyprtrails.so"
-FILES:${PN}-dev = ""
--- a/recipes-support/hyprland/hyprland-hyprwinwrap.bb
+++ b/recipes-support/hyprland/hyprland-hyprwinwrap.bb
@ -1,18 +0,0 @@
-SUMMARY = "Clone of xwinwrap for hyprland."
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=e6458723c467506fd0c4aea3be2bcf8a"
-
-require hyprland-plugins.inc
-
-DEPENDS = " \
-    pixman \
-    libdrm \
-    hyprland \
-"
-
-S = "${WORKDIR}/git/hyprwinwrap"
-
-inherit meson pkgconfig
-
-FILES:${PN} += "${libdir}/libhyprwinwrap.so"
-FILES:${PN}-dev = ""
--- a/recipes-support/hyprland/hyprland-plugins.inc
+++ b/recipes-support/hyprland/hyprland-plugins.inc
@ -1,2 +0,0 @@
-SRC_URI = "git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main"
-SRCREV = "4334510363a8420f17d88505d13405d5126eabf0"
--- a/recipes-support/hyprland/hyprlang_git.bb
+++ b/recipes-support/hyprland/hyprlang_git.bb
@ -1,13 +0,0 @@
-SUMMARY = "The hypr configuration language is an extremely efficient, yet easy to work with, configuration language for linux applications."
-HOMEPAGE = "https:/github.com/hyprwm/hyprlang"
-LICENSE = "GPL-3.0-only"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b5b6bed06dd8ed68f00c26d0b4cede89"
-
-SRC_URI = "git://github.com/hyprwm/hyprlang.git;protocol=https;branch=main"
-
-S = "${WORKDIR}/git"
-SRCREV = "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2"
-PV = "0.5.0"
-
-inherit cmake
--- a/recipes-support/hyprland/hyprlock_git.bb
+++ b/recipes-support/hyprland/hyprlock_git.bb
@ -1,22 +0,0 @@
-SUMMARY = "Hyprland's simple, yet multi-threaded and GPU-accelerated screen locking utility"
-HOMEPAGE = "https:/github.com/hyprwm/hyprlock"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
-
-SRC_URI = "git://github.com/hyprwm/hyprlock.git;protocol=https;branch=main"
-
-REQUIRED_DISTRO_FEATURES = "opengl"
-
-DEPENDS = "wayland wayland-native wayland-protocols hyprlang libxkbcommon cairo pango libdrm  libpam virtual/libgl virtual/egl"
-
-S = "${WORKDIR}/git"
-SRCREV = "bc87adf9ec997090f15d9b662d6ca2f86e25f264"
-PV = "0.3.0"
-
-inherit cmake pkgconfig features_check
-
-do_install() {
-	install -Dm755 ${B}/hyprlock ${D}${bindir}/hyprlock
-	install -Dm644 ${S}/pam/hyprlock ${D}${sysconfdir}/pam.d/hyprlock
-}
--- a/recipes-support/hyprpaper/hyprpaper_git.bb
+++ b/recipes-support/hyprpaper/hyprpaper_git.bb
@ -5,21 +5,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=936078e4e67b0e1e1bd1e862d4ffbc25"

 SRC_URI = "git://github.com/hyprwm/hyprpaper.git;protocol=https;branch=main"

-PV = "0.6.0"
-SRCREV = "1013a80608891f120184aa7c1a7cfde04bfc96fb"
+PV = "0.4.0"
+SRCREV = "e498c438b1e16dcf32ecb3030b20b83f7ed9ff6d"
 S = "${WORKDIR}/git"

 DEPENDS += " \
 	cairo \
 	file \
 	fribidi \
-	hyprlang \
 	jpeg \
-	libwebp \
 	libxdmcp \
 	pango \
 	pcre \
-	pcre2 \
 	util-linux \
 	wayland \
 	wayland-native \
@ -27,8 +24,6 @@ DEPENDS += " \
 	wlroots \
 "

-RDEPENDS:${PN} = "hyprlang"
-
 REQUIRED_DISTRO_FEATURES = "wayland"

 EXTRA_OEMAKE = " \
--- a/recipes-support/hyprpicker/hyprpicker_git.bb
+++ b/recipes-support/hyprpicker/hyprpicker_git.bb
@ -5,16 +5,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=936078e4e67b0e1e1bd1e862d4ffbc25"

 SRC_URI = "git://github.com/hyprwm/hyprpicker.git;protocol=https;branch=main"

-PV = "0.2.0"
+PV = "0.1.1"
 S = "${WORKDIR}/git"
-SRCREV = "0eb49192a5cdd5e6e8e6c2c82c33857d78d6cd56"
+SRCREV = "deaca6a4d8e307d90b1f5b1033a8ea6c83b9b260"

 DEPENDS = " \
 	cairo \
 	fribidi \
 	jpeg \
 	libxdmcp \
-	libxkbcommon \
 	pango \
 	pcre \
 	util-linux \
@ -28,12 +27,22 @@ RDEPENDS:${PN} = "wl-clipboard"

 REQUIRED_DISTRO_FEATURES = "wayland"

-EXTRA_OEMAKE = "-DCMAKE_BUILD_TYPE:STRING=Release"
+EXTRA_OEMAKE = "\
+    WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \
+    WAYLAND_PROTOCOLS=${STAGING_DATADIR}/wayland-protocols \
+"
+
+do_configure:prepend() {
+    sed -i -e '$ainstall(TARGETS hyprpicker)' ${S}/CMakeLists.txt
+}
+
+do_compile:prepend() {
+    cd ${S} && oe_runmake protocols
+}

 do_install() {
-    install -d ${D}${bindir} ${D}${datadir}/man/man1
-    install -m755 ${B}/hyprpicker ${D}${bindir}
-    install -m644 ${S}/doc/hyprpicker.1 ${D}${datadir}/man/man1
+    install -d ${D}${bindir}
+    install -m0755 ${B}/hyprpicker ${D}${bindir}
 }

 inherit cmake pkgconfig features_check
--- a/recipes-support/mako/mako_git.bb
+++ b/recipes-support/mako/mako_git.bb
@ -39,8 +39,8 @@ PACKAGECONFIG ?= " \
 "

 S = "${WORKDIR}/git"
-PV = "1.8.0"
-SRCREV = "b25d38f53b4f17830111f6ea82c5985e3f3d796a"
+PV = "1.7.1"
+SRCREV = "51ad133d3e9ebca27e7af25f86dcbf67b7f25f11"

 EXTRA_OEMESON += "--buildtype release"

--- a/recipes-support/playerctl/playerctl_git.bb
+++ b/recipes-support/playerctl/playerctl_git.bb
@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"

 SRC_URI = "git://github.com/altdesktop/playerctl.git;protocol=https;branch=master"

-DEPENDS = "glib-2.0"
 RDEPENDS:${PN} = "glib-2.0"

 inherit meson pkgconfig gobject-introspection
--- a/recipes-support/rofi/rofi_git.bb
+++ b/recipes-support/rofi/rofi_git.bb
@ -0,0 +1,29 @@
+SUMMARY = "A window switcher, Application launcher and dmenu replacement"
+HOMEPAGE = "https://github.com/davatorium/rofi"
+SECTION = "graphics"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=782be4e4ace584538170389380b2d61e"
+
+DEPENDS = " \
+	bison-native \
+	glib-2.0 \
+	cairo \
+	pango \
+	libxkbcommon \
+	gdk-pixbuf \
+	xcb-util \
+	xcb-util-wm \
+	xcb-util-cursor \
+	startup-notification \
+"
+
+SRC_URI = "gitsm://github.com/davatorium/rofi.git;protocol=https;branch=next"
+
+S = "${WORKDIR}/git"
+PV = "1.7.5"
+SRCREV = "9963df114bc2de0d452a4751d8b250118ca6b20a"
+
+inherit meson pkgconfig
+
+FILES:${PN} += "${datadir}"
--- a/recipes-support/slurp/slurp_git.bb
+++ b/recipes-support/slurp/slurp_git.bb
@ -21,8 +21,8 @@ DEPENDS += " \
 SRC_URI = "git://github.com/emersion/slurp.git;protocol=https;branch=master"

 S = "${WORKDIR}/git"
-PV = "1.5.0"
-SRCREV = "fc921b603ee02afff42aba9eb073e82fab900048"
+PV = "1.4.2"
+SRCREV = "2d0a2d9fada99a5c4c556632f04e4301b3bd5d0e"

 inherit meson pkgconfig features_check

--- a/recipes-support/squeekboard/squeekboard_1.17.1.bb
+++ b/recipes-support/squeekboard/squeekboard_1.17.1.bb
@ -136,7 +136,7 @@ S = "${WORKDIR}/git"
 inherit cargo meson rust pkgconfig

 EXTRA_OEMESON = "\
-    -Dcargo-flags=[\'--target\',\'${RUST_HOST_SYS}\',\'-v\'] \
+    -Dcargo-flags=[\'--target\',\'${HOST_SYS}\',\'-v\'] \
    -Dtests=false \
    -Ddepdatadir=${datadir} \
    -Donline=true \
--- a/recipes-support/squeekboard/squeekboard_git.bb
+++ b/recipes-support/squeekboard/squeekboard_git.bb
@ -260,7 +260,7 @@ S = "${WORKDIR}/git"
 inherit cargo meson rust pkgconfig

 EXTRA_OEMESON = "\
-    -Dcargo-flags=[\'--target\',\'${RUST_HOST_SYS}\',\'-v\'] \
+    -Dcargo-flags=[\'--target\',\'${HOST_SYS}\',\'-v\'] \
    -Dtests=false \
    -Ddepdatadir=${datadir} \
    -Donline=false \
--- a/recipes-support/swaybg/swaybg_git.bb
+++ b/recipes-support/swaybg/swaybg_git.bb
@ -16,13 +16,20 @@ DEPENDS = " \
            wayland-protocols \
 "

-SRC_URI = "git://github.com/swaywm/swaybg.git;protocol=https;branch=master"
+SRC_URI = " \
+	git://github.com/swaywm/swaybg.git;protocol=https;branch=master \
+"
+
+# Reproducibility issue. Fix me!
+CFLAGS:append = " -Wno-error=date-time"

 S = "${WORKDIR}/git"
 PV = "1.2.0"
-SRCREV = "eabc06e7eb9e5cb08c8177f49753dedc505076b4"
+SRCREV = "0e645c4583436692c7ac3983e36b87a3ea325454"

 inherit meson pkgconfig features_check

 EXTRA_OEMESON += "--buildtype release"

+BBCLASSEXTEND = ""
+
--- a/recipes-support/wl-clipboard/wl-clipboard_git.bb
+++ b/recipes-support/wl-clipboard/wl-clipboard_git.bb
@ -18,8 +18,8 @@ DEPENDS += " \
 SRC_URI = "git://github.com/bugaevc/wl-clipboard.git;protocol=https;branch=master"

 S = "${WORKDIR}/git"
-PV = "2.2.1"
-SRCREV = "3eb912c274042cd5deed6b478b39908a12f37498"
+PV = "2.1.0"
+SRCREV = "89cd9f9e430a6cd8b82fa65a9c05e530e2430ffd"

 inherit meson pkgconfig features_check

--- a/recipes-support/wlr-randr/wlr-randr_git.bb
+++ b/recipes-support/wlr-randr/wlr-randr_git.bb
@ -20,5 +20,5 @@ DEPENDS = " \
 inherit meson pkgconfig features_check

 S = "${WORKDIR}/git"
-PV = "0.4.1"
-SRCREV = "2277ca73f03cf2970cb8f5c47e8c58315ba00efa"
+PV = "0.3.0"
+SRCREV = "027cf087b882951eef249b794be31adf0a33b5f8"
--- a/recipes-support/wlsunset/wlsunset_git.bb
+++ b/recipes-support/wlsunset/wlsunset_git.bb
@ -20,8 +20,8 @@ PACKAGECONFIG[man-pages] = ",,scdoc-native"


 S = "${WORKDIR}/git"
-PV = "0.3.0"
-SRCREV = "b6cfe1761df05352c0ca7c3706476d5272d9521f"
+PV = "0.2.0"
+SRCREV = "2e7d793bb6b0e21319940d476ca27242f60e3cd6"

 inherit meson pkgconfig features_check

--- a/recipes-support/wob/wob_git.bb
+++ b/recipes-support/wob/wob_git.bb
@ -26,8 +26,8 @@ PACKAGECONFIG[man-pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-nativ
 PACKAGECONFIG ??= ""

 S = "${WORKDIR}/git"
-PV = "0.15.1"
-SRCREV = "c3db849397039ba0cf55acd05568d73db17fbf5b"
+PV = "0.14.2"
+SRCREV = "19318a308033ee5ea626ba61068af408392a6251"

 EXTRA_OEMESON += "--buildtype release"

--- a/recipes-support/yambar/yambar_git.bb
+++ b/recipes-support/yambar/yambar_git.bb
@ -26,11 +26,11 @@ RRECOMMENDS:${PN} += "font-awesome-otf"
 inherit meson pkgconfig

 S = "${WORKDIR}/git"
-PV = "1.11.0"
-SRCREV = "a2d30b96fbb026621ec11692272f0117f35a00fd"
+PV = "1.10.0"
+SRCREV = "9a111a52f5312fe2bd7d9dbd5326d52895a165ee"

 PACKAGECONFIG[wayland] = "-Dbackend-wayland=enabled,-Dbackend-wayland=disabled,wayland wayland-native wayland-protocols"
-PACKAGECONFIG[x11] = "-Dbackend-x11=enabled -Dplugin-xkb=enabled,-Dbackend-x11=disabled -Dplugin-xkb=disabled,xcb-util xcb-util-cursor xcb-util-wm libxcb"
+PACKAGECONFIG[x11] = "-Dbackend-x11=enabled -Dplugin-x11-xkb=enabled,-Dbackend-x11=disabled -Dplugin-x11-xkb=disabled,xcb-util xcb-util-cursor xcb-util-wm libxcb"
 PACKAGECONFIG[mpd] = "-Dplugin-mpd=enabled,-Dplugin-mpd=disabled,libmpdclient"
 PACKAGECONFIG[shared-plugins] = "-Dcore-plugins-as-shared-libraries=true,-Dcore-plugins-as-shared-libraries=false"
 PACKAGECONFIG[alsa] = "-Dplugin-alsa=enabled,-Dplugin-alsa=disabled,alsa-lib"
--- a/recipes-wlroots/cage/cage-0.1.5.bb
+++ b/recipes-wlroots/cage/cage-0.1.5.bb
@ -1,25 +0,0 @@
-SUMMARY = "Cage: a Wayland kiosk"
-HOMEPAGE = "https://www.hjdskes.nl/projects/cage/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3d06ce025701c9a0b391f15902ce8ed"
-
-DEPENDS = " \
-    wayland-native \
-    wayland \
-    wayland-protocols \
-    wlroots-0.16 \
-    pixman \
-    libxkbcommon \
-"
-
-inherit meson pkgconfig features_check
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-SRC_URI = "git://github.com/cage-kiosk/cage;branch=master;protocol=https"
-SRCREV = "83ffc574be860527814c595756a558c228a3475d"
-S = "${WORKDIR}/git"
-PV = "0.1.5"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xwayland', d)}"
-PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xserver-xorg,xwayland"
--- a/recipes-wlroots/cage/cage_git.bb
+++ b/recipes-wlroots/cage/cage_git.bb
@ -7,7 +7,7 @@ DEPENDS = " \
    wayland-native \
    wayland \
    wayland-protocols \
-    wlroots-0.17 \
+    wlroots-0.16 \
    pixman \
    libxkbcommon \
 "
@ -17,9 +17,9 @@ inherit meson pkgconfig features_check
 REQUIRED_DISTRO_FEATURES = "wayland"

 SRC_URI = "git://github.com/cage-kiosk/cage;branch=master;protocol=https"
-SRCREV = "9d43282fa0cd5925a6f9304f0218fd79ae9fcd94"
-PV = "0.1.5+dev"
+SRCREV = "83ffc574be860527814c595756a558c228a3475d"
+PV = "0.1.5"
 S = "${WORKDIR}/git"

 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xwayland', d)}"
-PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg,xwayland"
+PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xserver-xorg,xwayland"
--- a/recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-fail-if-stb-is-not-found.patch
+++ b/recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-fail-if-stb-is-not-found.patch
@ -1,27 +0,0 @@
-From d09dae4bd9494c03fb85c216fe33c883a7b7f64d Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Mon, 8 Jan 2024 14:00:07 +0100
-Subject: [PATCH] meson.build: dont fail if stb is not found
-
-we have neigher pkconfig nor cmake support
-manually add it to CXXFLAGS
---
- src/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index d3dec0d..da0affe 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -18,7 +18,7 @@ cap_dep = dependency('libcap', required: false)
- epoll_dep = dependency('epoll-shim', required: false)
- glm_dep = dependency('glm')
- sdl_dep = dependency('SDL2')
-stb_dep = dependency('stb')
-+stb_dep = dependency('stb', required: false)
- 
- wlroots_dep = dependency(
-   'wlroots',
-- 
-2.43.0
-
--- a/recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-leak-buildpath.patch
+++ b/recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-leak-buildpath.patch
@ -1,28 +0,0 @@
-From 2c97df6e0940c4b0a9ce30f7c422c579cf44c60c Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Mon, 12 Feb 2024 16:15:33 +0100
-Subject: [PATCH] meson.build: dont leak buildpath
-
-This fixes buildpath in gamescope binary
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 7af6884..e67146a 100644
--- a/meson.build
-+++ b/meson.build
-@@ -62,7 +62,7 @@ endif
- add_project_arguments(
-   '-DHAVE_PIPEWIRE=@0@'.format(pipewire_dep.found().to_int()),
-   '-DHAVE_OPENVR=@0@'.format(openvr_dep.found().to_int()),
-  '-DHWDATA_PNP_IDS="@0@"'.format(hwdata_dep.get_variable('pkgdatadir') / 'pnp.ids'),
-+  '-DHWDATA_PNP_IDS="@0@"'.format(hwdata_dep.get_variable('datadir') / 'hwdata' / 'pnp.ids'),
-   language: 'cpp',
- )
- 
-- 
-2.43.0
-
--- a/recipes-wlroots/gamescope/gamescope_git.bb
+++ b/recipes-wlroots/gamescope/gamescope_git.bb
@ -1,62 +0,0 @@
-SUMMARY = "gamescope: the micro-compositor formerly known as steamcompmgr"
-HOMEPAGE = "https://github.com/ValveSoftware/gamescope"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a0fe8e93fee55f3a3a8cc0681c48448a"
-
-REQUIRED_DISTRO_FEATURES = "x11 wayland"
-
-DEPENDS += " \
-	aom \
-	glm \
-	glslang-native \
-	hwdata \
-	libdisplay-info \
-	libinput \
-	libliftoff \
-	libsdl2 \
-	libdrm \
-	libx11\
-	libxcomposite \
-	libxcursor \
-	libxkbcommon \
-	libxres \
-	libxmu \
-	libxrender \
-	libxtst \
-	seatd \
-	stb \
-	vulkan-headers \
-	wayland \
-	wayland-native \
-	wayland-protocols \
-	xcb-util-wm \
-	xwayland \
-"
-
-RDEPENDS:${PN} = "xwayland hwdata"
-
-CXXFLAGS:append = " -I${STAGING_INCDIR}/stb"
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl pipewire', d)} openvr"
-PACKAGECONFIG[openvr] = "-Denable_openvr_support=true,-Denable_openvr_support=false"
-PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
-PACKAGECONFIG[opengl] = ",,mesa-glut"
-
-
-SRC_URI = " \
-	gitsm://github.com/ValveSoftware/gamescope.git;branch=jupiter-3.5;protocol=https \
-	file://0001-meson.build-dont-leak-buildpath.patch \
-	file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \
-"
-
-SRCREV = "c59b09dbc0c100f604ae603c5f0026c42c62d49c"
-PV = "3.13.16.9"
-
-S = "${WORKDIR}/git"
-
-inherit meson pkgconfig features_check
-
-EXTRA_OEMESON += "--buildtype release"
-
-FILES:${PN} += "${datadir} ${libdir}"
-FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig"
--- a/recipes-wlroots/hyprland/hyprland-0.32.3.bb
+++ b/recipes-wlroots/hyprland/hyprland-0.32.3.bb
@ -1,52 +0,0 @@
-
-SUMMARY = "A Wayland WM"
-HOMEPAGE = "https://hyprland.org/"
-SECTION = "graphics"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a08367f3a4cd5301ba8b88eded36b8fd"
-
-REQUIRED_DISTRO_FEATURES = "wayland opengl"
-
-DEPENDS += " \
-	virtual/egl \
-	cairo \
-	wayland \
-	wayland-native \
-	jq-native \
-	pango \
-	pixman \
-	libdrm \
-	libxkbcommon \
-	libinput \
-	udis86 \
-	wlroots-0.17 \
-"
-
-RRECOMMENDS:${PN} ?= " \
-	foot \
-	jq \
-	grim \
-	slurp \
-	wl-clipboard \
-	hyprland-contrib \
-"
-
-SRC_URI = " \
-	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main \
-	file://meson-build.patch \
-"
-
-SRCREV = "9afdd61adeaf413afbe853dbc5fdf6853c8bde21"
-PV = "0.32.3"
-S = "${WORKDIR}/git"
-
-inherit meson pkgconfig features_check
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd xwayland', d)}"
-
-PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled"
-PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm xcb-util-renderutil xwayland,xwayland"
-PACKAGECONFIG[legacy_renderer] = "-Dlegacy_renderer=enabled,-Dlegacy_renderer=disabled"
-
-FILES:${PN} += "${datadir}"
--- a/recipes-wlroots/hyprland/hyprland-0.32.3/meson-build.patch
+++ b/recipes-wlroots/hyprland/hyprland-0.32.3/meson-build.patch
@ -1,60 +0,0 @@
-From 19e0c04a57bfb3677caf1ac8c22527b066666a95 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Sun, 23 Jul 2023 10:19:54 +0200
-Subject: [PATCH] hyprland: update
-
---
- meson.build     | 17 +----------------
- src/meson.build |  6 +++---
- 2 files changed, 4 insertions(+), 19 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 1d2c7f9f..c5ef4e67 100644
--- a/meson.build
-+++ b/meson.build
-@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
-   add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
- endif
- 
-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
-have_xwlr = wlroots.get_variable('features').get('xwayland')
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
-
-cmake = import('cmake')
-udis = cmake.subproject('udis86')
-udis86 = udis.dependency('libudis86')
-
-if get_option('xwayland').enabled() and not have_xwlr
-	error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support')
-endif
-have_xwayland = xcb_dep.found() and have_xwlr
-
-if not have_xwayland
-+if get_option('xwayland').disabled()
-   add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
- endif
- 
-diff --git a/src/meson.build b/src/meson.build
-index 0af864b9..38723b8c 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -9,16 +9,16 @@ executable('Hyprland', src,
-     server_protos,
-     dependency('wayland-server'),
-     dependency('wayland-client'),
-    wlroots.get_variable('wlroots'),
-+    dependency('wlroots'),
-     dependency('cairo'),
-     dependency('libdrm'),
-     dependency('egl'),
-     dependency('xkbcommon'),
-     dependency('libinput'),
-    xcb_dep,
-+    dependency('xcb', required: get_option('xwayland')),
-     backtrace_dep,
-     systemd_dep,
-    udis86,
-+    dependency('udis86'),
- 
-     dependency('pixman-1'),
-     dependency('gl', 'opengl'),
--- a/recipes-wlroots/hyprland/hyprland-0.38/meson-build.patch
+++ b/recipes-wlroots/hyprland/hyprland-0.38/meson-build.patch
@ -1,71 +0,0 @@
-From 596cf2f2e1cbe68ce5673711d84cbfd576d40db1 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Sun, 23 Jul 2023 10:19:54 +0200
-Subject: [PATCH] hyprland: update
-
---
- meson.build     | 17 +----------------
- src/meson.build |  6 +++---
- 2 files changed, 4 insertions(+), 19 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 81d6e403..04503a3c 100644
--- a/meson.build
-+++ b/meson.build
-@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
-   add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
- endif
- 
-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
-have_xwlr = wlroots.get_variable('features').get('xwayland')
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
-
-cmake = import('cmake')
-udis = cmake.subproject('udis86')
-udis86 = udis.dependency('libudis86')
-
-if get_option('xwayland').enabled() and not have_xwlr
-	error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support')
-endif
-have_xwayland = xcb_dep.found() and have_xwlr
-
-if not have_xwayland
-+if get_option('xwayland').disabled()
-   add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
- endif
- 
-@@ -69,8 +56,6 @@ if get_option('buildtype') == 'debug'
-   add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
- endif
- 
-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
-
- globber = run_command('find', 'src', '-name', '*.h*', check: true)
- headers = globber.stdout().strip().split('\n')
- foreach file : headers
-diff --git a/src/meson.build b/src/meson.build
-index 59771fcf..a77349c4 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -9,7 +9,7 @@ executable('Hyprland', src,
-     server_protos,
-     dependency('wayland-server'),
-     dependency('wayland-client'),
-    wlroots.get_variable('wlroots'),
-+    dependency('wlroots'),
-     dependency('cairo'),
-     dependency('hyprcursor'),
-     dependency('hyprlang', version: '>= 0.3.2'),
-@@ -17,10 +17,10 @@ executable('Hyprland', src,
-     dependency('egl'),
-     dependency('xkbcommon'),
-     dependency('libinput'),
-    xcb_dep,
-+    dependency('xcb', required: get_option('xwayland')),
-     backtrace_dep,
-     systemd_dep,
-    udis86,
-+    dependency('udis86'),
- 
-     dependency('pixman-1'),
-     dependency('gl', 'opengl'),
--- a/recipes-wlroots/hyprland/hyprland-0.38_0.38.1.bb
+++ b/recipes-wlroots/hyprland/hyprland-0.38_0.38.1.bb
@ -1,57 +0,0 @@
-SUMMARY = "A Wayland WM"
-HOMEPAGE = "https://hyprland.org/"
-SECTION = "graphics"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e5285450935e9c47f839569c8cbd4e29"
-
-REQUIRED_DISTRO_FEATURES = "wayland opengl"
-
-DEPENDS += " \
-	cairo \
-	hyprcursor \
-	hyprlang \
-	jq-native \
-	libdrm \
-	libinput \
-	libxkbcommon \
-	pango \
-	pixman \
-	tomlplusplus \
-	udis86 \
-	virtual/egl \
-	wayland \
-	wayland-native \
-	wlroots \
-"
-
-RRECOMMENDS:${PN} ?= " \
-	foot \
-	jq \
-	grim \
-	slurp \
-	wl-clipboard \
-	hyprland-contrib \
-"
-
-SRC_URI = " \
-	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b \
-	file://meson-build.patch \
-"
-
-SRCREV = "360ede79d124ffdeebbe8401f1ac4bc0dbec2c91"
-S = "${WORKDIR}/git"
-
-inherit meson pkgconfig features_check
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd xwayland', d)}"
-
-PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled"
-PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm xcb-util-renderutil xwayland,xwayland"
-PACKAGECONFIG[legacy_renderer] = "-Dlegacy_renderer=enabled,-Dlegacy_renderer=disabled"
-
-do_configure:prepend() {
-	cd ${S} && scripts/generateVersion.sh
-}
-
-FILES:${PN} += "${datadir}"
--- a/recipes-wlroots/hyprland/hyprland/meson-build.patch
+++ b/recipes-wlroots/hyprland/hyprland/meson-build.patch
@ -1,4 +1,4 @@
-From 596cf2f2e1cbe68ce5673711d84cbfd576d40db1 Mon Sep 17 00:00:00 2001
+From 19e0c04a57bfb3677caf1ac8c22527b066666a95 Mon Sep 17 00:00:00 2001
 From: Markus Volk <f_l_k@t-online.de>
 Date: Sun, 23 Jul 2023 10:19:54 +0200
 Subject: [PATCH] hyprland: update
@ -9,7 +9,7 @@ Subject: [PATCH] hyprland: update
 2 files changed, 4 insertions(+), 19 deletions(-)

 diff --git a/meson.build b/meson.build
-index 81d6e403..04503a3c 100644
+index 1d2c7f9f..c5ef4e67 100644
 --- a/meson.build
 +++ b/meson.build
@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
@ -34,29 +34,18 @@ index 81d6e403..04503a3c 100644
   add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
 endif
 
-@@ -69,8 +56,6 @@ if get_option('buildtype') == 'debug'
-   add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
- endif
- 
-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
-
- globber = run_command('find', 'src', '-name', '*.h*', check: true)
- headers = globber.stdout().strip().split('\n')
- foreach file : headers
 diff --git a/src/meson.build b/src/meson.build
-index 59771fcf..a77349c4 100644
+index 0af864b9..38723b8c 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -9,7 +9,7 @@ executable('Hyprland', src,
+@@ -9,16 +9,16 @@ executable('Hyprland', src,
     server_protos,
     dependency('wayland-server'),
     dependency('wayland-client'),
 -    wlroots.get_variable('wlroots'),
 +    dependency('wlroots'),
     dependency('cairo'),
-     dependency('hyprcursor'),
-     dependency('hyprlang', version: '>= 0.3.2'),
-@@ -17,10 +17,10 @@ executable('Hyprland', src,
+     dependency('libdrm'),
     dependency('egl'),
     dependency('xkbcommon'),
     dependency('libinput'),
@ -69,3 +58,4 @@ index 59771fcf..a77349c4 100644
 
     dependency('pixman-1'),
     dependency('gl', 'opengl'),
+
--- a/recipes-wlroots/hyprland/hyprland_git.bb
+++ b/recipes-wlroots/hyprland/hyprland_git.bb
@ -1,27 +1,25 @@
+
 SUMMARY = "A Wayland WM"
 HOMEPAGE = "https://hyprland.org/"
 SECTION = "graphics"
 LICENSE = "BSD-3-Clause"

-LIC_FILES_CHKSUM = "file://LICENSE;md5=e5285450935e9c47f839569c8cbd4e29"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a08367f3a4cd5301ba8b88eded36b8fd"

 REQUIRED_DISTRO_FEATURES = "wayland opengl"

 DEPENDS += " \
-	cairo \
-	hyprcursor \
-	hyprlang \
-	jq-native \
-	libdrm \
-	libinput \
-	libxkbcommon \
-	pango \
-	pixman \
-	tomlplusplus \
-	udis86 \
 	virtual/egl \
+	cairo \
 	wayland \
 	wayland-native \
+	jq-native \
+	pango \
+	pixman \
+	libdrm \
+	libxkbcommon \
+	libinput \
+	udis86 \
 	wlroots \
 "

@ -32,6 +30,7 @@ RRECOMMENDS:${PN} ?= " \
 	slurp \
 	wl-clipboard \
 	hyprland-contrib \
+	hyprland-csgo-vulkan \
 "

 SRC_URI = " \
@ -39,21 +38,16 @@ SRC_URI = " \
 	file://meson-build.patch \
 "

-SRCREV = "3875679755014997776e091ff8903acfb311dd2f"
-PV = "0.38.0"
+SRCREV = "9afdd61adeaf413afbe853dbc5fdf6853c8bde21"
+PV = "0.32.3"
 S = "${WORKDIR}/git"

 inherit meson pkgconfig features_check

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

-PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled"
+PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
 PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm xcb-util-renderutil xwayland,xwayland"
-PACKAGECONFIG[legacy_renderer] = "-Dlegacy_renderer=enabled,-Dlegacy_renderer=disabled"
-
-do_configure:prepend() {
-	cd ${S} && scripts/generateVersion.sh
-}
+PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang-native"

 FILES:${PN} += "${datadir}"
-
--- a/recipes-wlroots/labwc/labwc-menu-generator_git.bb
+++ b/recipes-wlroots/labwc/labwc-menu-generator_git.bb
@ -1,16 +0,0 @@
-
-SUMMARY = "labwc-menu-generator - Independent of Desktop Environments and associated menu-packages"
-HOMEPAGE = "https://github.com/labwc/labwc-menu-generator"
-SECTION = "graphics"
-LICENSE = "GPL-2.0-only"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRC_URI = "git://github.com/labwc/labwc-menu-generator.git;protocol=https;branch=master"
-
-SRCREV = "7b62ce9c25db9ee21c9f93e536615569378bcb20"
-S = "${WORKDIR}/git"
-
-DEPENDS = "glib-2.0"
-
-inherit meson pkgconfig
--- a/recipes-wlroots/labwc/labwc-tweaks_git.bb
+++ b/recipes-wlroots/labwc/labwc-tweaks_git.bb
@ -16,7 +16,7 @@ DEPENDS += " \

 SRC_URI = "git://github.com/labwc/labwc-tweaks.git;protocol=https;branch=master"

-SRCREV = "1604f64cc62e4800ee04a6e1c323a48ee8140d83"
+SRCREV = "e64cad5c2bd0e0d37d8aabb26682dae909d6c5d2"
 S = "${WORKDIR}/git"

 inherit meson pkgconfig features_check
--- a/recipes-wlroots/labwc/labwc_git.bb
+++ b/recipes-wlroots/labwc/labwc_git.bb
@ -19,7 +19,7 @@ DEPENDS += " \
 	libdrm \
 	libxkbcommon \
 	libinput \
-	wlroots-0.17 \
+	wlroots-0.16 \
 "

 RRECOMMENDS:${PN} ?= " \
@ -27,15 +27,14 @@ RRECOMMENDS:${PN} ?= " \
 	grim \
 	slurp \
 	wl-clipboard \
-	labwc-menu-generator \
 	labwc-tweaks \
 	swaybg \
 "

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

-SRCREV = "59014e507175971e84af2b846b6b3a2c232cce7f"
-PV = "0.7.1"
+SRCREV = "48e0b3f6a6bc7a60d8414f5f366a9d7bc3f1c42e"
+PV = "0.6.5"
 S = "${WORKDIR}/git"

 inherit meson pkgconfig features_check gettext
--- a/recipes-wlroots/phoc/phoc/0001-meson.build-dont-build-subprojects.patch
+++ b/recipes-wlroots/phoc/phoc/0001-meson.build-dont-build-subprojects.patch
@ -29,6 +29,16 @@ index 77b8971..e5b0908 100644
 
 embed_wlroots = get_option('embed-wlroots')
 
+@@ -66,7 +60,7 @@ endif
+ if not embed_wlroots.disabled() and wlroots_proj.found()
+         wlroots = wlroots_proj.get_variable('wlroots')
+ else
+-        wlroots = dependency('wlroots', version: '>= 0.16.0')
+        wlroots = dependency('wlroots', version: '>= 0.16.2')
+ endif
+ wlroots_has_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland',
+                                             internal: 'have_xwayland') == 'true'
+
 -- 
 2.41.0

--- a/recipes-wlroots/phoc/phoc_git.bb
+++ b/recipes-wlroots/phoc/phoc_git.bb
@ -2,9 +2,9 @@
 SUMMARY = "wlroots based Phone compositor as used on the Librem5."
 HOMEPAGE = "https://gitlab.gnome.org/World/Phosh/phoc"
 SECTION = "graphics"
-LICENSE = "GPL-3.0-or-later"
+LICENSE = "GPL-3.0-only"

-LIC_FILES_CHKSUM = "file://LICENSES/GPL-3.0-or-later.txt;md5=d32239bcb673463ab874e80d47fae504"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

 REQUIRED_DISTRO_FEATURES = "wayland"

@ -20,17 +20,19 @@ DEPENDS += " \
 	wayland \
 	wayland-native \
 	wayland-protocols \
-	wlroots-0.17 \
+	wlroots-0.16 \
 "

+RDEPENDS:${PN} = "mutter"
+
 SRC_URI = " \
 	git://gitlab.gnome.org/World/Phosh/phoc.git;protocol=https;nobranch=1 \
 	file://0001-meson.build-dont-build-subprojects.patch \
 "

 S = "${WORKDIR}/git"
-PV = "0.36.0"
-SRCREV = "70bbce162e4736a43a4e7bf5fad308e476a4b340"
+PV = "0.31.0"
+SRCREV = "980df632ba0a23794ebc421a4a09c7b81cca5e01"

 inherit features_check gsettings meson pkgconfig

--- a/recipes-wlroots/sway/sway-1.8.bb
+++ b/recipes-wlroots/sway/sway-1.8.bb
@ -73,4 +73,8 @@ do_install:append() {
 	install -m 755 ${S}/contrib/inactive-windows-transparency.py ${D}${bindir}
 }

-FILES:${PN} += "${datadir}"
+FILES:${PN}:append = " \
+	${datadir} \
+"
+
+BBCLASSEXTEND = ""
--- a/recipes-wlroots/sway/sway-1.9.bb
+++ b/recipes-wlroots/sway/sway-1.9.bb
@ -1,65 +0,0 @@
-SUMMARY = "A Wayland WM"
-HOMEPAGE = "https://github.com/swaywm/sway"
-BUGTRACKER = "https://github.com/swaywm/sway/issues"
-SECTION = "graphics"
-LICENSE = "MIT"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dfc67e5b1fa10ebb4b70eb0c0ca67bea"
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-DEPENDS += " \
-	wlroots-0.17 \
-	cairo \
-	libevdev \
-	json-c \
-	libdrm \
-	libinput \
-	libxkbcommon \
-	pango \
-	pcre2 \
-	pixman \
-	virtual/libgles2 \
-	wayland \
-	wayland-native \
-	wayland-protocols \
-"
-
-RDEPENDS:${PN} = "swaybg python3 python-i3ipc"
-
-RRECOMMENDS:${PN} ?= " \
-	foot \
-	jq \
-	grim \
-	slurp \
-	wl-clipboard \
-	sway-contrib \
-"
-
-SRC_URI = "git://github.com/swaywm/sway.git;protocol=https;branch=v1.9"
-
-SRCREV = "1a3cfc50c15124c2be18c025e609112ee15de4aa"
-PV = "1.9"
-S = "${WORKDIR}/git"
-
-inherit meson pkgconfig features_check
-
-PACKAGECONFIG[basu] = "-Dsd-bus-provider=basu,,basu"
-PACKAGECONFIG[default-wallpaper] = "-Ddefault-wallpaper=true,-Ddefault-wallpaper=false"
-PACKAGECONFIG[elogind] = "-Dsd-bus-provider=libelogind,,elogind"
-PACKAGECONFIG[gdk-pixbuf] = "-Dgdk-pixbuf=enabled,-Dgdk-pixbuf=disabled,gdk-pixbuf"
-PACKAGECONFIG[swaybar] = "-Dswaybar=true,-Dswaybar=false"
-PACKAGECONFIG[swaynag] = "-Dswaynag=true,-Dswaynag=false"
-PACKAGECONFIG[systemd] = "-Dsd-bus-provider=libsystemd,,systemd"
-PACKAGECONFIG[tray] = "-Dtray=enabled,-Dtray=disabled"
-PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm"
-
-PACKAGECONFIG ?= " \
-	${@bb.utils.filter('DISTRO_FEATURES', 'systemd xwayland', d)} \
-	default-wallpaper \
-	gdk-pixbuf \
-"
-
-EXTRA_OEMESON += "--buildtype release"
-
-FILES:${PN} += "${datadir}"
--- a/recipes-wlroots/sway/sway_git.bb
+++ b/recipes-wlroots/sway/sway_git.bb
@ -37,10 +37,10 @@ RRECOMMENDS:${PN} ?= " \
 	sway-contrib \
 "

-SRC_URI = "git://github.com/swaywm/sway.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/swaywm/sway.git;protocol=https;branch=v1.9"

-SRCREV = "2b08e79061db583d0ffe46114c48f958a0d3e6ed"
-PV = "1.10-dev"
+SRCREV = "2bba8a861885d770d1cd081ec22567e4de5e991a"
+PV = "1.9-dev"
 S = "${WORKDIR}/git"

 inherit meson pkgconfig features_check
@ -63,4 +63,8 @@ PACKAGECONFIG ?= " \

 EXTRA_OEMESON += "--buildtype release"

-FILES:${PN} += "${datadir}"
+FILES:${PN}:append = " \
+	${datadir} \
+"
+
+BBCLASSEXTEND = ""
--- a/recipes-wlroots/wayfire/wayfire_git.bb
+++ b/recipes-wlroots/wayfire/wayfire_git.bb
@ -38,30 +38,26 @@ RRECOMMENDS:${PN} += " \

 PACKAGECONFIG[gles32] = "-Denable_gles32=true,-Denable_gles32=false"
 PACKAGECONFIG[use_system_wfconfig] = "-Duse_system_wfconfig=enabled,-Duse_system_wfconfig=disabled,wf-config"
-PACKAGECONFIG[use_system_wlroots] = "-Duse_system_wlroots=enabled,-Duse_system_wlroots=disabled,wlroots-0.17"
+PACKAGECONFIG[use_system_wlroots] = "-Duse_system_wlroots=enabled,-Duse_system_wlroots=disabled,wlroots-0.16"
 PACKAGECONFIG[x11] = "-Dxwayland=enabled,-Dxwayland=disabled,xwayland xcb-util-renderutil xcb-util-wm"
 PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang-native"

 PACKAGECONFIG ?= " \
 	${@bb.utils.filter('DISTRO_FEATURES', 'vulkan x11', d)} \
 	gles32 \
-	use_system_wlroots \
 "

 SRC_URI = "gitsm://github.com/WayfireWM/wayfire.git;protocol=https;nobranch=1"

-SRCREV = "01726528ace8ed71216f23c3b0fb3344cda5a461"
-PV = "0.8.1"
+SRCREV = "e33bf48eca87fbcf24081d2ca2494fadc80ac3de"
+PV = "0.7.5"
 S = "${WORKDIR}/git"

 inherit meson pkgconfig features_check

 EXTRA_OEMESON += "--buildtype release"

-do_install:append() {
-	rm -rf ${D}${prefix}/man
-}
+FILES:${PN} += "${datadir}"

-FILES:${PN} += "${datadir} ${libdir}"
-FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/libwlroots.so ${libdir}/libwf-utils.so ${libdir}/libwf-config.so"
+BBCLASSEXTEND = ""

--- a/recipes-wlroots/wayfire/wcm_git.bb
+++ b/recipes-wlroots/wayfire/wcm_git.bb
@ -4,7 +4,7 @@ BUGTRACKER = "https://github.com/WayfireWM/wcm/issues"
 SECTION = "graphics"
 LICENSE = "MIT"

-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=553c79c4d7ca30085e1d7bfea724a8aa"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=ccb736ab917abd09ce6915fbf9a0f887"
 DEPENDS = " \
 	wayfire \
 	wayland \
@ -17,9 +17,9 @@ DEPENDS = " \
 REQUIRED_DISTRO_FEATURES = "wayland"

 SRC_URI = "gitsm://github.com/WayfireWM/wcm.git;protocol=https;nobranch=1"
-SRCREV = "fb9dd5746c077f60a34ff1f70d7ef3f70e5a59b5"
+SRCREV = "4dff0dfdd840429054b3c1cc10fbf6702227dea9"
 S = "${WORKDIR}/git"
-PV = "0.8.0"
+PV = "0.7.5"

 inherit meson pkgconfig features_check

--- a/recipes-wlroots/wayfire/wf-config_git.bb
+++ b/recipes-wlroots/wayfire/wf-config_git.bb
@ -15,8 +15,8 @@ DEPENDS = " \
 REQUIRED_DISTRO_FEATURES = "wayland"

 SRC_URI = "git://github.com/WayfireWM/wf-config.git;protocol=https;branch=master"
-SRCREV = "aba330e7e22bbbeb5147af6e2cb0f30fb840cdd8"
-PV = "0.8.1"
+SRCREV = "999653b2fedb7a969b2ebfd748747e4806afe1cb"
+PV = "0.7.1"

 S = "${WORKDIR}/git"

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ludovic Jozeau	d7cbcfb9eb	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:10:54 +02:00
Markus Volk	702a586260	python3: move python link to python3-core package fixes: https://codeberg.org/flk/meta-wayland/issues/13	2025-04-22 14:53:02 +02:00
Markus Volk	5913c0b933	sway: update	2024-01-21 16:09:41 +01:00
Markus Volk	c943ed7233	hyprland: update	2024-01-21 16:09:04 +01:00
Markus Volk	71ca5a4501	update hyprland-plugins	2024-01-21 16:08:19 +01:00
Markus Volk	624266e7ae	wlroots: update to 0.17 release	2024-01-21 16:07:35 +01:00
flk	dc7d83c665	Correct Hyprland recipe when Systemd is disabled	2024-01-04 17:32:09 +01:00
Markus Volk	5d166d5a99	xdg-desktop-portal-hyprland: Update	2023-10-13 17:51:52 +02:00
skandigraun	2357a8521f	squeekboard: add missing crate checksums	2023-10-13 17:19:08 +02:00
Markus Volk	a8b6adefb9	hyprland: Add backport patch to fix desktop portals	2023-10-02 19:03:05 +02:00
Markus Volk	2bf2dbb1fa	layer.conf: -> nanbield	2023-09-30 15:37:04 +02:00