From 9608cd4ca42104be5419de61b8ab99458a152614 Mon Sep 17 00:00:00 2001 From: Zhang Peng Date: Tue, 24 Mar 2026 20:59:18 +0800 Subject: [PATCH] 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 Signed-off-by: Khem Raj --- ...splay-full-path-in-generated-headers.patch | 36 +++++++++++++++++++ ...-panel_4.20.1.bb => xfce4-panel_4.21.1.bb} | 9 +++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 meta-xfce/recipes-xfce/xfce4-panel/files/0001-build-Do-not-display-full-path-in-generated-headers.patch rename meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.20.1.bb => xfce4-panel_4.21.1.bb} (84%) 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 @@ +From 61f40b65637695abe9d9e2f80ca99d3c076c96e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= +Date: Mon, 16 Mar 2026 16:31:23 +0100 +Subject: [PATCH] build: Do not display full path in generated headers + +Upstream-Status: Backport [https://gitlab.xfce.org/xfce/xfce4-panel/-/commit/61f40b65637695abe9d9e2f80ca99d3c076c96e8] + +Signed-off-by: Zhang Peng +--- + libxfce4panel/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libxfce4panel/meson.build b/libxfce4panel/meson.build +index 38d8ad198..3fee75d58 100644 +--- a/libxfce4panel/meson.build ++++ b/libxfce4panel/meson.build +@@ -67,7 +67,7 @@ libpanel_enums += gnome.mkenums( + install_dir: libpanel_install_dir, + sources: libpanel_headers, + fhead: '#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION)\n#error "Only 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 \nG_BEGIN_DECLS\n', +- fprod: '/* enumerations from "@filename@" */\n', ++ fprod: '/* enumerations from "@basename@" */\n', + vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define XFCE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n', + ftail: 'G_END_DECLS\n\n#endif /* !__LIBXFCE4PANEL_ENUM_TYPES_H__ */', + ) +@@ -76,7 +76,7 @@ libpanel_enums += gnome.mkenums( + install_header: false, + sources: libpanel_headers, + fhead: '#include "libxfce4panel-enums.h"\n#include "libxfce4panel-enum-types.h"\n\n#include "libxfce4panel-visibility.h"', +- fprod: '\n/* enumerations from "@filename@" */', ++ fprod: '\n/* enumerations from "@basename@" */', + 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[] = {', + vprod: '\t{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },', + vtail: '\t{ 0, NULL, NULL }\n\t};\n\ttype = g_@type@_register_static ("@EnumName@", values);\n }\n\treturn type;\n}\n', +-- +2.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 similarity index 84% rename from meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.20.1.bb rename to 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 \ libwnck3 vala-native \ " +XFCE_COMPRESS_TYPE = "xz" +XFCEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk-doc" + inherit xfce gtk-doc gobject-introspection features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" @@ -14,10 +18,11 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ file://0002-use-lxdm-to-replace-dm-tool.patch \ + file://0001-build-Do-not-display-full-path-in-generated-headers.patch \ " -SRC_URI[sha256sum] = "5a7c8097527555640ab3d00307505c7c1b7302d11d92874f88842ea969483519" +SRC_URI[sha256sum] = "c940dae515bef4af08a126011d2fd873ce99e815157ba8cef5332195bb60e51e" -EXTRA_OECONF += "--disable-vala GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen" +EXTRA_OEMESON += "-Dvala=disabled" python populate_packages:prepend() { plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/')