xfce4-panel : upgrade 4.21.1 -> 4.21.2
PATCH 1/1 xfce4-panel : upgrade 4.21.1 -> 4.21.2
Drop backported patches which are already included in this version.
Update 0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch for member name changes.
Changelog: https://gitlab.xfce.org/xfce/xfce4-panel/-/tags/xfce4-panel-4.21.2
Signed-off-by Jason Schonberg <[email protected]>
---
...-generate-sub-headers-before-includi.patch | 311 ------------------
...splay-full-path-in-generated-headers.patch | 36 --
...oe-Remove-wrong-autoptr-define-guard.patch | 42 ---
...t-display-desktop-icon-when-no-windo.patch | 28 +-
...uild-Install-missing-libxfce4panel.h.patch | 30 --
...-panel_4.21.1.bb => xfce4-panel_4.21.2.bb} | 6 +-
6 files changed, 17 insertions(+), 436 deletions(-)
delete mode 100644 meta-xfce/recipes-xfce/xfce4-panel/files/0001-build-Be-sure-to-generate-sub-headers-before-includi.patch
delete mode 100644 meta-xfce/recipes-xfce/xfce4-panel/files/0001-build-Do-not-display-full-path-in-generated-headers.patch
delete mode 100644 meta-xfce/recipes-xfce/xfce4-panel/files/0001-panel-tic-tac-toe-Remove-wrong-autoptr-define-guard.patch
delete mode 100644 meta-xfce/recipes-xfce/xfce4-panel/files/0002-build-Install-missing-libxfce4panel.h.patch
rename meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.21.1.bb => xfce4-panel_4.21.2.bb} (83%)meta-xfce/recipes-xfce/xfce4-panel/files/0001-build-Be-sure-to-generate-sub-headers-before-includi.patch deleted +0 -311
@@ -1,311 +0,0 @@ -From c259dfbbb8e139b43af179acec9824ecf849d34d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <[email protected]> -Date: Thu, 19 Feb 2026 11:44:35 +0100 -Subject: [PATCH 1/2] build: Be sure to generate sub-headers before including - libxfce4panel.h - -Fixes: #969 - -Upstream-Status: Backport [https://gitlab.xfce.org/xfce/xfce4-panel/-/commit/c259dfbbb8e139b43af179acec9824ecf849d34d] - -Signed-off-by: Wenlin Kang <[email protected]> ---- - common/meson.build | 3 +++ - .../{libxfce4panel.h => libxfce4panel.h.in} | 0 - libxfce4panel/meson.build | 17 +++++++++++++++-- - migrate/meson.build | 3 +++ - panel/meson.build | 1 + - plugins/actions/meson.build | 5 ++++- - plugins/applicationsmenu/meson.build | 5 ++++- - plugins/clock/meson.build | 5 ++++- - plugins/directorymenu/meson.build | 5 ++++- - plugins/launcher/meson.build | 5 ++++- - plugins/pager/meson.build | 5 ++++- - plugins/separator/meson.build | 5 ++++- - plugins/showdesktop/meson.build | 5 ++++- - plugins/systray/meson.build | 5 ++++- - plugins/tasklist/meson.build | 5 ++++- - plugins/windowmenu/meson.build | 5 ++++- - wrapper/meson.build | 3 +++ - 17 files changed, 69 insertions(+), 13 deletions(-) - rename libxfce4panel/{libxfce4panel.h => libxfce4panel.h.in} (100%) - -diff --git a/common/meson.build b/common/meson.build -index ce7f3a98c..d880455ac 100644 ---- a/common/meson.build -+++ b/common/meson.build -@@ -8,6 +8,9 @@ libpanel_common = static_library( - 'panel-xfconf.c', - 'panel-xfconf.h', - ], -+ sources: [ -+ libxfce4panel_h, -+ ], - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('libpanel-common'), - ], -diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h.in -similarity index 100% -rename from libxfce4panel/libxfce4panel.h -rename to libxfce4panel/libxfce4panel.h.in -diff --git a/libxfce4panel/meson.build b/libxfce4panel/meson.build -index bb66b1534..150319388 100644 ---- a/libxfce4panel/meson.build -+++ b/libxfce4panel/meson.build -@@ -6,7 +6,6 @@ libpanel_install_dir = get_option('prefix') / get_option('includedir') / libpane - - libpanel_headers = [ - 'libxfce4panel-enums.h', -- 'libxfce4panel.h', - 'xfce-arrow-button.h', - 'xfce-panel-convenience.h', - 'xfce-panel-image.h', -@@ -16,7 +15,7 @@ libpanel_headers = [ - - # do not add this header to GI sources, it creates unsolvable conflicts with other - # libs whose identifier prefix is Xfce, e.g. libxfce4ui and libxfce4util --configure_file( -+libpanel_config_h = configure_file( - configuration: configuration_data({ - 'LIBXFCE4PANEL_VERSION': meson.project_version(), - 'LIBXFCE4PANEL_VERSION_MAJOR': version_parts[0], -@@ -84,6 +83,20 @@ libpanel_enums += gnome.mkenums( - ftail: '\n#define __LIBXFCE4PANEL_ENUM_TYPES_C__\n#include "libxfce4panel-visibility.c"\n', - ) - -+libxfce4panel_h = custom_target( -+ 'libxfce4panel.h', -+ input: 'libxfce4panel.h.in', -+ output: 'libxfce4panel.h', -+ command: ['cp', '@INPUT@', '@OUTPUT@'], -+ depends: [ -+ libpanel_enums, -+ ], -+ depend_files: [ -+ libpanel_config_h, -+ ], -+) -+libpanel_sources += libxfce4panel_h -+ - libpanel_deps = [ - glib, - gmodule, -diff --git a/migrate/meson.build b/migrate/meson.build -index 8159f6336..19d95a2eb 100644 ---- a/migrate/meson.build -+++ b/migrate/meson.build -@@ -21,6 +21,9 @@ migrate_sources = [ - executable( - 'migrate', - migrate_sources, -+ sources: [ -+ libxfce4panel_h, -+ ], - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('xfce4-panel-migrate'), - '-DXDGCONFIGDIR="@0@"'.format(xdgconfdir), -diff --git a/panel/meson.build b/panel/meson.build -index 78e2d8d15..6c2fd4e1e 100644 ---- a/panel/meson.build -+++ b/panel/meson.build -@@ -73,6 +73,7 @@ executable( - sources: [ - xfce_revision_h, - xfce4_panel_resources_c, -+ libxfce4panel_h, - ], - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('xfce4-panel'), -diff --git a/plugins/actions/meson.build b/plugins/actions/meson.build -index 55dcd2e1f..c3d824d41 100644 ---- a/plugins/actions/meson.build -+++ b/plugins/actions/meson.build -@@ -8,7 +8,10 @@ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins' - shared_module( - 'actions', - plugin_sources, -- sources: xfce4_panel_resources_c, -+ sources: [ -+ xfce4_panel_resources_c, -+ libxfce4panel_h, -+ ], - gnu_symbol_visibility: 'hidden', - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('libactions'), -diff --git a/plugins/applicationsmenu/meson.build b/plugins/applicationsmenu/meson.build -index efa825f00..15e06af0f 100644 ---- a/plugins/applicationsmenu/meson.build -+++ b/plugins/applicationsmenu/meson.build -@@ -8,7 +8,10 @@ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins' - shared_module( - 'applicationsmenu', - plugin_sources, -- sources: xfce4_panel_resources_c, -+ sources: [ -+ xfce4_panel_resources_c, -+ libxfce4panel_h, -+ ], - gnu_symbol_visibility: 'hidden', - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('libapplicationsmenu'), -diff --git a/plugins/clock/meson.build b/plugins/clock/meson.build -index b08f3c39c..8e005f486 100644 ---- a/plugins/clock/meson.build -+++ b/plugins/clock/meson.build -@@ -22,7 +22,10 @@ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins' - shared_module( - 'clock', - plugin_sources, -- sources: xfce4_panel_resources_c, -+ sources: [ -+ xfce4_panel_resources_c, -+ libxfce4panel_h, -+ ], - gnu_symbol_visibility: 'hidden', - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('libclock'), -diff --git a/plugins/directorymenu/meson.build b/plugins/directorymenu/meson.build -index 43e81abf3..0bf48bae6 100644 ---- a/plugins/directorymenu/meson.build -+++ b/plugins/directorymenu/meson.build -@@ -8,7 +8,10 @@ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins' - shared_module( - 'directorymenu', - plugin_sources, -- sources: xfce4_panel_resources_c, -+ sources: [ -+ xfce4_panel_resources_c, -+ libxfce4panel_h, -+ ], - gnu_symbol_visibility: 'hidden', - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('libdirectorymenu'), -diff --git a/plugins/launcher/meson.build b/plugins/launcher/meson.build -index d228eca54..8815b5baa 100644 ---- a/plugins/launcher/meson.build -+++ b/plugins/launcher/meson.build -@@ -10,7 +10,10 @@ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins' - shared_module( - 'launcher', - plugin_sources, -- sources: xfce4_panel_resources_c, -+ sources: [ -+ xfce4_panel_resources_c, -+ libxfce4panel_h, -+ ], - gnu_symbol_visibility: 'hidden', - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('liblauncher'), -diff --git a/plugins/pager/meson.build b/plugins/pager/meson.build -index 30fcbdef6..45e34c62b 100644 ---- a/plugins/pager/meson.build -+++ b/plugins/pager/meson.build -@@ -10,7 +10,10 @@ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins' - shared_module( - 'pager', - plugin_sources, -- sources: xfce4_panel_resources_c, -+ sources: [ -+ xfce4_panel_resources_c, -+ libxfce4panel_h, -+ ], - gnu_symbol_visibility: 'hidden', - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('libpager'), -diff --git a/plugins/separator/meson.build b/plugins/separator/meson.build -index 9de0289b3..26581e90e 100644 ---- a/plugins/separator/meson.build -+++ b/plugins/separator/meson.build -@@ -8,7 +8,10 @@ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins' - shared_module( - 'separator', - plugin_sources, -- sources: xfce4_panel_resources_c, -+ sources: [ -+ xfce4_panel_resources_c, -+ libxfce4panel_h, -+ ], - gnu_symbol_visibility: 'hidden', - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('libseparator'), -diff --git a/plugins/showdesktop/meson.build b/plugins/showdesktop/meson.build -index 2e4812de4..c599138c2 100644 ---- a/plugins/showdesktop/meson.build -+++ b/plugins/showdesktop/meson.build -@@ -8,7 +8,10 @@ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins' - shared_module( - 'showdesktop', - plugin_sources, -- sources: xfce4_panel_resources_c, -+ sources: [ -+ xfce4_panel_resources_c, -+ libxfce4panel_h, -+ ], - gnu_symbol_visibility: 'hidden', - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('libshowdesktop'), -diff --git a/plugins/systray/meson.build b/plugins/systray/meson.build -index 2efa088d4..ea364ccff 100644 ---- a/plugins/systray/meson.build -+++ b/plugins/systray/meson.build -@@ -52,7 +52,10 @@ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins' - shared_module( - 'systray', - plugin_sources, -- sources: xfce4_panel_resources_c, -+ sources: [ -+ xfce4_panel_resources_c, -+ libxfce4panel_h, -+ ], - gnu_symbol_visibility: 'hidden', - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('libsystray'), -diff --git a/plugins/tasklist/meson.build b/plugins/tasklist/meson.build -index 333e91c21..61b889536 100644 ---- a/plugins/tasklist/meson.build -+++ b/plugins/tasklist/meson.build -@@ -10,7 +10,10 @@ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins' - shared_module( - 'tasklist', - plugin_sources, -- sources: xfce4_panel_resources_c, -+ sources: [ -+ xfce4_panel_resources_c, -+ libxfce4panel_h, -+ ], - gnu_symbol_visibility: 'hidden', - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('libtasklist'), -diff --git a/plugins/windowmenu/meson.build b/plugins/windowmenu/meson.build -index 71125ffc7..07a6d767a 100644 ---- a/plugins/windowmenu/meson.build -+++ b/plugins/windowmenu/meson.build -@@ -8,7 +8,10 @@ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins' - shared_module( - 'windowmenu', - plugin_sources, -- sources: xfce4_panel_resources_c, -+ sources: [ -+ xfce4_panel_resources_c, -+ libxfce4panel_h, -+ ], - gnu_symbol_visibility: 'hidden', - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('libwindowmenu'), -diff --git a/wrapper/meson.build b/wrapper/meson.build -index 4f33fd89a..e88644c1f 100644 ---- a/wrapper/meson.build -+++ b/wrapper/meson.build -@@ -31,6 +31,9 @@ wrapper_sources += gnome.gdbus_codegen( - executable( - 'wrapper-2.0', - wrapper_sources, -+ sources: [ -+ libxfce4panel_h, -+ ], - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format('xfce4-panel-wrapper'), - ], --- -2.43.0 -
meta-xfce/recipes-xfce/xfce4-panel/files/0001-build-Do-not-display-full-path-in-generated-headers.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 61f40b65637695abe9d9e2f80ca99d3c076c96e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <[email protected]> -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 <[email protected]> ---- - 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 <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', -- 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
meta-xfce/recipes-xfce/xfce4-panel/files/0001-panel-tic-tac-toe-Remove-wrong-autoptr-define-guard.patch deleted +0 -42
42 lines not on this page · raw message
meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch +16 -12
@@ -22,24 +22,28 @@ Rebase for xfce4-panel 4.20.0. Signed-off-by: Kai Kang <[email protected]> +Rebase for xfce4-panel 4.21.2 (field renamed from `icon` to `widget`). + +Signed-off-by: Jason Schonberg <[email protected]> + --- plugins/windowmenu/windowmenu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c -index 9a73f29..eab0547 100644 +index 4e49277..29be92f 100644 --- a/plugins/windowmenu/windowmenu.c +++ b/plugins/windowmenu/windowmenu.c -@@ -266,7 +266,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) +@@ -267,7 +267,7 @@ g_signal_connect (G_OBJECT (plugin->button), "toggled", G_CALLBACK (window_menu_plugin_menu), plugin); -- plugin->icon = gtk_image_new_from_icon_name ("user-desktop", GTK_ICON_SIZE_BUTTON); -+ plugin->icon = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon); - gtk_widget_show (plugin->icon); +- plugin->widget = gtk_image_new_from_icon_name ("user-desktop", GTK_ICON_SIZE_BUTTON); ++ plugin->widget = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (plugin->button), plugin->widget); + gtk_widget_show (plugin->widget); } -@@ -706,19 +706,19 @@ window_menu_plugin_active_window_changed (XfwScreen *screen, +@@ -772,19 +772,19 @@ /* skip 'fake' windows */ type = xfw_window_get_window_type (window); if (type == XFW_WINDOW_TYPE_DESKTOP || type == XFW_WINDOW_TYPE_DOCK)
@@ -55,11 +59,11 @@ index 9a73f29..eab0547 100644 /* desktop is shown right now */ icon_size = xfce_panel_plugin_get_icon_size (XFCE_PANEL_PLUGIN (plugin)); -- gtk_image_set_from_icon_name (GTK_IMAGE (icon), "user-desktop", icon_size); -+ gtk_image_set_from_icon_name (GTK_IMAGE (icon), NULL, icon_size); - gtk_image_set_pixel_size (GTK_IMAGE (icon), icon_size); -- gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("Desktop")); -+ gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("No Windows")); +- gtk_image_set_from_icon_name (GTK_IMAGE (widget), "user-desktop", icon_size); ++ gtk_image_set_from_icon_name (GTK_IMAGE (widget), NULL, icon_size); + gtk_image_set_pixel_size (GTK_IMAGE (widget), icon_size); +- gtk_widget_set_tooltip_text (GTK_WIDGET (widget), _("Desktop")); ++ gtk_widget_set_tooltip_text (GTK_WIDGET (widget), _("No Windows")); } } }
meta-xfce/recipes-xfce/xfce4-panel/files/0002-build-Install-missing-libxfce4panel.h.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 151fec5f91fcb3dc5d55aee82a6d717dad77e877 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <[email protected]> -Date: Sun, 22 Feb 2026 17:11:05 +0100 -Subject: [PATCH 2/2] build: Install missing libxfce4panel.h - -Fixes: c259dfbbb8e139b43af179acec9824ecf849d34d - -Upstream-Status: Backport [https://gitlab.xfce.org/xfce/xfce4-panel/-/commit/151fec5f91fcb3dc5d55aee82a6d717dad77e877] - -Signed-off-by: Wenlin Kang <[email protected]> ---- - libxfce4panel/meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libxfce4panel/meson.build b/libxfce4panel/meson.build -index 150319388..38d8ad198 100644 ---- a/libxfce4panel/meson.build -+++ b/libxfce4panel/meson.build -@@ -94,6 +94,8 @@ libxfce4panel_h = custom_target( - depend_files: [ - libpanel_config_h, - ], -+ install: true, -+ install_dir: libpanel_install_dir, - ) - libpanel_sources += libxfce4panel_h - --- -2.43.0 -
meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.2.bb renamed from meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb +1 -5
@@ -14,12 +14,8 @@ inherit xfce gtk-doc gobject-introspection features_check mime-xdg 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 \ - file://0001-build-Be-sure-to-generate-sub-headers-before-includi.patch \ - file://0002-build-Install-missing-libxfce4panel.h.patch \ - file://0001-panel-tic-tac-toe-Remove-wrong-autoptr-define-guard.patch \ " -SRC_URI[sha256sum] = "c940dae515bef4af08a126011d2fd873ce99e815157ba8cef5332195bb60e51e" +SRC_URI[sha256sum] = "ba490351b7837fa345385c830d118a1c85f7400672f7f0525095c739e83d9a43" EXTRA_OEMESON += "-Dvala=disabled"
Signature · 1 line
2.43.0