From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- ...make-change-of-system-s-timezone-change-t.patch | 42 --------------- ...do-not-display-desktop-icon-when-no-windo.patch | 60 ++++++++++++++++++++++ ...do-not-display-desktop-icon-when-no-windo.patch | 60 ---------------------- .../recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb | 44 ---------------- .../recipes-xfce/xfce4-panel/xfce4-panel_4.13.3.bb | 40 +++++++++++++++ 5 files changed, 100 insertions(+), 146 deletions(-) delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-clock-time-make-change-of-system-s-timezone-change-t.patch create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.3.bb (limited to 'meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel') diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-clock-time-make-change-of-system-s-timezone-change-t.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-clock-time-make-change-of-system-s-timezone-change-t.patch deleted file mode 100644 index 9dca3ba57d..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-clock-time-make-change-of-system-s-timezone-change-t.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c582338ef4f33b3dc07a2636340d55b9fb530650 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 17 Feb 2016 00:15:44 +0100 -Subject: [PATCH] clock-time: make change of system's timezone change time for - DEFAULT_TIMEZONE -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -clock_time->timezone is set in clock_time_init so the condition - -'clock_time->timezone != NULL - -is matching always. - -Tested by selecting seconds displayed (-> quick update) and changing timezone. - -Upstream-Status: Submitted [1] - -[1] https://bugzilla.xfce.org/show_bug.cgi?id=12453 - -Signed-off-by: Andreas Müller ---- - plugins/clock/clock-time.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/clock/clock-time.c b/plugins/clock/clock-time.c -index b015b13..4459b85 100644 ---- a/plugins/clock/clock-time.c -+++ b/plugins/clock/clock-time.c -@@ -198,7 +198,7 @@ clock_time_get_time (ClockTime *clock_time) - - panel_return_val_if_fail (XFCE_IS_CLOCK_TIME (clock_time), NULL); - -- if (clock_time->timezone != NULL) -+ if (g_strcmp0 (clock_time->timezone_name, DEFAULT_TIMEZONE) != 0) - date_time = g_date_time_new_now (clock_time->timezone); - else - date_time = g_date_time_new_now_local (); --- -2.5.0 - diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch new file mode 100644 index 0000000000..1adb14552d --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch @@ -0,0 +1,60 @@ +From 0651f228cef01a6c3e4758a991cace1cd7721031 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 24 Sep 2012 09:57:46 +0200 +Subject: [PATCH] windowmenu: do not display desktop icon when no window is + active +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* desktop icon is of no use +* desktop icon confuses when using showdesktop plugin + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + 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 +--- a/plugins/windowmenu/windowmenu.c ++++ b/plugins/windowmenu/windowmenu.c +@@ -251,7 +251,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) + 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); + } +@@ -640,7 +640,7 @@ 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, + } + else + { +- show_desktop_icon: ++ show_no_icon: + + /* desktop is shown right now */ +- 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")); + } + } + } +-- +2.14.3 + diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch deleted file mode 100644 index b2d960c003..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0651f228cef01a6c3e4758a991cace1cd7721031 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 24 Sep 2012 09:57:46 +0200 -Subject: [PATCH] windowmenu: do not display desktop icon when no window is - active -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* desktop icon is of no use -* desktop icon confuses when using showdesktop plugin - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - plugins/windowmenu/windowmenu.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c -index c96123a..9404021 100644 ---- a/plugins/windowmenu/windowmenu.c -+++ b/plugins/windowmenu/windowmenu.c -@@ -256,7 +256,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) - g_signal_connect (G_OBJECT (plugin->button), "toggled", - G_CALLBACK (window_menu_plugin_menu), plugin); - -- plugin->icon = xfce_panel_image_new_from_source ("user-desktop"); -+ plugin->icon = xfce_panel_image_new_from_source (NULL); - gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon); - gtk_widget_show (plugin->icon); - } -@@ -634,7 +634,7 @@ 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), -@@ -648,11 +648,11 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, - } - else - { -- show_desktop_icon: -+ show_no_icon: - -- /* desktop is shown right now */ -- xfce_panel_image_set_from_source (icon, "user-desktop"); -- gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("Desktop")); -+ /* no icon is shown right now */ -+ xfce_panel_image_set_from_source (icon, NULL); -+ gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("No Windows")); - } - } - } --- -1.7.6.5 - diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb deleted file mode 100644 index 9cc9a4bbce..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Xfce4 Panel" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" -DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ gtk+3 dbus cairo virtual/libx11 libxml2 libwnck" - -inherit xfce gtk-doc distro_features_check gtk-icon-cache - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[md5sum] = "803c9aabc2925dc97f96de125c52ba2e" -SRC_URI[sha256sum] = "42058abb81b8f87691d3999627447de71c3285bcf055f308aab5cefab2de0ce9" -SRC_URI += " \ - file://0001-clock-time-make-change-of-system-s-timezone-change-t.patch \ - file://0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ -" - -EXTRA_OECONF += "--enable-gtk3" - -python populate_packages_prepend() { - plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') - plugin_name = d.expand('${PN}-plugin-%s') - do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, - '${PN} plugin for %s', extra_depends='', prepend=True, - aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop', - '${sysconfdir}/xdg/xfce/panel/%s-*', - '${datadir}/icons/hicolor/48x48/apps/*-%s.png', - '${bindir}/*%s*']) -} - -PACKAGES_DYNAMIC += "^${PN}-plugin-.*" - -PACKAGES =+ "${PN}-gtk3" - -FILES_${PN} += "${libdir}/xfce4/panel/migrate \ - ${libdir}/xfce4/panel/wrapper-1.0" - -FILES_${PN}-gtk3 = " \ - ${libdir}/libxfce4panel-2.0${SOLIBS} \ - ${libdir}/xfce4/panel/wrapper-2.0 \ -" -FILES_${PN}-dbg += " \ - ${libdir}/xfce4/panel/plugins/.debug \ -" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.3.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.3.bb new file mode 100644 index 0000000000..f1abf66755 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.3.bb @@ -0,0 +1,40 @@ +SUMMARY = "Xfce4 Panel" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" +DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ gtk+3 dbus cairo virtual/libx11 libxml2 libwnck3 vala-native" + +inherit xfce gtk-doc gobject-introspection distro_features_check gtk-icon-cache remove-libtool + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[md5sum] = "0ccb448e3792949eb0ae9db8dc22789b" +SRC_URI[sha256sum] = "b467feb7ee9797ad12f56a152570e42a96b94ad63580d45536aabee282440ce8" +SRC_URI += " \ + file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ +" + +python populate_packages_prepend() { + plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') + plugin_name = d.expand('${PN}-plugin-%s') + do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, + '${PN} plugin for %s', extra_depends='', prepend=True, + aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop', + '${sysconfdir}/xdg/xfce/panel/%s-*', + '${datadir}/icons/hicolor/48x48/apps/*-%s.png', + '${bindir}/*%s*']) +} + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*" + +PACKAGES =+ "${PN}-gtk3" + +FILES_${PN} += "${libdir}/xfce4/panel/migrate \ + ${libdir}/xfce4/panel/wrapper-1.0" + +FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" + +FILES_${PN}-gtk3 = " \ + ${libdir}/libxfce4panel-2.0${SOLIBS} \ + ${libdir}/xfce4/panel/wrapper-2.0 \ +" -- cgit v1.2.3