Merge pull request 'squeekboard: set correct rust target' (#17) from gyorgysarvari/meta-wayland:scarthgap into scarthgap

Reviewed-on: https://codeberg.org/flk/meta-wayland/pulls/17

conf/layer.conf

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

dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb

@@ -3,10 +3,7 @@ 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 \
-	file://0001-ScreencopyShared.hpp-drop-define-SPA_VERSION_POD_BUI.patch \
-"
+SRC_URI:append = " file://0001-meson.build-Dont-build-hyprland-share-picker-with-me.patch"
 
 require xdg-desktop-portal-hyprland.inc
 

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 = "24be4a26f0706e456fca1b61b8c79f7486a9e86d"
-PV = "1.3.2"
+SRCREV = "15fd76cb6ebb0e3c3b2c3a3daf452e7b781c6e8a"
+PV = "1.3.1"

dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland/0001-ScreencopyShared.hpp-drop-define-SPA_VERSION_POD_BUI.patch

@@ -1,33 +0,0 @@
-From f181899034beb4311c8e63056ce73d00df6981c8 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Sun, 30 Jun 2024 15:10:05 +0200
-Subject: [PATCH] ScreencopyShared.hpp: drop #define
- SPA_VERSION_POD_BUILDER_CALLBACKS
-
-This is defined in pipewire
-
-Fixes build with pipewire 1.2.0
-| ../git/src/portals/../core/../portals/../shared/ScreencopyShared.hpp:9:43: error: expected primary-expression before '.' token
-|     9 | #define SPA_VERSION_POD_BUILDER_CALLBACKS .version = 0
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- src/shared/ScreencopyShared.hpp | 4 +---
- 1 file changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/src/shared/ScreencopyShared.hpp b/src/shared/ScreencopyShared.hpp
-index d626da6..e3b0a94 100644
---- a/src/shared/ScreencopyShared.hpp
-+++ b/src/shared/ScreencopyShared.hpp
-@@ -5,8 +5,6 @@
- extern "C" {
- #include <spa/pod/builder.h>
- 
--#undef SPA_VERSION_POD_BUILDER_CALLBACKS
--#define SPA_VERSION_POD_BUILDER_CALLBACKS .version = 0
- #include <spa/buffer/meta.h>
- #include <spa/utils/result.h>
- #include <spa/param/props.h>
--- 
-2.45.1
-

recipes-devtools/python/python3_%.bbappend

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

recipes-devtools/stb/stb_git.bb

@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fb994481c55623ef338885280e676f3b"
 
 SRC_URI = "git://github.com/nothings/stb.git;protocol=https;branch=master"
-SRCREV = "013ac3beddff3dbffafd5177e7972067cd2b5083"
+SRCREV = "f4a71b13373436a2866c5d68f8f80ac6f0bc1ffe"
 S = "${WORKDIR}/git"
 
 do_install() {

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 = "31207c0ca44ed846763dc6df55316ee7a7d047a8"
 

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.3.0"
-SRCREV = "bf6928e47d6fc940986c06428e87a2eb95249ae0"
+PV = "0.2.1"
+SRCREV = "1104cef50acb0b18a0d545e6a09773e3feb42e5b"
 
 EXTRA_OEMESON += "-Dtests=false"
 

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.5.2"
-SRCREV = "c0f460dca7f7688761120415ff3c9cf7f73119be"
+PV = "6.4.0"
+SRCREV = "0698449d50f2b95517562295a59d414afc68b369"
 
 
 do_install () {

recipes-extended/gmobile/gmobile/0001-meson.build-create-a-pkgconfig-.pc-file.patch

@@ -0,0 +1,53 @@
+From a9c5d3add6550e27636de3ef86d6eb8bad41874d Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 15 Aug 2023 07:36:31 +0200
+Subject: [PATCH] meson.build: add a pkgconfig .pc file
+
+ - fix version
+ - build shared lib and install
+ - install headers
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ meson.build | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e9f6c62..7e94496 100644
+--- a/meson.build
++++ b/meson.build
+@@ -99,3 +99,7 @@ summary({
+   bool_yn: true,
+   section: 'Build',
+ )
++
++install_headers('src/gmobile.h' , 'src/gm-cutout.h',  'src/gm-device-info.h',  'src/gm-device-tree.h',  'src/gm-display-panel.h',  'src/gm-error.h',  'src/gm-main.h',  'src/gm-timeout.h', 'src/gm-rect.h')
++pkg = import('pkgconfig')
++pkg.generate(gm_lib)
+diff --git a/src/meson.build b/src/meson.build
+index ee98a39..8d8fd7d 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -37,12 +37,15 @@ gm_c_args = [
+   '-DG_LOG_DOMAIN="gmobile"',
+ ]
+ 
+-gm_lib = static_library(
++gm_lib = shared_library(
+   'gmobile',
+   gm_sources,
+   include_directories: root_inc,
+   c_args: gm_c_args,
+-  dependencies: gm_deps)
++  dependencies: gm_deps,
++  version: meson.project_version(),
++  install: true,
++)
+ 
+ gmobile_dep = declare_dependency(
+   include_directories: [root_inc, include_directories('.')],
+-- 
+2.41.0
+

recipes-extended/gmobile/gmobile_git.bb

@@ -1,15 +1,18 @@
 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"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://src/gm-cutout.c;beginline=1;endline=5;md5=fdd1e77039fe571c0c9aa6280a7e7903"
 
-inherit meson pkgconfig gobject-introspection
+inherit meson pkgconfig
 
 DEPENDS = "glib-2.0 json-glib"
 
-SRC_URI = "git://gitlab.gnome.org/World/Phosh/gmobile.git;protocol=https;branch=main"
+SRC_URI = " \
+	git://gitlab.gnome.org/World/Phosh/gmobile.git;protocol=https;branch=main \
+	file://0001-meson.build-create-a-pkgconfig-.pc-file.patch \
+"
 S = "${WORKDIR}/git"
-SRCREV = "3f3a8c70f6106e00388075c77982876857b321d8"
-PV = "0.2.0"
+SRCREV = "d5ed9ed758bf0deeb050d861fb08518295a42767"
+PV = "0.0.4"
 
 do_install:append() {
 	install -m 0644 ${B}/gm-config.h ${D}${includedir}

recipes-extended/libdbusmenu/libdbusmenu-glib_git.bb

@@ -3,14 +3,13 @@ HOMEPAGE = "https://github.com/AyatanaIndicators/libdbusmenu"
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 
-SRC_URI = "git://github.com/AyatanaIndicators/libdbusmenu.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/JetBrains/libdbusmenu.git;protocol=https;branch=master"
 
-DEPENDS = "glib-2.0 json-glib dbus  intltool-native"
+DEPENDS = "glib-2.0 json-glib dbus intltool-native libxslt-native"
 
 S = "${WORKDIR}/git"
 PV = "16.0.4"
-SRCREV = "4d03141aea4e2ad0f04ab73cf1d4f4bcc4a19f6c"
-
+SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
 EXTRA_OECONF += "--disable-dumper --disable-gtk --disable-gtk-doc"
 
 CFLAGS += "-Wno-error"

recipes-extended/libdbusmenu/libdbusmenu-gtk_git.bb

@@ -3,13 +3,14 @@ HOMEPAGE = "https://github.com/AyatanaIndicators/libdbusmenu"
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 
-DEPENDS = "glib-2.0 json-glib dbus gtk+ gtk+3 libdbusmenu-glib intltool-native"
+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"
 
-SRC_URI = "git://github.com/AyatanaIndicators/libdbusmenu.git;protocol=https;branch=master"
 S = "${WORKDIR}/git"
 PV = "16.0.4"
-SRCREV = "4d03141aea4e2ad0f04ab73cf1d4f4bcc4a19f6c"
+SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
 
 EXTRA_OECONF += "--disable-dumper --disable-gtk-doc"
 

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

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

recipes-extended/sofia-sip/sofia-sip_git .bb

@@ -17,5 +17,3 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF += "--with-glib"
 
-CFLAGS += "-Wno-incompatible-pointer-types"
-

recipes-extended/udis86/udis86_git.bb

@@ -0,0 +1,21 @@
+SUMMARY = "Udis86 is a disassembler for the x86 and x86-64 class of instruction set architectures"
+HOMEPAGE = "https://github.com/vmt/udis86"
+SECTION = "libs"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ab079829a9e47b6d81dab3bf5da3f638"
+
+SRC_URI = "git://github.com/canihavesomecoffee/udis86.git;protocol=https;branch=master"
+
+S = "${WORKDIR}/git"
+PV = "1.7.2"
+SRCREV = "5336633af70f3917760a6d441ff02d93477b0c86"
+
+inherit autotools-brokensep  pkgconfig python3native
+
+EXTRA_OECONF += "--enable-shared"
+
+do_configure:prepend() {
+	cd ${S} && ./autogen.sh
+}
+
+

recipes-extended/xcur2png/xcur2png/0001-fix-wrong-math.patch

@@ -1,27 +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>
----
- 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;
-   }
- 

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

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);

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"

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])))];

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

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);
- }
- 
- 

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"

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

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;

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

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

