mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-26 19:47:17 +00:00
Code Issues Projects Releases Wiki Activity

xfce4-panel: 4.16.3 -> 4.18.0

Browse Source 
Update xfce4-panel 4.16.3 to 4.18.0
* update license which should be GPL-2.0-or-later
* rebase 0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Kai Kang
2022-12-25 05:33:37 +08:00
committed by Khem Raj
parent 2ce593fb09
commit 142b114921
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch
+9 -6
View File
@@ -13,15 +13,19 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Rebase for xfce4 4.18.0.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
--- ---
plugins/windowmenu/windowmenu.c | 10 +++++----- plugins/windowmenu/windowmenu.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index f47e993e..061d6544 100644 index ba245a3..f8fdee8 100644
--- a/plugins/windowmenu/windowmenu.c --- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c +++ b/plugins/windowmenu/windowmenu.c
@@ -251,7 +251,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) @@ -250,7 +250,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin)
g_signal_connect (G_OBJECT (plugin->button), "toggled", g_signal_connect (G_OBJECT (plugin->button), "toggled",
G_CALLBACK (window_menu_plugin_menu), plugin); G_CALLBACK (window_menu_plugin_menu), plugin);
@@ -30,16 +34,14 @@ index f47e993e..061d6544 100644
gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon); gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon);
gtk_widget_show (plugin->icon); gtk_widget_show (plugin->icon);
} }
@@ -640,7 +640,7 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, @@ -680,19 +680,19 @@ window_menu_plugin_active_window_changed (WnckScreen *screen,
/* skip 'fake' windows */ /* skip 'fake' windows */
type = wnck_window_get_window_type (window); type = wnck_window_get_window_type (window);
if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK) if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK)
- goto show_desktop_icon; - goto show_desktop_icon;
+ goto show_no_icon; + goto show_no_icon;
/* get the window icon and set the tooltip */ window_menu_plugin_set_icon (plugin, window);
gtk_widget_set_tooltip_text (GTK_WIDGET (icon),
@@ -660,12 +660,12 @@ window_menu_plugin_active_window_changed (WnckScreen *screen,
} }
else else
{ {
@@ -47,6 +49,7 @@ index f47e993e..061d6544 100644
+ show_no_icon: + show_no_icon:
/* desktop is shown right now */ /* 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), "user-desktop", icon_size);
+ gtk_image_set_from_icon_name (GTK_IMAGE (icon), NULL, 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_image_set_pixel_size (GTK_IMAGE (icon), icon_size);
meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb → meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.0.bb
+2 -2
View File
@@ -1,6 +1,6 @@
SUMMARY = "Xfce4 Panel" SUMMARY = "Xfce4 Panel"
SECTION = "x11" SECTION = "x11"
LICENSE = "GPL-2.0-only" LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee"
DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native" DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native"
@@ -10,11 +10,11 @@ inherit xfce gtk-doc gobject-introspection features_check mime-xdg
# cairo would at least needed to be built with xlib. # cairo would at least needed to be built with xlib.
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
SRC_URI[sha256sum] = "5934eaed8a76da52c29b734ccd79600255420333dd6ebd8fd9f066379af1e092"
SRC_URI += " \ SRC_URI += " \
file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \
file://0002-use-lxdm-to-replace-dm-tool.patch \ file://0002-use-lxdm-to-replace-dm-tool.patch \
" "
SRC_URI[sha256sum] = "be80023fd546587831bab25ded15ae4c9e346289a75744b6ba4cf4ee53794710"
EXTRA_OECONF += "--disable-vala" EXTRA_OECONF += "--disable-vala"