diff options
author | Kai Kang <kai.kang@windriver.com> | 2022-12-25 05:33:37 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-12-27 16:03:06 -0800 |
commit | 142b1149210eb4c631ee295a6a87a8d71b116ec5 (patch) | |
tree | 1c13847fa73035e5f8702a812ffbc4f855dd2b02 /meta-xfce | |
parent | 2ce593fb097e45390890595168c31306fca464fe (diff) | |
download | meta-openembedded-contrib-142b1149210eb4c631ee295a6a87a8d71b116ec5.tar.gz |
xfce4-panel: 4.16.3 -> 4.18.0
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>
Diffstat (limited to 'meta-xfce')
-rw-r--r-- | meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch | 15 | ||||
-rw-r--r-- | meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.0.bb (renamed from meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb) | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch index 1adb14552d..10c456f45e 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch @@ -13,15 +13,19 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Pending 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 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 +++ 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_CALLBACK (window_menu_plugin_menu), plugin); @@ -30,16 +34,14 @@ index f47e993e..061d6544 100644 gtk_container_add (GTK_CONTAINER (plugin->button), 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 */ type = wnck_window_get_window_type (window); if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK) - goto show_desktop_icon; + goto show_no_icon; - /* get the window icon and set the tooltip */ - gtk_widget_set_tooltip_text (GTK_WIDGET (icon), -@@ -660,12 +660,12 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, + window_menu_plugin_set_icon (plugin, window); } else { @@ -47,6 +49,7 @@ index f47e993e..061d6544 100644 + show_no_icon: /* 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); diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.0.bb index 46d26159ae..5dcd69d357 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Xfce4 Panel" SECTION = "x11" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" 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. ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[sha256sum] = "5934eaed8a76da52c29b734ccd79600255420333dd6ebd8fd9f066379af1e092" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ file://0002-use-lxdm-to-replace-dm-tool.patch \ " +SRC_URI[sha256sum] = "be80023fd546587831bab25ded15ae4c9e346289a75744b6ba4cf4ee53794710" EXTRA_OECONF += "--disable-vala" |