recipes-gtk/nwg-shell/azote_git.bb

@@ -25,8 +25,8 @@ RDEPENDS:${PN} = " \
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "1.12.9"
-SRCREV = "20849501ee5fecc701d4bdfdbce6d6a320737a7d"
+PV = "1.12.7"
+SRCREV = "73a3cf3cbf3ea059e605c6f5f8f5c25a8e734170"
 
 do_configure:prepend() {
 	[ -d ${S}/dist ] && mv ${S}/dist ${S}/distrib

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
 }

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"
+SRC_URI = "git://${GO_IMPORT};branch=main;protocol=https"
 PV = "0.1.5"
 SRCREV = "60e4f83b6c4d84955e0a07f7bdc63d8089b4ba1e"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
 
 inherit go go-mod
 
 GO_INSTALL = "${GO_IMPORT}"
-GO_LINKSHARED = ""
 
 do_compile[network] = "1"
 

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

@@ -11,12 +11,10 @@ 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}"
 
 inherit go go-mod pkgconfig
 

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

@@ -17,8 +17,8 @@ RDEPENDS:${PN} = "\
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "0.3.19"
-SRCREV = "74e907f1a8e9cb2f8e649d7439da11e00c249856"
+PV = "0.3.16"
+SRCREV = "f785c41bdb2e979efee516b6da2d83f2a3296672"
 
 do_install:append() {
 	install -d ${D}${datadir}/pixmaps ${D}${datadir}/applications

recipes-gtk/nwg-shell/nwg-dock-hyprland_git.bb

@@ -10,12 +10,10 @@ 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"
+SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
 
-PV = "0.1.9"
-SRCREV = "d4cd7439ebfb29238674b94deb120695dd1425f1"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+PV = "0.1.8"
+SRCREV = "08f399f4baf580274249e42d46e2d788dc28d6a8"
 
 inherit go go-mod pkgconfig
 
@@ -26,27 +24,9 @@ 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 -d ${D}${datadir}/nwg-dock-hyprland
 	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}"

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

