summaryrefslogtreecommitdiffstats
path: root/meta-xfce/recipes-xfce
diff options
context:
space:
mode:
Diffstat (limited to 'meta-xfce/recipes-xfce')
-rw-r--r--meta-xfce/recipes-xfce/garcon/garcon_4.21.0.bb (renamed from meta-xfce/recipes-xfce/garcon/garcon_4.20.0.bb)8
-rw-r--r--meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-build-Do-not-display-full-path-in-generated-headers.patch38
-rw-r--r--meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.20.2.bb33
-rw-r--r--meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.21.7.bb31
-rw-r--r--meta-xfce/recipes-xfce/thunar/files/0001-Properly-guard-gdkx.h-include.patch37
-rw-r--r--meta-xfce/recipes-xfce/thunar/thunar_4.21.5.bb (renamed from meta-xfce/recipes-xfce/thunar/thunar_4.20.7.bb)16
-rw-r--r--meta-xfce/recipes-xfce/tumbler/files/0001-Handle-cases-where-there-are-no-plugins-gracefully.patch57
-rw-r--r--meta-xfce/recipes-xfce/tumbler/tumbler_4.21.1.bb (renamed from meta-xfce/recipes-xfce/tumbler/tumbler_4.20.1.bb)25
-rw-r--r--meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.21.0.bb (renamed from meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.20.0.bb)5
-rw-r--r--meta-xfce/recipes-xfce/xfce4-panel/files/0001-build-Do-not-display-full-path-in-generated-headers.patch36
-rw-r--r--meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb (renamed from meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.20.1.bb)21
-rw-r--r--meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-build-Do-not-display-full-path-in-generated-headers.patch36
-rw-r--r--meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.21.1.bb (renamed from meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.20.0.bb)13
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch43
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-Make-gdk-pixbuf-csource-available.patch31
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-hard-code-path-to-iceauth.patch49
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.21.1.bb (renamed from meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.20.3.bb)16
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/files/0001-build-Do-not-display-full-path-in-generated-headers.patch36
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.21.1.bb (renamed from meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.1.bb)17
-rw-r--r--meta-xfce/recipes-xfce/xfconf/xfconf/0001-build-Make-sure-gdbus-headers-are-generated-before-i.patch116
-rw-r--r--meta-xfce/recipes-xfce/xfconf/xfconf_4.21.2.bb (renamed from meta-xfce/recipes-xfce/xfconf/xfconf_4.20.0.bb)12
-rw-r--r--meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb13
-rw-r--r--meta-xfce/recipes-xfce/xfwm4/xfwm4/0001-build-Add-missing-libxfce4util-flags.patch59
-rw-r--r--meta-xfce/recipes-xfce/xfwm4/xfwm4_4.20.0.bb5
24 files changed, 614 insertions, 139 deletions
diff --git a/meta-xfce/recipes-xfce/garcon/garcon_4.20.0.bb b/meta-xfce/recipes-xfce/garcon/garcon_4.21.0.bb
index 5d7282ecbf..06ad0b9fbc 100644
--- a/meta-xfce/recipes-xfce/garcon/garcon_4.20.0.bb
+++ b/meta-xfce/recipes-xfce/garcon/garcon_4.21.0.bb
@@ -5,6 +5,8 @@ LICENSE = "LGPL-2.0-only & GFDL-1.1-no-invariants-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" 5LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b"
6DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" 6DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native"
7 7
8XFCE_COMPRESS_TYPE = "xz"
9
8inherit xfce gtk-doc gobject-introspection features_check 10inherit xfce gtk-doc gobject-introspection features_check
9 11
10# xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. 12# xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
@@ -12,12 +14,16 @@ inherit xfce gtk-doc gobject-introspection features_check
12ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 14ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
13 15
14SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" 16SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch"
15SRC_URI[sha256sum] = "7fb8517c12309ca4ddf8b42c34bc0c315e38ea077b5442bfcc4509415feada8f" 17SRC_URI[sha256sum] = "3acc3f6b81059199f4e6646da7b6ca39edf84ea90dd3ff87088ffca6aa108269"
16 18
17EXTRA_OECONF = "--disable-gtk-doc" 19EXTRA_OECONF = "--disable-gtk-doc"
18 20
19do_compile:prepend() { 21do_compile:prepend() {
20 export GIR_EXTRA_LIBS_PATH="${B}/garcon/.libs" 22 export GIR_EXTRA_LIBS_PATH="${B}/garcon/.libs"
23 # g-ir-scanner needs garcon/garcon-config.h but it's generated in ${B}/garcon/
24 mkdir -p ${B}/garcon/garcon ${B}/garcon-gtk/garcon
25 ln -sf ${B}/garcon/garcon-config.h ${B}/garcon/garcon/
26 ln -sf ${B}/garcon/garcon-config.h ${B}/garcon-gtk/garcon/
21} 27}
22 28
23FILES:${PN} += "${datadir}/desktop-directories" 29FILES:${PN} += "${datadir}/desktop-directories"
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-build-Do-not-display-full-path-in-generated-headers.patch b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-build-Do-not-display-full-path-in-generated-headers.patch
new file mode 100644
index 0000000000..c7ea1e6fe9
--- /dev/null
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-build-Do-not-display-full-path-in-generated-headers.patch
@@ -0,0 +1,38 @@
1From b8bf147d621739a1b8a4d1cc8398d1c90288e9d6 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
3Date: Mon, 16 Mar 2026 16:21:51 +0100
4Subject: [PATCH] build: Do not display full path in generated headers
5
6Fixes: #144
7
8Upstream-Status: Backport [https://gitlab.xfce.org/xfce/libxfce4ui/-/commit/b8bf147d621739a1b8a4d1cc8398d1c90288e9d6]
9
10Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
11---
12 libxfce4ui/meson.build | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/libxfce4ui/meson.build b/libxfce4ui/meson.build
16index 8cac84eb..ca5ac927 100644
17--- a/libxfce4ui/meson.build
18+++ b/libxfce4ui/meson.build
19@@ -102,7 +102,7 @@ libxfce4ui_enums += gnome.mkenums(
20 install_dir: libxfce4ui_install_dir,
21 sources: libxfce4ui_enum_headers,
22 fhead: '#if !defined(_LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined(LIBXFCE4UI_COMPILATION)\n#error "Only <libxfce4ui/libxfce4ui.h> can be included directly, this file is not part of the public API."\n#endif\n\n#ifndef __LIBXFCE4UI_ENUM_TYPES_H__\n#define __LIBXFCE4UI_ENUM_TYPES_H__\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n\n',
23- fprod: '/* enumerations from "@filename@" */\n\n',
24+ fprod: '/* enumerations from "@basename@" */\n\n',
25 vhead: 'GType @enum_name@_get_type(void) G_GNUC_CONST;\n#define XFCE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n\n',
26 ftail: 'G_END_DECLS\n\n#endif /* !__LIBXFCE4UI_ENUM_TYPES_H__ */',
27 )
28@@ -111,7 +111,7 @@ libxfce4ui_enums += gnome.mkenums(
29 install_header: false,
30 sources: libxfce4ui_enum_headers,
31 fhead: '#include "libxfce4ui-enums.h"\n#include "xfce-gtk-extensions.h"\n#include "libxfce4ui-enum-types.h"\n#include "libxfce4ui-visibility.h"\n\n',
32- fprod: '/* enumerations from "@filename@" */\n\n',
33+ fprod: '/* enumerations from "@basename@" */\n\n',
34 vhead: 'GType\n@enum_name@_get_type(void)\n{\n static GType type = 0;\n\n if(!type) {\n static const G@Type@Value values[] = {',
35 vprod: ' { @VALUENAME@, "@VALUENAME@", "@valuenick@" },',
36 vtail: ' { 0, NULL, NULL }\n\t};\n\ttype = g_@type@_register_static("@EnumName@", values);\n }\n\n return type;\n}\n\n',
37--
382.34.1
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.20.2.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.20.2.bb
deleted file mode 100644
index a0be1f6067..0000000000
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.20.2.bb
+++ /dev/null
@@ -1,33 +0,0 @@
1SUMMARY = "Xfce4 Widget library and X Window System interaction"
2HOMEPAGE = "https://docs.xfce.org/xfce/libxfce4ui/start"
3SECTION = "x11/libs"
4LICENSE = "LGPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db"
6DEPENDS = "intltool-native perl-native gtk+3 libxfce4util xfce4-dev-tools xfconf"
7
8inherit xfce gtk-doc gobject-introspection features_check
9
10# xfce4 depends on libwnck3. gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
11# cairo would at least needed to be built with xlib.
12ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
13REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','opengl', "", d)}"
14
15# TODO: Check if 0001-... can go
16SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch"
17SRC_URI[sha256sum] = "5d3d67b1244a10cee0e89b045766c05fe1035f7938f0410ac6a3d8222b5df907"
18
19EXTRA_OECONF += "--with-vendor-info=${DISTRO}"
20EXTRA_OECONF += "--disable-vala"
21
22PACKAGECONFIG ??= " \
23 ${@bb.utils.contains('DISTRO_FEATURES', 'x11','x11', "", d)} \
24"
25PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade"
26PACKAGECONFIG[x11] = "--enable-startup-notification,--disable-startup-notification,libepoxy libice libsm startup-notification"
27
28
29PACKAGES += "${PN}-glade"
30FILES:${PN}-glade = " \
31 ${libdir}/glade \
32 ${datadir}/glade \
33"
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.21.7.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.21.7.bb
new file mode 100644
index 0000000000..9c86da48e6
--- /dev/null
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.21.7.bb
@@ -0,0 +1,31 @@
1SUMMARY = "Xfce4 Widget library and X Window System interaction"
2HOMEPAGE = "https://docs.xfce.org/xfce/libxfce4ui/start"
3SECTION = "x11/libs"
4LICENSE = "LGPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db"
6DEPENDS = "intltool-native perl-native gtk+3 libxfce4util xfce4-dev-tools xfconf gdk-pixbuf"
7
8XFCE_COMPRESS_TYPE = "xz"
9XFCEBASEBUILDCLASS = "meson"
10
11inherit xfce gtk-doc gobject-introspection features_check
12
13# libxfce4ui uses 'gtk-doc' instead of 'docs' for meson option
14GTKDOC_MESON_OPTION = "gtk-doc"
15
16# xfce4 depends on libwnck3. gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
17# cairo would at least needed to be built with xlib.
18ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
19REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','opengl', "", d)}"
20
21# TODO: Check if 0001-... can go
22SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \
23 file://0001-build-Do-not-display-full-path-in-generated-headers.patch \
24 "
25SRC_URI[sha256sum] = "a72a7af39cf183819bcfb61b1747d425261e966ccb172b2fc28f1494f524bd17"
26
27EXTRA_OEMESON = "-Dvala=disabled -Dvendor-info=${DISTRO}"
28
29PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
30PACKAGECONFIG[x11] = "-Dsession-management=enabled -Dstartup-notification=enabled,-Dsession-management=disabled -Dstartup-notification=disabled,libepoxy libice libsm startup-notification"
31PACKAGECONFIG[wayland] = "-Dwayland=enabled, -Dwayland=disabled,"
diff --git a/meta-xfce/recipes-xfce/thunar/files/0001-Properly-guard-gdkx.h-include.patch b/meta-xfce/recipes-xfce/thunar/files/0001-Properly-guard-gdkx.h-include.patch
new file mode 100644
index 0000000000..9d4afc7167
--- /dev/null
+++ b/meta-xfce/recipes-xfce/thunar/files/0001-Properly-guard-gdkx.h-include.patch
@@ -0,0 +1,37 @@
1From dd7fbf4540891053a4083228aac2485e6c469199 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
3Date: Sat, 11 Apr 2026 18:07:05 +0200
4Subject: [PATCH] Properly guard gdkx.h include
5
6Fixes: #1820
7
8Upstream-Status: Backport [https://gitlab.xfce.org/xfce/thunar/-/commit/201f8ca0c3bc7b5e651201526fc3006a130718eb]
9
10Signed-off-by: Changqing Li <changqing.li@windriver.com>
11---
12 thunar/thunar-session-client.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/thunar/thunar-session-client.c b/thunar/thunar-session-client.c
16index c36719c..2832818 100644
17--- a/thunar/thunar-session-client.c
18+++ b/thunar/thunar-session-client.c
19@@ -30,6 +30,7 @@
20
21 #ifdef ENABLE_LIBSM
22 #include <X11/SM/SMlib.h>
23+#include <gdk/gdkx.h>
24 #endif
25
26 #include "thunar/thunar-application.h"
27@@ -38,7 +39,6 @@
28 #include "thunar/thunar-private.h"
29 #include "thunar/thunar-session-client.h"
30
31-#include <gdk/gdkx.h>
32 #include <glib/gstdio.h>
33
34
35--
362.34.1
37
diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.20.7.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.21.5.bb
index a03804496b..d8e9edfc25 100644
--- a/meta-xfce/recipes-xfce/thunar/thunar_4.20.7.bb
+++ b/meta-xfce/recipes-xfce/thunar/thunar_4.21.5.bb
@@ -3,17 +3,21 @@ HOMEPAGE = "https://docs.xfce.org/xfce/thunar/start"
3SECTION = "x11" 3SECTION = "x11"
4LICENSE = "GPL-2.0-or-later" 4LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6DEPENDS = "libxml-parser-perl-native exo gdk-pixbuf libxfce4ui libnotify xfce4-panel udev" 6DEPENDS = "libxml-parser-perl-native libxslt-native docbook-xsl-stylesheets-native exo gdk-pixbuf libxfce4ui libnotify xfce4-panel udev"
7 7
8inherit xfce gobject-introspection features_check mime-xdg perlnative gtk-doc 8XFCE_COMPRESS_TYPE = "xz"
9XFCEBASEBUILDCLASS = "meson"
10GTKDOC_MESON_OPTION = "gtk-doc"
9 11
10REQUIRED_DISTRO_FEATURES = "x11" 12inherit xfce gobject-introspection mime-xdg perlnative gtk-doc
11 13
12SRC_URI[sha256sum] = "e0dfbb732c3d7c9174d1c0216dd6177f1d4e9297e623dbced32efd3f3e8682e5" 14SRC_URI[sha256sum] = "eddbd4bab29c73718734e0bfcf650ceea8b4fcc8cb2cbb0b24fe22b286a2be00"
15
16SRC_URI += "file://0001-Properly-guard-gdkx.h-include.patch"
13 17
14PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" 18PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
15PACKAGECONFIG[pcre] = "--enable-pcre2,--disable-pcre2,libpcre2" 19PACKAGECONFIG[pcre] = "-Dpcre2=enabled,-Dpcre2=disabled,libpcre2"
16PACKAGECONFIG[x11] = ",,libsm startup-notification" 20PACKAGECONFIG[x11] = "-Dx11=enabled -Dsession-management=enabled,-Dx11=disabled,libsm startup-notification virtual/libx11"
17 21
18FILES:${PN} += " \ 22FILES:${PN} += " \
19 ${libdir}/thunarx-3/* \ 23 ${libdir}/thunarx-3/* \
diff --git a/meta-xfce/recipes-xfce/tumbler/files/0001-Handle-cases-where-there-are-no-plugins-gracefully.patch b/meta-xfce/recipes-xfce/tumbler/files/0001-Handle-cases-where-there-are-no-plugins-gracefully.patch
new file mode 100644
index 0000000000..3a3eb2fd64
--- /dev/null
+++ b/meta-xfce/recipes-xfce/tumbler/files/0001-Handle-cases-where-there-are-no-plugins-gracefully.patch
@@ -0,0 +1,57 @@
1From 95244ee0d1f3184e2c2cae9d33095dc03829b10e Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
3Date: Fri, 20 Feb 2026 17:07:56 +0100
4Subject: [PATCH] Handle cases where there are no plugins gracefully
5
6Not sure it makes much sense to allow the cache plugin not to be built,
7but then again, why not? It could be replaced by a customized
8implementation, and it has always been possible not to build it, so we
9might as well leave it as it is.
10
11Fixes: #109
12(cherry picked from commit b4f4db4bfc1a45f0a405c4516e38394a44c90fcf)
13
14Upstream-Status: Backport [https://gitlab.xfce.org/xfce/tumbler/-/commit/95244ee0d1f3184e2c2cae9d33095dc03829b10e]
15
16Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
17---
18 tumbler/tumbler-cache-plugin.c | 5 ++++-
19 tumblerd/tumbler-registry.c | 7 ++++++-
20 2 files changed, 10 insertions(+), 2 deletions(-)
21
22diff --git a/tumbler/tumbler-cache-plugin.c b/tumbler/tumbler-cache-plugin.c
23index 50700a3..e308638 100644
24--- a/tumbler/tumbler-cache-plugin.c
25+++ b/tumbler/tumbler-cache-plugin.c
26@@ -188,7 +188,10 @@ tumbler_cache_plugin_get_default (void)
27 g_object_add_weak_pointer (G_OBJECT (plugin), (gpointer) &plugin);
28
29 if (!g_type_module_use (G_TYPE_MODULE (plugin)))
30- return NULL;
31+ {
32+ g_object_unref (plugin);
33+ return NULL;
34+ }
35 }
36
37 return G_TYPE_MODULE (plugin);
38diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c
39index 705dbc9..b58e831 100644
40--- a/tumblerd/tumbler-registry.c
41+++ b/tumblerd/tumbler-registry.c
42@@ -534,7 +534,12 @@ tumbler_registry_update_supported (TumblerRegistry *registry)
43
44 /* abort if there are no thumbnailers */
45 if (thumbnailers == NULL)
46- return;
47+ {
48+ /* we need NULL-terminated arrays for the _get_supported() dbus call anyway */
49+ registry->uri_schemes = g_new0 (gchar *, 1);
50+ registry->mime_types = g_new0 (gchar *, 1);
51+ return;
52+ }
53
54 /* clear visited flag of all thumbnailers */
55 for (lp = thumbnailers; lp != NULL; lp = lp->next)
56--
572.50.0
diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_4.20.1.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_4.21.1.bb
index 7a01882d57..7ab4b59416 100644
--- a/meta-xfce/recipes-xfce/tumbler/tumbler_4.20.1.bb
+++ b/meta-xfce/recipes-xfce/tumbler/tumbler_4.21.1.bb
@@ -5,23 +5,26 @@ LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6DEPENDS = "xfce4-dev-tools-native libxfce4util" 6DEPENDS = "xfce4-dev-tools-native libxfce4util"
7 7
8XFCE_COMPRESS_TYPE = "xz"
9XFCEBASEBUILDCLASS = "meson"
10GTKDOC_MESON_OPTION = "gtk-doc"
11
8inherit xfce gtk-doc systemd 12inherit xfce gtk-doc systemd
9 13
10SRC_URI[sha256sum] = "87b90df8f30144a292d70889e710c8619d8b8803f0e1db3280a4293367a42eae" 14SRC_URI += " file://0001-Handle-cases-where-there-are-no-plugins-gracefully.patch"
15SRC_URI[sha256sum] = "0f499f79a2a7ee49726a433584dd8a680d514101b72bd1b003360611ce1dc244"
11 16
12INSANE_SKIP:${PN} = "dev-so" 17INSANE_SKIP:${PN} = "dev-so"
13 18
14PACKAGECONFIG ??= "" 19PACKAGECONFIG ??= ""
15PACKAGECONFIG[cover-thumbnailer] = "--enable-cover-thumbnailer,--disable-cover-thumbnailer,curl gdk-pixbuf" 20PACKAGECONFIG[cover-thumbnailer] = "-Dcover-thumbnailer=enabled,-Dcover-thumbnailer=disabled,curl gdk-pixbuf"
16PACKAGECONFIG[desktop-thumbnailer] = "--enable-desktop-thumbnailer,--disable-desktop-thumbnailer,gdk-pixbuf" 21PACKAGECONFIG[desktop-thumbnailer] = "-Ddesktop-thumbnailer=enabled,-Ddesktop-thumbnailer=disabled,gdk-pixbuf"
17PACKAGECONFIG[font-thumbnailer] = "--enable-font-thumbnailer,--disable-font-thumbnailer,freetype gdk-pixbuf" 22PACKAGECONFIG[font-thumbnailer] = "-Dfont-thumbnailer=enabled,-Dfont-thumbnailer=disabled,freetype gdk-pixbuf"
18PACKAGECONFIG[gstreamer-thumbnailer] = "--enable-gstreamer-thumbnailer,--disable-gstreamer-thumbnailer,gstreamer1.0 gstreamer1.0-plugins-base" 23PACKAGECONFIG[gstreamer-thumbnailer] = "-Dgst-thumbnailer=enabled,-Dgst-thumbnailer=disabled,gstreamer1.0 gstreamer1.0-plugins-base"
19PACKAGECONFIG[jpeg-thumbnailer] = "--enable-jpeg-thumbnailer,--disable-jpeg-thumbnailer,gdk-pixbuf" 24PACKAGECONFIG[jpeg-thumbnailer] = "-Djpeg-thumbnailer=enabled,-Djpeg-thumbnailer=disabled,gdk-pixbuf"
20PACKAGECONFIG[odf-thumbnailer] = "--enable-odf-thumbnailer,--disable-odf-thumbnailer,gdk-pixbuf libxml2 libgsf" 25PACKAGECONFIG[odf-thumbnailer] = "-Dodf-thumbnailer=enabled,-Dodf-thumbnailer=disabled,gdk-pixbuf libxml2 libgsf"
21PACKAGECONFIG[pixbuf-thumbnailer] = "--enable-pixbuf-thumbnailer,--disable-pixbuf-thumbnailer,gdk-pixbuf" 26PACKAGECONFIG[pixbuf-thumbnailer] = "-Dpixbuf-thumbnailer=enabled,-Dpixbuf-thumbnailer=disabled,gdk-pixbuf"
22PACKAGECONFIG[poppler-thumbnailer] = "--enable-poppler-thumbnailer,--disable-poppler-thumbnailer,gdk-pixbuf poppler" 27PACKAGECONFIG[poppler-thumbnailer] = "-Dpoppler-thumbnailer=enabled,-Dpoppler-thumbnailer=disabled,gdk-pixbuf poppler"
23
24EXTRA_OECONF = "GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen"
25 28
26do_install:append() { 29do_install:append() {
27 # Makefile seems to race on creation of symlink. So ensure creation here 30 # Makefile seems to race on creation of symlink. So ensure creation here
diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.20.0.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.21.0.bb
index 0e01740e44..4d7a1e2da3 100644
--- a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.20.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.21.0.bb
@@ -5,10 +5,13 @@ LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6DEPENDS = "glib-2.0 gtk+3 libxfce4util libxfce4ui garcon xfconf" 6DEPENDS = "glib-2.0 gtk+3 libxfce4util libxfce4ui garcon xfconf"
7 7
8XFCE_COMPRESS_TYPE = "xz"
9XFCEBASEBUILDCLASS = "meson"
10
8inherit xfce features_check 11inherit xfce features_check
9 12
10REQUIRED_DISTRO_FEATURES = "x11" 13REQUIRED_DISTRO_FEATURES = "x11"
11 14
12SRC_URI[sha256sum] = "82ca82f77dc83e285db45438c2fe31df445148aa986ffebf2faabee4af9e7304" 15SRC_URI[sha256sum] = "e3befc3e73d2315074eb88933f2b042c5b417f4f7f24be9bd4f4508a091037b7"
13 16
14FILES:${PN} += "${datadir}/metainfo" 17FILES:${PN} += "${datadir}/metainfo"
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-build-Do-not-display-full-path-in-generated-headers.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-build-Do-not-display-full-path-in-generated-headers.patch
new file mode 100644
index 0000000000..34ec80b47e
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-build-Do-not-display-full-path-in-generated-headers.patch
@@ -0,0 +1,36 @@
1From 61f40b65637695abe9d9e2f80ca99d3c076c96e8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
3Date: Mon, 16 Mar 2026 16:31:23 +0100
4Subject: [PATCH] build: Do not display full path in generated headers
5
6Upstream-Status: Backport [https://gitlab.xfce.org/xfce/xfce4-panel/-/commit/61f40b65637695abe9d9e2f80ca99d3c076c96e8]
7
8Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
9---
10 libxfce4panel/meson.build | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/libxfce4panel/meson.build b/libxfce4panel/meson.build
14index 38d8ad198..3fee75d58 100644
15--- a/libxfce4panel/meson.build
16+++ b/libxfce4panel/meson.build
17@@ -67,7 +67,7 @@ libpanel_enums += gnome.mkenums(
18 install_dir: libpanel_install_dir,
19 sources: libpanel_headers,
20 fhead: '#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION)\n#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents"\n#endif\n\n#ifndef __LIBXFCE4PANEL_ENUM_TYPES_H__\n#define __LIBXFCE4PANEL_ENUM_TYPES_H__\n#include <glib-object.h>\nG_BEGIN_DECLS\n',
21- fprod: '/* enumerations from "@filename@" */\n',
22+ fprod: '/* enumerations from "@basename@" */\n',
23 vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define XFCE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n',
24 ftail: 'G_END_DECLS\n\n#endif /* !__LIBXFCE4PANEL_ENUM_TYPES_H__ */',
25 )
26@@ -76,7 +76,7 @@ libpanel_enums += gnome.mkenums(
27 install_header: false,
28 sources: libpanel_headers,
29 fhead: '#include "libxfce4panel-enums.h"\n#include "libxfce4panel-enum-types.h"\n\n#include "libxfce4panel-visibility.h"',
30- fprod: '\n/* enumerations from "@filename@" */',
31+ fprod: '\n/* enumerations from "@basename@" */',
32 vhead: 'GType\n@enum_name@_get_type (void)\n{\n\tstatic GType type = 0;\n\tif (type == 0) {\n\tstatic const G@Type@Value values[] = {',
33 vprod: '\t{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },',
34 vtail: '\t{ 0, NULL, NULL }\n\t};\n\ttype = g_@type@_register_static ("@EnumName@", values);\n }\n\treturn type;\n}\n',
35--
362.34.1
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.20.1.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb
index fdfe39014a..00c9352dec 100644
--- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.20.1.bb
+++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb
@@ -3,21 +3,28 @@ HOMEPAGE = "https://docs.xfce.org/xfce/xfce4-panel/start"
3SECTION = "x11" 3SECTION = "x11"
4LICENSE = "GPL-2.0-or-later" 4LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" 5LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee"
6DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxfce4windowing libxml2 \ 6DEPENDS = "garcon exo cairo libxml2 vala-native gtk+3 libxfce4windowing"
7 libwnck3 vala-native \
8 "
9 7
10inherit xfce gtk-doc gobject-introspection features_check mime-xdg 8XFCE_COMPRESS_TYPE = "xz"
9XFCEBASEBUILDCLASS = "meson"
10GTKDOC_MESON_OPTION = "gtk-doc"
11 11
12REQUIRED_DISTRO_FEATURES = "x11" 12inherit xfce gtk-doc gobject-introspection features_check mime-xdg
13 13
14SRC_URI += " \ 14SRC_URI += " \
15 file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ 15 file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \
16 file://0002-use-lxdm-to-replace-dm-tool.patch \ 16 file://0002-use-lxdm-to-replace-dm-tool.patch \
17 file://0001-build-Do-not-display-full-path-in-generated-headers.patch \
17" 18"
18SRC_URI[sha256sum] = "5a7c8097527555640ab3d00307505c7c1b7302d11d92874f88842ea969483519" 19SRC_URI[sha256sum] = "c940dae515bef4af08a126011d2fd873ce99e815157ba8cef5332195bb60e51e"
20
21EXTRA_OEMESON += "-Dvala=disabled"
22
23ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
19 24
20EXTRA_OECONF += "--disable-vala GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen" 25PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
26PACKAGECONFIG[x11] = "-Dx11=enabled, -Dx11=disabled, virtual/libx11 libwnck3 libxext"
27PACKAGECONFIG[wayland] = "-Dwayland=enabled, -Dwayland=disabled, wayland wayland-native wayland-protocols"
21 28
22python populate_packages:prepend() { 29python populate_packages:prepend() {
23 plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') 30 plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/')
diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-build-Do-not-display-full-path-in-generated-headers.patch b/meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-build-Do-not-display-full-path-in-generated-headers.patch
new file mode 100644
index 0000000000..0d3457e404
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-build-Do-not-display-full-path-in-generated-headers.patch
@@ -0,0 +1,36 @@
1From 3f69abae74f4c0ad41c8fa2886148db834ddb9f1 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
3Date: Mon, 16 Mar 2026 16:46:52 +0100
4Subject: [PATCH] build: Do not display full path in generated headers
5
6Upstream-Status: Backport [https://gitlab.xfce.org/xfce/xfce4-power-manager/-/commit/3f69abae74f4c0ad41c8fa2886148db834ddb9f1]
7
8Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
9---
10 common/meson.build | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/common/meson.build b/common/meson.build
14index 7f71309f..cdae226f 100644
15--- a/common/meson.build
16+++ b/common/meson.build
17@@ -37,7 +37,7 @@ common_sources += gnome.mkenums(
18 install_header: false,
19 sources: 'xfpm-enum-glib.h',
20 fhead: '#ifndef _XFPM_ENUM_TYPES_H\n#define _XFPM_ENUM_TYPES_H\n#include <glib-object.h>\nG_BEGIN_DECLS\n',
21- fprod: '/* enumerations from "@filename@" */\n',
22+ fprod: '/* enumerations from "@basename@" */\n',
23 vhead: 'GType @enum_name@_get_type (void);\n#define XFPM_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n',
24 ftail: 'G_END_DECLS\n\n#endif /* _XFPM_ENUM_TYPES_H__ */',
25 )
26@@ -46,7 +46,7 @@ common_sources += gnome.mkenums(
27 install_header: false,
28 sources: 'xfpm-enum-glib.h',
29 fhead: '#include "xfpm-enum-types.h"\n#include "xfpm-enum-glib.h"\n\n',
30- fprod: '\n/* enumerations from "@filename@" */\n',
31+ fprod: '\n/* enumerations from "@basename@" */\n',
32 vhead: 'GType\n@enum_name@_get_type (void)\n{\n\tstatic GType type = 0;\n\tif (type == 0) {\n\tstatic const G@Type@Value values[] = {',
33 vprod: '\t{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },',
34 vtail: '\t{ 0, NULL, NULL }\n\t};\n\ttype = g_@type@_register_static ("@EnumName@", values);\n }\n\treturn type;\n}\n',
35--
362.34.1
diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.20.0.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.21.1.bb
index c6eed849be..65b8f84e27 100644
--- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.20.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.21.1.bb
@@ -11,18 +11,17 @@ REQUIRED_DISTRO_FEATURES = "x11"
11 11
12DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" 12DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver"
13 13
14SRC_URI[sha256sum] = "971391cef63352833bdd92df28957392e17e1f2b3d486c0f57294fd204d6ed29" 14XFCE_COMPRESS_TYPE = "xz"
15XFCEBASEBUILDCLASS = "meson"
15 16
16EXTRA_OECONF = " \ 17SRC_URI += "file://0001-build-Do-not-display-full-path-in-generated-headers.patch"
17 GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen \ 18SRC_URI[sha256sum] = "bb89be7b1be431b29e765e2c632e98fb20a688e495e4ef18495bd70c1524767a"
18 --enable-panel-plugins \
19"
20 19
21PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ 20PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \
22 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ 21 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
23 " 22 "
24PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" 23PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit"
25PACKAGECONFIG[wayland] = "--enable-wayland, --disable-wayland, wayland-native" 24PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native"
26 25
27PACKAGES += "xfce4-powermanager-plugin" 26PACKAGES += "xfce4-powermanager-plugin"
28 27
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch
deleted file mode 100644
index 0e20143f10..0000000000
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From a629b051f4e5462150c77b95574bbc7a33bc9666 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Mon, 31 Dec 2012 16:35:29 +0100
4Subject: [PATCH] configure.ac: hard code path to iceauth
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9workaround AC_PATH_PROG which was meant to find programs required at build-time
10not at run-time.
11
12Upstream-Status: Inappropriate [config]
13
14Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
15
16Rebase for xfce4-session 4.20.0.
17
18Signed-off-by: Kai Kang <kai.kang@windriver.com>
19---
20 configure.ac | 8 +-------
21 1 file changed, 1 insertion(+), 7 deletions(-)
22
23diff --git a/configure.ac b/configure.ac
24index 81b362f..ccde685 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -136,13 +136,7 @@ if test x"$ENABLE_X11" = x"yes"; then
28 AC_CHECK_FUNCS([_IceTransNoListen])
29 LIBS="$ac_LIBS"
30
31- dnl Check for iceauth
32- AC_PATH_PROG([ICEAUTH], [iceauth])
33- if test x"$ICEAUTH" != x""; then
34- AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$ICEAUTH"], [path to iceauth])
35- else
36- AC_MSG_ERROR([iceauth missing, please check your X11 installation])
37- fi
38+ AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$bindir/iceauth"], [path to iceauth])
39
40 dnl Find a location for the session desktop file
41 AC_MSG_CHECKING([what xsession-prefix to use])
42--
431.7.4.4
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-Make-gdk-pixbuf-csource-available.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-Make-gdk-pixbuf-csource-available.patch
new file mode 100644
index 0000000000..6cc77262f7
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-Make-gdk-pixbuf-csource-available.patch
@@ -0,0 +1,31 @@
1From ca9457673128b4024250fe43716c6bbdfad96e96 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Mon, 30 Mar 2026 01:09:33 -0700
4Subject: [PATCH] meson.build: Make gdk-pixbuf-csource available
5
6Fixes:
7 ../sources/xfce4-session-4.21.1/meson.build:50:21: ERROR: Program '/usr/bin/gdk-pixbuf-csource' not found or not executable
8
9Upstream-Status: Inappropriate [oe-specific]
10
11Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
12---
13 meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/meson.build b/meson.build
17index 6f372e0..633a5c5 100644
18--- a/meson.build
19+++ b/meson.build
20@@ -47,7 +47,7 @@ libxfce4util = dependency('libxfce4util-1.0', version: dependency_versions['libx
21 libxfce4windowing = dependency('libxfce4windowing-0', version: dependency_versions['libxfce4windowing'])
22 xfconf = dependency('libxfconf-0', version: dependency_versions['xfce4'])
23
24-gdk_pixbuf_csource = find_program(gdk_pixbuf.get_variable(pkgconfig: 'gdk_pixbuf_csource'), required: true)
25+gdk_pixbuf_csource = find_program('gdk-pixbuf-csource', required: true)
26
27 # Feature: 'x11'
28 x11_deps = []
29--
302.49.0
31
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-hard-code-path-to-iceauth.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-hard-code-path-to-iceauth.patch
new file mode 100644
index 0000000000..0a34f8f039
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-hard-code-path-to-iceauth.patch
@@ -0,0 +1,49 @@
1From d3561f125e6e6d6bfea0b41ba1ea02d14eb07244 Mon Sep 17 00:00:00 2001
2From: Zhang Peng <peng.zhang1.cn@windriver.com>
3Date: Tue, 17 Mar 2026 17:14:33 +0800
4Subject: [PATCH] meson.build: hard code path to iceauth
5
6Workaround find_program() which finds the native iceauth during
7cross-compilation instead of the target path.
8
9This is the meson equivalent of the autotools patch that modified
10configure.ac to hard code the iceauth path.
11
12This patch is replace the patch 0001-configure.in-hard-code-path-to-iceauth.patch
13
14Upstream-Status: Inappropriate [cross-compile specific]
15
16Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
17---
18 meson.build | 2 +-
19 xfce4-session/meson.build | 2 +-
20 2 files changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/meson.build b/meson.build
23index 7ab81ae5..c54ebafd 100644
24--- a/meson.build
25+++ b/meson.build
26@@ -75,7 +75,7 @@ if enable_x11
27 feature_cflags += '-DHAVE__ICETRANSNOLISTEN=1'
28 endif
29
30- iceauth = find_program('iceauth', required: true)
31+ # iceauth path is hard-coded below for cross-compilation
32
33 xsession_prefix = get_option('xsession-prefix')
34 if xsession_prefix == ''
35diff --git a/xfce4-session/meson.build b/xfce4-session/meson.build
36index 56a297f9..e36885e4 100644
37--- a/xfce4-session/meson.build
38+++ b/xfce4-session/meson.build
39@@ -42,7 +42,7 @@ c_args = [
40
41 if enable_x11
42 c_args += [
43- '-DICEAUTH_CMD="@0@"'.format(iceauth.full_path()),
44+ '-DICEAUTH_CMD="' + get_option('prefix') / get_option('bindir') / 'iceauth' + '"',
45 ]
46
47 session_sources += [
48--
492.50.0
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.20.3.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.21.1.bb
index af7ab98ae5..77ae5da6b8 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.20.3.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.21.1.bb
@@ -4,20 +4,22 @@ SECTION = "x11"
4LICENSE = "GPL-2.0-or-later" 4LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6 6
7DEPENDS = "libwnck3 libsm libxfce4ui libxfce4windowing virtual/libx11" 7DEPENDS = "libwnck3 libsm libxfce4ui libxfce4windowing virtual/libx11 gdk-pixbuf-native"
8
9XFCE_COMPRESS_TYPE = "xz"
10XFCEBASEBUILDCLASS = "meson"
8 11
9inherit xfce update-alternatives features_check 12inherit xfce update-alternatives features_check
10 13
11SRC_URI += "file://0001-configure.in-hard-code-path-to-iceauth.patch" 14SRC_URI += "file://0001-meson.build-hard-code-path-to-iceauth.patch \
12SRC_URI[sha256sum] = "dbf00672c5316a30b7001fe852e6a5ba9f889afeab8a247545a160d4302f1fa2" 15 file://0001-meson.build-Make-gdk-pixbuf-csource-available.patch \
16"
17SRC_URI[sha256sum] = "a8fe873fdb20366a44f1345400bfb29c2ff0cfe89dfefd852e2575464b80567c"
13 18
14REQUIRED_DISTRO_FEATURES = "x11" 19REQUIRED_DISTRO_FEATURES = "x11"
15 20
16PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" 21PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}"
17PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" 22PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit"
18
19EXTRA_OECONF = "GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen \
20 GLIB_COMPILE_RESOURCES=${STAGING_BINDIR_NATIVE}/glib-compile-resources"
21 23
22ALTERNATIVE:${PN} = "x-session-manager" 24ALTERNATIVE:${PN} = "x-session-manager"
23ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" 25ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session"
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-build-Do-not-display-full-path-in-generated-headers.patch b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-build-Do-not-display-full-path-in-generated-headers.patch
new file mode 100644
index 0000000000..50006b1710
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-build-Do-not-display-full-path-in-generated-headers.patch
@@ -0,0 +1,36 @@
1From 93fa2ed9a987c0f03c9f5aa0f31cb770d1cc5f17 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
3Date: Mon, 16 Mar 2026 16:44:43 +0100
4Subject: [PATCH] build: Do not display full path in generated headers
5
6Upstream-Status: Backport [https://gitlab.xfce.org/xfce/xfce4-settings/-/commit/93fa2ed9a987c0f03c9f5aa0f31cb770d1cc5f17]
7
8Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
9---
10 dialogs/mime-settings/meson.build | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/dialogs/mime-settings/meson.build b/dialogs/mime-settings/meson.build
14index b7ca8dc7..5ac9a936 100644
15--- a/dialogs/mime-settings/meson.build
16+++ b/dialogs/mime-settings/meson.build
17@@ -30,7 +30,7 @@ enums += gnome.mkenums(
18 install_header: false,
19 sources: 'xfce-mime-helper.h',
20 fhead: '#ifndef __XFCE_MIME_HELPER_ENUM_TYPES_H__\n#define __XFCE_MIME_HELPER_ENUM_TYPES_H__\n#include <libxfce4ui/libxfce4ui.h>\nG_BEGIN_DECLS\n',
21- fprod: '/* enumerations from "@filename@" */\n',
22+ fprod: '/* enumerations from "@basename@" */\n',
23 vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define XFCE_MIME_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n',
24 ftail: 'G_END_DECLS\n\n#endif /* !__XFCE_MIME_HELPER_ENUM_TYPES_H__ */',
25 )
26@@ -39,7 +39,7 @@ enums += gnome.mkenums(
27 install_header: false,
28 sources: 'xfce-mime-helper.h',
29 fhead: '#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include "xfce-mime-helper.h"\n\n#include "xfce-mime-helper-enum-types.h"',
30- fprod: '\n/* enumerations from "@filename@" */',
31+ fprod: '\n/* enumerations from "@basename@" */',
32 vhead: 'GType\n@enum_name@_get_type (void)\n{\n\tstatic GType type = 0;\n\tif (type == 0) {\n\tstatic const G@Type@Value values[] = {',
33 vprod: '\t{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },',
34 vtail: '\t{ 0, NULL, NULL }\n\t};\n\ttype = g_@type@_register_static ("@EnumName@", values);\n }\n\treturn type;\n}\n',
35--
362.51.2
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.1.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.21.1.bb
index 1330206a8a..16b90840c7 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.20.1.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.21.1.bb
@@ -5,25 +5,24 @@ LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6DEPENDS = "exo garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" 6DEPENDS = "exo garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower"
7 7
8XFCE_COMPRESS_TYPE = "xz"
9XFCEBASEBUILDCLASS = "meson"
10
8inherit xfce features_check mime-xdg 11inherit xfce features_check mime-xdg
9 12
10REQUIRED_DISTRO_FEATURES = "x11" 13REQUIRED_DISTRO_FEATURES = "x11"
11 14
12SRC_URI[sha256sum] = "fd0d602853ea75d94024e5baae2d2bf5ca8f8aa4dad7bfd5d08f9ff8afee77b2" 15SRC_URI += "file://0001-build-Do-not-display-full-path-in-generated-headers.patch"
13 16SRC_URI[sha256sum] = "e57a33d0bb9d63d0ef6f469c2d42cbf66e37d9127cc204de411b7385274e26d0"
14EXTRA_OECONF += " \
15 GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen \
16 --enable-maintainer-mode --disable-debug \
17"
18 17
19PACKAGECONFIG ??= " \ 18PACKAGECONFIG ??= " \
20 notify \ 19 notify \
21 ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ 20 ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \
22 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ 21 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
23" 22"
24PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" 23PACKAGECONFIG[notify] = "-Dlibnotify=enabled,-Dlibnotify=disabled,libnotify"
25PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra sound-theme-freedesktop" 24PACKAGECONFIG[sound-setter] = "-Dsound-settings=true,-Dsound-settings=false,libcanberra,libcanberra sound-theme-freedesktop"
26PACKAGECONFIG[wayland] = "--enable-wayland, --disable-wayland, wayland-native" 25PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native"
27 26
28FILES:${PN} += " \ 27FILES:${PN} += " \
29 ${libdir}/xfce4 \ 28 ${libdir}/xfce4 \
diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf/0001-build-Make-sure-gdbus-headers-are-generated-before-i.patch b/meta-xfce/recipes-xfce/xfconf/xfconf/0001-build-Make-sure-gdbus-headers-are-generated-before-i.patch
new file mode 100644
index 0000000000..35bed60b11
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfconf/xfconf/0001-build-Make-sure-gdbus-headers-are-generated-before-i.patch
@@ -0,0 +1,116 @@
1From 6fc6e4408ea021ee8a210e691f1a13b807121a3c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
3Date: Thu, 19 Mar 2026 18:33:41 +0100
4Subject: [PATCH] build: Make sure gdbus headers are generated before including
5 them
6
7Fixes: #48
8
9Upstream-Status: Backport [https://gitlab.xfce.org/xfce/xfconf/-/commit/6fc6e4408ea021ee8a210e691f1a13b807121a3c]
10
11Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
12---
13 .scan-build-false-positives | 2 ++
14 common/meson.build | 36 +++++++++++++++++++-----------------
15 xfconf/meson.build | 5 ++++-
16 xfconfd/meson.build | 1 +
17 4 files changed, 26 insertions(+), 18 deletions(-)
18
19diff --git a/.scan-build-false-positives b/.scan-build-false-positives
20index d925d3f..7ab5ec6 100644
21--- a/.scan-build-false-positives
22+++ b/.scan-build-false-positives
23@@ -1,5 +1,7 @@
24 # gdbus-codegen generated code
25 xfconf-gdbus-bindings.c:[0-9]+:[0-9]+: warning: Value stored to .+skeleton.+ during its initialization is never read \[deadcode.DeadStores\]
26+xfconf-gdbus-bindings.c:[0-9]+:[0-9]+: warning: Value stored to .+skeleton.+ during its initialization is never read \[deadcode.DeadStores\]
27+xfconf-gdbus-bindings.c:[0-9]+:[0-9]+: warning: Value stored to .+skeleton.+ during its initialization is never read \[deadcode.DeadStores\]
28
29 # gobject-introspection generated code
30 Xfconf-0.c:[0-9]+:[0-9]+: warning: Access to field .+message.+ results in a dereference of a null pointer \(loaded from variable .+error.+\) \[core.NullDereference\]
31diff --git a/common/meson.build b/common/meson.build
32index 08acd5b..fe30c38 100644
33--- a/common/meson.build
34+++ b/common/meson.build
35@@ -22,6 +22,24 @@ xfconf_visibility_sources += configure_file(
36 command: [xdt_gen_visibility, '--kind=source', '@INPUT@', '@OUTPUT@'],
37 )
38
39+xfconf_dbus_xml = configure_file(
40+ configuration: configuration_data({
41+ 'XFCONF_SERVICE_NAME_PREFIX': xfconf_service_name_prefix,
42+ 'XFCONF_SERVICE_PATH_PREFIX': xfconf_service_path_prefix,
43+ }),
44+ input: 'xfconf-dbus.xml.in',
45+ output: 'xfconf-dbus.xml',
46+)
47+
48+xfconf_gdbus_sources = gnome.gdbus_codegen(
49+ 'xfconf-gdbus-bindings',
50+ sources: xfconf_dbus_xml,
51+ interface_prefix: '@0@.Xfconf'.format(xfconf_service_name_prefix),
52+ namespace: 'Xfconf',
53+ annotations: ['@0@.Xfconf'.format(xfconf_service_name_prefix), 'org.gtk.GDBus.C.Name', 'Exported'],
54+ install_header: false,
55+)
56+
57 xfconf_common = static_library(
58 'xfconf-common',
59 xfconf_common_sources,
60@@ -61,25 +79,9 @@ xfconf_gvaluefuncs = static_library(
61 install: false,
62 )
63
64-xfconf_dbus_xml = configure_file(
65- configuration: configuration_data({
66- 'XFCONF_SERVICE_NAME_PREFIX': xfconf_service_name_prefix,
67- 'XFCONF_SERVICE_PATH_PREFIX': xfconf_service_path_prefix,
68- }),
69- input: 'xfconf-dbus.xml.in',
70- output: 'xfconf-dbus.xml',
71-)
72-
73 xfconf_dbus = static_library(
74 'xfconf-dbus',
75- gnome.gdbus_codegen(
76- 'xfconf-gdbus-bindings',
77- sources: xfconf_dbus_xml,
78- interface_prefix: '@0@.Xfconf'.format(xfconf_service_name_prefix),
79- namespace: 'Xfconf',
80- annotations: ['@0@.Xfconf'.format(xfconf_service_name_prefix), 'org.gtk.GDBus.C.Name', 'Exported'],
81- install_header: false,
82- ),
83+ xfconf_gdbus_sources,
84 c_args: [
85 '-DG_LOG_DOMAIN="@0@"'.format('xfconf-common'),
86 ],
87diff --git a/xfconf/meson.build b/xfconf/meson.build
88index e3ecd55..15cafa5 100644
89--- a/xfconf/meson.build
90+++ b/xfconf/meson.build
91@@ -39,7 +39,10 @@ xfconf_version = '@0@.0.0'.format(xfconf_so_version)
92 xfconf = library(
93 xfconf_pkgname,
94 xfconf_sources,
95- sources: xfconf_visibility_sources,
96+ sources: [
97+ xfconf_visibility_sources,
98+ xfconf_gdbus_sources,
99+ ],
100 version: xfconf_version,
101 soversion: xfconf_so_version,
102 c_args: [
103diff --git a/xfconfd/meson.build b/xfconfd/meson.build
104index 6e46a58..13e614e 100644
105--- a/xfconfd/meson.build
106+++ b/xfconfd/meson.build
107@@ -56,6 +56,7 @@ executable(
108 sources: [
109 xfce_revision_h,
110 xfconf_visibility_sources,
111+ xfconf_gdbus_sources,
112 ],
113 c_args: c_args,
114 include_directories: [
115--
1162.50.0
diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.20.0.bb b/meta-xfce/recipes-xfce/xfconf/xfconf_4.21.2.bb
index 168bd4d790..fbc0cffccc 100644
--- a/meta-xfce/recipes-xfce/xfconf/xfconf_4.20.0.bb
+++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.21.2.bb
@@ -5,11 +5,14 @@ LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 5LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
6DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native" 6DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native"
7 7
8inherit xfce gtk-doc gobject-introspection bash-completion vala 8XFCE_COMPRESS_TYPE = "xz"
9XFCEBASEBUILDCLASS = "meson"
10GTKDOC_MESON_OPTION = "gtk-doc"
9 11
10EXTRA_OECONF += "GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen" 12inherit xfce gtk-doc gobject-introspection bash-completion vala
11 13
12SRC_URI[sha256sum] = "8bc43c60f1716b13cf35fc899e2a36ea9c6cdc3478a8f051220eef0f53567efd" 14SRC_URI += "file://0001-build-Make-sure-gdbus-headers-are-generated-before-i.patch"
15SRC_URI[sha256sum] = "99aa4366e909ba7b9f746aba48b610b9e9d2933aeb283c7fa5f37a7c3dc7a3a6"
13 16
14FILES:${PN} += "${libdir}/xfce4/xfconf/xfconfd \ 17FILES:${PN} += "${libdir}/xfce4/xfconf/xfconfd \
15 ${libdir}/gio/modules/libxfconfgsettingsbackend.so \ 18 ${libdir}/gio/modules/libxfconfgsettingsbackend.so \
@@ -17,6 +20,5 @@ FILES:${PN} += "${libdir}/xfce4/xfconf/xfconfd \
17 ${systemd_user_unitdir}/xfconfd.service \ 20 ${systemd_user_unitdir}/xfconfd.service \
18 " 21 "
19 22
20FILES:${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" 23PACKAGECONFIG[gsettings-backend] = "-Dgsettings-backend=true,-Dgsettings-backend=false,"
21 24
22PACKAGECONFIG[gsettings-backend] = "--enable-gsettings-backend,--disable-gsettings-backend,"
diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb
index a24ed76d53..5cd0213951 100644
--- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb
+++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb
@@ -9,15 +9,17 @@ DEPENDS = " \
9 garcon \ 9 garcon \
10 glib-2.0 \ 10 glib-2.0 \
11 gtk+3 \ 11 gtk+3 \
12 intltool \
13 libwnck3 \ 12 libwnck3 \
14 libxfce4ui \ 13 libxfce4ui \
15 libxfce4util \ 14 libxfce4util \
16 libxfce4windowing \ 15 libxfce4windowing \
16 libyaml \
17 thunar \ 17 thunar \
18 xfconf \ 18 xfconf \
19" 19"
20 20
21XFCEBASEBUILDCLASS = "meson"
22
21inherit xfce features_check 23inherit xfce features_check
22 24
23REQUIRED_DISTRO_FEATURES = "x11" 25REQUIRED_DISTRO_FEATURES = "x11"
@@ -25,12 +27,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
25SRC_URI[sha256sum] = "acccde849265bbf4093925ba847977b7abf70bb2977e4f78216570e887c157b8" 27SRC_URI[sha256sum] = "acccde849265bbf4093925ba847977b7abf70bb2977e4f78216570e887c157b8"
26 28
27PACKAGECONFIG ??= "notify" 29PACKAGECONFIG ??= "notify"
28PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" 30PACKAGECONFIG[notify] = "-Dnotifications=enabled,-Dnotifications=disabled,libnotify"
29 31PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,"
30EXTRA_OECONF = "GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen \
31 GLIB_COMPILE_RESOURCES=${STAGING_BINDIR_NATIVE}/glib-compile-resources \
32 GLIB_GENMARSHAL=${STAGING_BINDIR_NATIVE}/glib-genmarshal \
33 GLIB_MKENUMS=${STAGING_BINDIR_NATIVE}/glib-mkenums \
34 "
35 32
36FILES:${PN} += "${datadir}/backgrounds" 33FILES:${PN} += "${datadir}/backgrounds"
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4/0001-build-Add-missing-libxfce4util-flags.patch b/meta-xfce/recipes-xfce/xfwm4/xfwm4/0001-build-Add-missing-libxfce4util-flags.patch
new file mode 100644
index 0000000000..8fe8386f11
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4/0001-build-Add-missing-libxfce4util-flags.patch
@@ -0,0 +1,59 @@
1From 6468f80ee9283c03fc18f67361b20c6efdf3df50 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
3Date: Mon, 3 Feb 2025 11:09:59 +0100
4Subject: [PATCH] build: Add missing libxfce4util flags
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9This will be necessary when xfwm4 is built against a meson release of
10libxfce4ui, which sets private flags by default in pkgconfig (and
11therefore no longer exposes libxfce4util flags).
12
13Signed-off-by: Gaƫl Bonithon <gael@xfce.org>
14
15Upstream-Status: Backport [https://gitlab.xfce.org/xfce/xfwm4/-/commit/6468f80ee9283c03fc18f67361b20c6efdf3df50]
16
17Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
18---
19 settings-dialogs/Makefile.am | 4 ++++
20 1 file changed, 4 insertions(+)
21
22diff --git a/settings-dialogs/Makefile.am b/settings-dialogs/Makefile.am
23index 3a1d2a510..86c6ab9be 100644
24--- a/settings-dialogs/Makefile.am
25+++ b/settings-dialogs/Makefile.am
26@@ -44,6 +44,7 @@ xfwm4_settings_CFLAGS = \
27 $(GLIB_CFLAGS) \
28 $(DBUS_GLIB_CFLAGS) \
29 $(LIBXFCE4UI_CFLAGS) \
30+ $(LIBXFCE4UTIL_CFLAGS) \
31 $(LIBXFCE4KBD_PRIVATE_CFLAGS) \
32 $(LIBXFCONF_CFLAGS) \
33 -DDATADIR=\"$(datadir)\" \
34@@ -56,6 +57,7 @@ xfwm4_settings_LDADD = \
35 $(GLIB_LIBS) \
36 $(DBUS_GLIB_LIBS) \
37 $(LIBXFCE4UI_LIBS) \
38+ $(LIBXFCE4UTIL_LIBS) \
39 $(LIBXFCE4KBD_PRIVATE_LIBS) \
40 $(LIBXFCONF_LIBS)
41
42@@ -70,6 +72,7 @@ xfwm4_tweaks_settings_CFLAGS = \
43 $(GLIB_CFLAGS) \
44 $(DBUS_GLIB_CFLAGS) \
45 $(LIBXFCE4UI_CFLAGS) \
46+ $(LIBXFCE4UTIL_CFLAGS) \
47 $(LIBXFCONF_CFLAGS) \
48 -DDATADIR=\"$(datadir)\" \
49 -DSRCDIR=\"$(top_srcdir)\" \
50@@ -81,6 +84,7 @@ xfwm4_tweaks_settings_LDADD = \
51 $(GLIB_LIBS) \
52 $(DBUS_GLIB_LIBS) \
53 $(LIBXFCE4UI_LIBS) \
54+ $(LIBXFCE4UTIL_LIBS) \
55 $(LIBXFCONF_LIBS)
56
57 AM_CPPFLAGS = \
58--
592.50.0
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.20.0.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.20.0.bb
index ef5a682b77..2c0ac1d39c 100644
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.20.0.bb
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.20.0.bb
@@ -9,7 +9,10 @@ inherit xfce update-alternatives features_check
9 9
10REQUIRED_DISTRO_FEATURES = "x11" 10REQUIRED_DISTRO_FEATURES = "x11"
11 11
12SRC_URI += "file://xfwm4-fix-incompatible-pointer-type-error.patch" 12SRC_URI += " \
13 file://xfwm4-fix-incompatible-pointer-type-error.patch \
14 file://0001-build-Add-missing-libxfce4util-flags.patch \
15 "
13 16
14SRC_URI[sha256sum] = "a58b63e49397aa0d8d1dcf0636be93c8bb5926779aef5165e0852890190dcf06" 17SRC_URI[sha256sum] = "a58b63e49397aa0d8d1dcf0636be93c8bb5926779aef5165e0852890190dcf06"
15 18