summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Peng <peng.zhang1.cn@windriver.com>2026-03-24 20:59:18 +0800
committerKhem Raj <khem.raj@oss.qualcomm.com>2026-03-24 09:13:51 -0700
commit9608cd4ca42104be5419de61b8ab99458a152614 (patch)
tree57f07df2eab83a1c41e5501af2614b3781d2d6d2
parent73dc5bc22d646d36d064cdfc7c711edc833f1e86 (diff)
downloadmeta-openembedded-9608cd4ca42104be5419de61b8ab99458a152614.tar.gz
xfce4-panel: upgrade 4.20.1 -> 4.21.1
Changelog: https://gitlab.xfce.org/xfce/xfce4-panel/-/tags/xfce4-panel-4.21.1 https://gitlab.xfce.org/xfce/xfce4-panel/-/tags/xfce4-panel-4.21.0 https://gitlab.xfce.org/xfce/xfce4-panel/-/tags/xfce4-panel-4.20.7 https://gitlab.xfce.org/xfce/xfce4-panel/-/tags/xfce4-panel-4.20.6 https://gitlab.xfce.org/xfce/xfce4-panel/-/tags/xfce4-panel-4.20.5 https://gitlab.xfce.org/xfce/xfce4-panel/-/tags/xfce4-panel-4.20.4 https://gitlab.xfce.org/xfce/xfce4-panel/-/tags/xfce4-panel-4.20.3 https://gitlab.xfce.org/xfce/xfce4-panel/-/tags/xfce4-panel-4.20.2 Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
-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)9
2 files changed, 43 insertions, 2 deletions
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..b3cf4b2559 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
@@ -7,6 +7,10 @@ DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxfce4windowing libxml2 \
7 libwnck3 vala-native \ 7 libwnck3 vala-native \
8 " 8 "
9 9
10XFCE_COMPRESS_TYPE = "xz"
11XFCEBASEBUILDCLASS = "meson"
12GTKDOC_MESON_OPTION = "gtk-doc"
13
10inherit xfce gtk-doc gobject-introspection features_check mime-xdg 14inherit xfce gtk-doc gobject-introspection features_check mime-xdg
11 15
12REQUIRED_DISTRO_FEATURES = "x11" 16REQUIRED_DISTRO_FEATURES = "x11"
@@ -14,10 +18,11 @@ REQUIRED_DISTRO_FEATURES = "x11"
14SRC_URI += " \ 18SRC_URI += " \
15 file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ 19 file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \
16 file://0002-use-lxdm-to-replace-dm-tool.patch \ 20 file://0002-use-lxdm-to-replace-dm-tool.patch \
21 file://0001-build-Do-not-display-full-path-in-generated-headers.patch \
17" 22"
18SRC_URI[sha256sum] = "5a7c8097527555640ab3d00307505c7c1b7302d11d92874f88842ea969483519" 23SRC_URI[sha256sum] = "c940dae515bef4af08a126011d2fd873ce99e815157ba8cef5332195bb60e51e"
19 24
20EXTRA_OECONF += "--disable-vala GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen" 25EXTRA_OEMESON += "-Dvala=disabled"
21 26
22python populate_packages:prepend() { 27python populate_packages:prepend() {
23 plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') 28 plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/')