@@ -10,12 +10,10 @@ 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.3.9"
 SRCREV = "6fdd055eaff282298ea5496d203514b5f99314a0"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 

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

@@ -11,12 +11,10 @@ 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}"
 
 inherit go go-mod pkgconfig
 

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

@@ -16,8 +16,8 @@ RRECOMMENDS:${PN} = "gnome-themes-extra"
 inherit setuptools3 useradd
 
 S = "${WORKDIR}/git"
-PV = "0.2.0"
-SRCREV = "aa6a9e4a9024dba8ebaa98af53df82b3c19d379a"
+PV = "0.1.8"
+SRCREV = "0d207e17ba6e911a7d1536a9a0a8d5c627511709"
 
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM:${PN} = "--system  --no-create-home --shell /bin/bash greeter"

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

@@ -7,11 +7,9 @@ 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"
+SRC_URI = "git://${GO_IMPORT};branch=main;protocol=https"
 SRCREV = "88f2639445084bf265ad71dba1c7af507c471762"
 PV = "0.2.7"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig gtk-icon-cache
 

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

@@ -10,17 +10,16 @@ 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}"
 
 inherit go go-mod pkgconfig
 

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

@@ -17,6 +17,6 @@ RDEPENDS:${PN} = "\
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "0.5.38"
-SRCREV = "2e0710f9540022dc11ea5109677c8a29ebc278eb"
+PV = "0.5.37"
+SRCREV = "0137ed8f8c999eb72b4dd3db996d25a241e161a8"
 

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 \

recipes-gtk/phosh/phosh/0001-meson.build-dont-read-includedir-from-pkg-config.patch

@@ -1,36 +0,0 @@
-From bfd49ad17c115899bdec41f5819fef21f622e620 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 f9107b26..8bddeace 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -343,12 +343,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
- 
- phosh_deps = [
-   libsoup_dep,
--- 
-2.45.1
-

recipes-gtk/phosh/phosh_git.bb

@@ -11,18 +11,18 @@ DEPENDS = " \
     evince \
     feedbackd \
     fribidi \
+    gcr \
     glib-2.0 \
-    gmobile \
     gnome-desktop \
     gtk+3 \
-    gcr3 \
+    gtk4 \
+    libadwaita \
     libgudev \
     libhandy \
     libsecret \
     networkmanager \
     polkit \
     pulseaudio \
-    libsoup-3.0 \
     upower \
     wayland \
     wayland-native \
@@ -52,14 +52,17 @@ inherit features_check gsettings meson pkgconfig gtk-icon-cache
 
 SRC_URI = " \
     gitsm://gitlab.gnome.org/World/Phosh/phosh.git;protocol=https;nobranch=1 \
-    file://0001-meson.build-dont-read-includedir-from-pkg-config.patch \
 "
 
 S = "${WORKDIR}/git"
-PV = "0.39.0"
-SRCREV = "e1e263efc239870e81c2e4d013bf0615f260141f"
+PV = "0.36.0"
+SRCREV = "62a4ba9d8a38750a49ae6187f3497c54a030be45"
 
 EXTRA_OEMESON += "--buildtype=release"
 
+do_install:append() {
+    install -Dm 644 ${WORKDIR}/phosh.pam ${D}${sysconfdir}/pam.d/phosh
+}
+
 FILES:${PN} += "${datadir} ${libdir}"
 

recipes-gtk/waybar/waybar_git.bb

@@ -15,8 +15,8 @@ SRC_URI = " \
 "
 
 S = "${WORKDIR}/git"
-PV = "0.10.3"
-SRCREV = "e627879b1656ec7352e6382f80ee16d90b377aaf"
+PV = "0.10.0"
+SRCREV = "cc084f5f86776b3b5b9708a99bed49b991eb48af"
 
 DEPENDS += " \
 	date \
@@ -70,7 +70,8 @@ PACKAGECONFIG ?= " \
 "
 
 do_install:append() {
-	install -m 0644 ${UNPACKDIR}/waybar.service ${D}${systemd_user_unitdir}
+	install -d ${D}${systemd_user_unitdir}
+	install -m 0644 ${WORKDIR}/waybar.service ${D}${systemd_user_unitdir}
 }
 
 FILES:${PN} += "${systemd_user_unitdir}"

recipes-gtk/waypaper/waypaper_git.bb

@@ -9,7 +9,7 @@ RDEPENDS:${PN} = "python3-pygobject python3-importlib-metadata python3-platformd
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "2.2"
-SRCREV = "bbdca8a4d96208c748af7307fbcf3d61e46bc64e"
+PV = "2.1.1"
+SRCREV = "fda591d59c6ed5a50444c32cd5403260afd2d94b"
 
 FILES:${PN} += "${datadir}"

recipes-support/hyprland/aquamarine_git.bb

@@ -1,27 +0,0 @@
-SUMMARY = "Aquamarine is a very light linux rendering backend library"
-HOMEPAGE = "https:/github.com/hyprwm/aquamarine"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
-
-DEPENDS = " \
-	hyprutils \
-	hyprwayland-scanner-native \
-	libdrm \
-	libdisplay-info \
-	libinput \
-	seatd \
-	pixman \
-	virtual/libgbm \
-	wayland \
-	wayland-native \
-	wayland-protocols \
-"
-
-SRC_URI = "git://github.com/hyprwm/aquamarine.git;protocol=https;branch=main"
-
-S = "${WORKDIR}/git"
-SRCREV = "2e0052a21dc02c3cc2e131dabc2eff1990901b52"
-PV = "0.1.0"
-
-inherit cmake pkgconfig

recipes-support/hyprland/hyprcursor_git.bb

@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/hyprwm/hyprcursor.git;protocol=https;branch=main"
 DEPENDS = "cairo librsvg libzip hyprlang tomlplusplus"
 
 S = "${WORKDIR}/git"
-SRCREV = "57298fc4f13c807e50ada2c986a3114b7fc2e621"
-PV = "0.1.9"
+SRCREV = "6742e9d3e2d2e155f8222ae654f03fd1faa1314e"
+PV = "0.1.7"
 
 inherit cmake pkgconfig

recipes-support/hyprland/hyprland-expo.bb

@@ -1,24 +0,0 @@
-SUMMARY = "A plugin to add expo (overlay) for workspaces."
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=e6458723c467506fd0c4aea3be2bcf8a"
-
-require hyprland-plugins.inc
-
-DEPENDS = " \
-    pixman \
-    libdrm \
-    hyprland \
-    libinput \
-    udev \
-    pango \
-    cairo \
-    wayland-native \
-    libxkbcommon \
-"
-
-S = "${WORKDIR}/git/hyprexpo"
-
-inherit meson pkgconfig
-
-FILES:${PN} += "${libdir}/libhyprexpo.so"
-FILES:${PN}-dev = ""

recipes-support/hyprland/hyprland-plugins.inc

@@ -1,8 +1,2 @@
 SRC_URI = "git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main"
-SRCREV = "3ae670253a5a3ae1e3a3104fb732a8c990a31487"
-
-# Hack to allow patching the plugins
-do_configure:prepend() {
-	rm -rf ${S}/patches
-	rm -rf ${S}/.pc
-}
+SRCREV = "4334510363a8420f17d88505d13405d5126eabf0"

recipes-support/hyprland/hyprlang_git.bb

@@ -4,12 +4,10 @@ LICENSE = "GPL-3.0-only"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b5b6bed06dd8ed68f00c26d0b4cede89"
 
-DEPENDS = "hyprutils"
-
 SRC_URI = "git://github.com/hyprwm/hyprlang.git;protocol=https;branch=main"
 
 S = "${WORKDIR}/git"
-SRCREV = "ec6938c66253429192274d612912649a0cfe4d28"
-PV = "0.5.2"
+SRCREV = "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2"
+PV = "0.5.0"
 
-inherit cmake pkgconfig
+inherit cmake

recipes-support/hyprland/hyprlock_git.bb

@@ -8,25 +8,10 @@ SRC_URI = "git://github.com/hyprwm/hyprlock.git;protocol=https;branch=main"
 
 REQUIRED_DISTRO_FEATURES = "opengl"
 
-DEPENDS = " \
-	cairo \
-	hyprlang \
-	hyprutils \
-	jpeg \
-	libdrm  \
-	libpam \
-	libwebp \
-	libxkbcommon \
-	pango \
-	virtual/egl \
-	virtual/libgl \
-	wayland \
-	wayland-native \
-	wayland-protocols \
-"
+DEPENDS = "wayland wayland-native wayland-protocols hyprlang libxkbcommon cairo pango libdrm  libpam virtual/libgl virtual/egl"
 
 S = "${WORKDIR}/git"
-SRCREV = "c5b8ad03d03ddbd2b0ff8615c2f6dba31374b6a8"
+SRCREV = "bc87adf9ec997090f15d9b662d6ca2f86e25f264"
 PV = "0.3.0"
 
 inherit cmake pkgconfig features_check

recipes-support/hyprland/hyprpaper_git.bb

@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=936078e4e67b0e1e1bd1e862d4ffbc25"
 
 SRC_URI = "git://github.com/hyprwm/hyprpaper.git;protocol=https;branch=main"
 
-PV = "0.7.0"
-SRCREV = "f4abf5902f3f0c51d2aab8a521f7c1b1b08afd64"
+PV = "0.6.0"
+SRCREV = "1013a80608891f120184aa7c1a7cfde04bfc96fb"
 S = "${WORKDIR}/git"
 
 DEPENDS += " \
@@ -15,12 +15,16 @@ DEPENDS += " \
 	fribidi \
 	hyprlang \
 	jpeg \
-	libglvnd \
 	libwebp \
+	libxdmcp \
 	pango \
+	pcre \
+	pcre2 \
+	util-linux \
 	wayland \
 	wayland-native \
 	wayland-protocols \
+	wlroots \
 "
 
 RDEPENDS:${PN} = "hyprlang"

recipes-support/hyprland/hyprpicker_git.bb

@@ -21,7 +21,7 @@ DEPENDS = " \
 	wayland \
 	wayland-native \
 	wayland-protocols \
-	virtual/libgles3 \
+	wlroots \
 "
 
 RDEPENDS:${PN} = "wl-clipboard"

recipes-support/hyprland/hyprutils_git.bb

@@ -1,15 +0,0 @@
-SUMMARY = "Hyprland c++ utils"
-HOMEPAGE = "https:/github.com/hyprwm/hyputils"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
-
-DEPENDS = "pixman"
-
-SRC_URI = "git://github.com/hyprwm/hyprutils.git;protocol=https;branch=main"
-
-S = "${WORKDIR}/git"
-SRCREV = "1f6bbec5954f623ff8d68e567bddcce97cd2f085"
-PV = "0.1.5"
-
-inherit cmake pkgconfig

recipes-support/hyprland/hyprwayland-scanner_git.bb

@@ -1,17 +0,0 @@
-SUMMARY = "A Hyprland implementation of wayland-scanner, in and for C++."
-HOMEPAGE = "https://github.com/hyprwm/hyprwayland-scanner"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
-
-SRC_URI = "git://github.com/hyprwm/hyprwayland-scanner.git;protocol=https;branch=main"
-
-DEPENDS = "pugixml"
-
-S = "${WORKDIR}/git"
-SRCREV = "1413398dcaf702e78a678090c92c26a5fd604ce6"
-PV = "0.3.10"
-
-inherit cmake pkgconfig
-
-BBCLASSEXTEND = "native"

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\',\'${HOST_SYS}\',\'-v\'] \
+    -Dcargo-flags=[\'--target\',\'${RUST_HOST_SYS}\',\'-v\'] \
     -Dtests=false \
     -Ddepdatadir=${datadir} \
     -Donline=true \

recipes-support/squeekboard/squeekboard_git.bb

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

recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-fail-if-stb-is-not-found.patch

@@ -10,18 +10,18 @@ manually add it to CXXFLAGS
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/meson.build b/src/meson.build
-index e0254e6..e6e88bd 100644
+index d3dec0d..da0affe 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -21,7 +21,7 @@ cap_dep = dependency('libcap', required: get_option('rt_cap'))
+@@ -18,7 +18,7 @@ cap_dep = dependency('libcap', required: false)
  epoll_dep = dependency('epoll-shim', required: false)
  glm_dep = dependency('glm')
- sdl2_dep = dependency('SDL2', required: get_option('sdl2_backend'))
+ sdl_dep = dependency('SDL2')
 -stb_dep = dependency('stb')
 +stb_dep = dependency('stb', required: false)
- avif_dep = dependency('libavif', version: '>=1.0.0', required: get_option('avif_screenshots'))
  
  wlroots_dep = dependency(
+   'wlroots',
 -- 
 2.43.0
 

recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-leak-buildpath.patch

@@ -11,18 +11,18 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 04bd472..345a2a7 100644
+index 7af6884..e67146a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -67,7 +67,7 @@ add_project_arguments(
- 
- if hwdata_dep.found()
+@@ -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',
  )
- else
+ 
 -- 
 2.43.0
 

recipes-wlroots/gamescope/gamescope_git.bb

@@ -10,11 +10,11 @@ DEPENDS += " \
 	glm \
 	glslang-native \
 	hwdata \
-	libei \
-	libdecor \
 	libdisplay-info \
-	libdrm \
 	libinput \
+	libliftoff \
+	libsdl2 \
+	libdrm \
 	libx11\
 	libxcomposite \
 	libxcursor \
@@ -23,13 +23,8 @@ DEPENDS += " \
 	libxmu \
 	libxrender \
 	libxtst \
-	libxxf86vm \
-	libxfixes \
-	libxext \
-	libxdamage \
 	seatd \
 	stb \
-	vulkan-loader \
 	vulkan-headers \
 	wayland \
 	wayland-native \
@@ -42,23 +37,20 @@ RDEPENDS:${PN} = "xwayland hwdata"
 
 CXXFLAGS:append = " -I${STAGING_INCDIR}/stb"
 
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pipewire', d)} rt_cap avif_screenshots openvr input_emulation drm_backend"
-PACKAGECONFIG[benchmark] = "-Dbenchmark=enabled,-Dbenchmark=disabled"
-PACKAGECONFIG[input_emulation] = "-Dinput_emulation=enabled,-Dinput_emulation=disabled,libei"
+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[avif_screenshots] = "-Davif_screenshots=enabled,-Davif_screenshots=disabled,libavif"
-PACKAGECONFIG[rt_cap] = "-Drt_cap=enabled,-Drt_cap=disabled,libcap"
-PACKAGECONFIG[sdl2_backend] = "-Dsdl2_backend=enabled,-Dsdl2_backend=disabled,libsdl2"
-PACKAGECONFIG[drm_backend] = "-Ddrm_backend=enabled,-Ddrm_backend=disabled"
+PACKAGECONFIG[opengl] = ",,mesa-glut"
+
 
 SRC_URI = " \
-	gitsm://github.com/ValveSoftware/gamescope.git;branch=master;protocol=https \
-	file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \
+	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 = "3b69847e15c84c0a4f93e82c2eb16b623f9765b9"
-PV = "3.14.22"
+
+SRCREV = "c59b09dbc0c100f604ae603c5f0026c42c62d49c"
+PV = "3.13.16.9"
 
 S = "${WORKDIR}/git"
 
@@ -68,5 +60,3 @@ EXTRA_OEMESON += "--buildtype release"
 
 FILES:${PN} += "${datadir} ${libdir}"
 FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig"
-
-CFLAGS += "-Wno-calloc-transposed-args"

recipes-wlroots/hyprland/hyprland-0.32.3.bb

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

recipes-wlroots/hyprland/hyprland-0.32.3/meson-build.patch

@@ -0,0 +1,60 @@
+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'),

recipes-wlroots/hyprland/hyprland-0.38_0.38.1.bb

@@ -12,19 +12,17 @@ DEPENDS += " \
 	hyprcursor \
 	hyprlang \
 	jq-native \
-	hwdata-native \
-	libdisplay-info \
-	libliftoff \
 	libdrm \
 	libinput \
 	libxkbcommon \
 	pango \
 	pixman \
-	seatd \
 	tomlplusplus \
+	udis86 \
 	virtual/egl \
 	wayland \
 	wayland-native \
+	wlroots \
 "
 
 RRECOMMENDS:${PN} ?= " \
@@ -36,7 +34,10 @@ RRECOMMENDS:${PN} ?= " \
 	hyprland-contrib \
 "
 
-SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b"
+SRC_URI = " \
+	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b \
+	file://meson-build.patch \
+"
 
 SRCREV = "360ede79d124ffdeebbe8401f1ac4bc0dbec2c91"
 S = "${WORKDIR}/git"

recipes-wlroots/hyprland/hyprland/meson-build.patch

@@ -0,0 +1,71 @@
+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'),

recipes-wlroots/hyprland/hyprland_git.bb

@@ -11,24 +11,18 @@ DEPENDS += " \
 	cairo \
 	hyprcursor \
 	hyprlang \
-	hyprutils \
 	jq-native \
-	hwdata-native \
-	libdisplay-info \
-	libliftoff \
 	libdrm \
 	libinput \
 	libxkbcommon \
 	pango \
 	pixman \
-	seatd \
 	tomlplusplus \
-	util-linux-libuuid \
+	udis86 \
 	virtual/egl \
 	wayland \
 	wayland-native \
-	xcb-util-errors \
-	hyprwayland-scanner-native \
+	wlroots \
 "
 
 RRECOMMENDS:${PN} ?= " \
@@ -40,10 +34,13 @@ RRECOMMENDS:${PN} ?= " \
 	hyprland-contrib \
 "
 
-SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main"
+SRC_URI = " \
+	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main \
+	file://meson-build.patch \
+"
 
-SRCREV = "918d8340afd652b011b937d29d5eea0be08467f5"
-PV = "0.41.2"
+SRCREV = "3875679755014997776e091ff8903acfb311dd2f"
+PV = "0.38.0"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check

recipes-wlroots/labwc/labwc-tweaks_git.bb

@@ -14,9 +14,9 @@ DEPENDS += " \
 	gtk+3 \
 "
 
-SRC_URI = "git://github.com/labwc/labwc-tweaks-gtk.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/labwc/labwc-tweaks.git;protocol=https;branch=master"
 
-SRCREV = "67adbedd610a1b44e7ba667ae72a5c9b07105119"
+SRCREV = "1604f64cc62e4800ee04a6e1c323a48ee8140d83"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check

recipes-wlroots/labwc/labwc_git.bb

@@ -28,14 +28,14 @@ RRECOMMENDS:${PN} ?= " \
 	slurp \
 	wl-clipboard \
 	labwc-menu-generator \
-	labwc-tweaks-gtk \
+	labwc-tweaks \
 	swaybg \
 "
 
 SRC_URI = "git://github.com/labwc/labwc.git;protocol=https;branch=master"
 
-SRCREV = "b41af54a1bd7d9270d19de4c9a2b77d882cf3ede"
-PV = "0.7.2"
+SRCREV = "59014e507175971e84af2b846b6b3a2c232cce7f"
+PV = "0.7.1"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check gettext

recipes-wlroots/phoc/phoc/0001-meson.build-dont-build-subprojects.patch

@@ -0,0 +1,34 @@
+From 92e876d5f678228971512045144b0e8b572b9953 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 15 Aug 2023 07:23:23 +0200
+Subject: [PATCH] meson.build: dont build subprojects
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ meson.build | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 77b8971..e5b0908 100644
+--- a/meson.build
++++ b/meson.build
+@@ -40,13 +40,7 @@ wayland_protos = dependency('wayland-protocols', version: '>=1.15')
+ wayland_server = dependency('wayland-server')
+ xkbcommon      = dependency('xkbcommon')
+ math           = cc.find_library('m')
+-gmobile        = subproject('gmobile',
+-                   default_options: [
+-                   'examples=false',
+-                   'gtk_doc=false',
+-                   'tests=false',
+-                 ])
+-gmobile_dep    = gmobile.get_variable('gmobile_dep')
++gmobile_dep    = dependency('gmobile', version: '>= 0.0.3')
+ 
+ embed_wlroots = get_option('embed-wlroots')
+ 
+-- 
+2.41.0
+

recipes-wlroots/phoc/phoc_git.bb

@@ -24,11 +24,13 @@ DEPENDS += " \
 "
 
 SRC_URI = " \
-	git://gitlab.gnome.org/World/Phosh/phoc.git;protocol=https;nobranch=1"
+	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.39.0"
-SRCREV = "3d01448739b7e5605238301e473a063c7955ab21"
+PV = "0.36.0"
+SRCREV = "70bbce162e4736a43a4e7bf5fad308e476a4b340"
 
 inherit features_check gsettings meson pkgconfig
 

recipes-wlroots/sway/sway_git.bb

@@ -39,7 +39,7 @@ RRECOMMENDS:${PN} ?= " \
 
 SRC_URI = "git://github.com/swaywm/sway.git;protocol=https;branch=master"
 
-SRCREV = "40ca4150b27a5b94938b6c3d744f74bb26d347f7"
+SRCREV = "2b08e79061db583d0ffe46114c48f958a0d3e6ed"
 PV = "1.10-dev"
 S = "${WORKDIR}/git"
 
@@ -53,9 +53,10 @@ 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', d)} \
+	${@bb.utils.filter('DISTRO_FEATURES', 'systemd xwayland', d)} \
 	default-wallpaper \
 	gdk-pixbuf \
 "

recipes-wlroots/wlroots/wlroots-0.16.bb

@@ -47,8 +47,6 @@ inherit meson pkgconfig features_check
 
 EXTRA_OEMESON += "--buildtype release"
 
-CFLAGS += "-Wno-calloc-transposed-args"
-
 do_install:append() {
 	install -d ${D}${bindir}
 	install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-0.16

recipes-wlroots/wlroots/wlroots-0.17.bb

@@ -39,9 +39,8 @@ PACKAGECONFIG ?= " \
 "
 
 SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=0.17;protocol=https"
-SRC_URI += "file://backend-drm-add-support-for-libliftoff-v0.5.0.patch"
-SRCREV = "bc73e507abd1e8319353a8601f1f8ebfe17307ee"
-PV = "0.17.3"
+SRCREV = "6dce6ae2ed92544b9758b194618e21f4c97f1d6b"
+PV = "0.17.2"
 
 S = "${WORKDIR}/git"
 

recipes-wlroots/wlroots/wlroots-0.17/backend-drm-add-support-for-libliftoff-v0.5.0.patch

@@ -1,51 +0,0 @@
-From 8b1628adcf530fd5396f62479175e486126efc7c Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Tue, 28 May 2024 00:30:33 +0200
-Subject: [PATCH] backend/drm: add support for libliftoff v0.5.0
-
-Don't require libliftoff 0.5.0 just yet: we want to be able to
-backport this patch.
----
- backend/drm/libliftoff.c | 5 +++++
- backend/drm/meson.build  | 1 +
- 2 files changed, 6 insertions(+)
-
-diff --git a/backend/drm/libliftoff.c b/backend/drm/libliftoff.c
-index a3b61540..12dd8fdb 100644
---- a/backend/drm/libliftoff.c
-+++ b/backend/drm/libliftoff.c
-@@ -7,6 +7,7 @@
- 
- #include "backend/drm/drm.h"
- #include "backend/drm/iface.h"
-+#include "config.h"
- 
- static bool init(struct wlr_drm_backend *drm) {
- 	// TODO: lower log level
-@@ -436,7 +437,11 @@ static bool crtc_commit(struct wlr_drm_connector *conn,
- 		goto out;
- 	}
- 
-+#if HAVE_LIBLIFTOFF_0_5
-+	int ret = liftoff_output_apply(crtc->liftoff, req, flags, NULL);
-+#else
- 	int ret = liftoff_output_apply(crtc->liftoff, req, flags);
-+#endif
- 	if (ret != 0) {
- 		wlr_drm_conn_log(conn, test_only ? WLR_DEBUG : WLR_ERROR,
- 			"liftoff_output_apply failed: %s", strerror(-ret));
-diff --git a/backend/drm/meson.build b/backend/drm/meson.build
-index 5d2f2b1f8c..7c00b0f085 100644
---- a/backend/drm/meson.build
-+++ b/backend/drm/meson.build
-@@ -48,6 +48,7 @@ wlr_files += files(
- 
- if libliftoff.found()
- 	wlr_files += files('libliftoff.c')
-+	internal_config.set10('HAVE_LIBLIFTOFF_0_5', libliftoff.version().version_compare('>=0.5.0'))
- endif
- 
- features += { 'drm-backend': true }
--- 
-GitLab
-

recipes-wlroots/wlroots/wlroots_git.bb

@@ -15,6 +15,7 @@ DEPENDS += " \
 	hwdata-native \
 	libdisplay-info \
 	libdrm \
+	libliftoff \
 	libxkbcommon \
 	pixman \
 	seatd \
@@ -26,7 +27,6 @@ DEPENDS += " \
 PACKAGECONFIG[opengl] = ",,virtual/egl virtual/libgles2"
 PACKAGECONFIG[gbm] = ",,virtual/libgbm"
 PACKAGECONFIG[libinput] = ",,libinput"
-PACKAGECONFIG[libliftoff] = "-Dlibliftoff=enabled,-Dlibliftoff=disabled,libliftoff"
 PACKAGECONFIG[systemd] = ",,systemd"
 PACKAGECONFIG[sysvinit] = ",,eudev elogind"
 PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang-native"
@@ -36,11 +36,10 @@ PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xwayland xcb-u
 PACKAGECONFIG ?= " \
 	${@bb.utils.filter('DISTRO_FEATURES', 'systemd vulkan x11 xwayland opengl', d)} \
 	libinput \
-	libliftoff \
 "
 
 SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=master;protocol=https"
-SRCREV = "385c9ade5f7a8ce9e5c13f762d56e6bd1c8d1b0a"
+SRCREV = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"
 PV = "0.18.0-dev"
 
 S = "${WORKDIR}/git"
@@ -53,6 +52,3 @@ do_install:append() {
 	install -d ${D}${bindir}
 	install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}
 }
-
-FILES:${PN} += "${libdir}/libwlroots-*.so"
-FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig"