diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-xfce/recipes-xfce | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
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 <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-xfce/recipes-xfce')
19 files changed, 121 insertions, 147 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.3.bb index d256b5769..9c4829bbf 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.3.bb @@ -20,8 +20,8 @@ SRC_URI_append_class-native = " \ file://reduce-build-to-exo-csource-only.patch \ " -SRC_URI[md5sum] = "724afcca224f5fb22b510926d2740e52" -SRC_URI[sha256sum] = "64b88271a37d0ec7dca062c7bc61ca323116f7855092ac39698c421a2f30a18f" +SRC_URI[md5sum] = "da934c5939f2ee4540f5d48991053f01" +SRC_URI[sha256sum] = "b96fe86bb504aa9b3332b96105d755f5d9052c903fd6574b512a5ef76c0ad439" PACKAGES =+ "exo-csource" @@ -31,9 +31,6 @@ FILES_${PN} += "${datadir}/xfce4/ \ ${libdir}/xfce4/exo-1 \ " -FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \ -" - FILES_exo-csource += "${bindir}/exo-csource" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb index ef4f4bfa8..805e893f7 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb @@ -21,10 +21,10 @@ FILES_${PN} += "${libdir}/gtk-2.0/*/engines/*.so" FILES_gtk3-xfce-engine += "${libdir}/gtk-3.0/*/theming-engines/*.so" FILES_${PN}-themes += "${datadir}/themes" -FILES_${PN}-dbg += "${libdir}/gtk-3.0/*/theming-engines/.debug \ - ${libdir}/gtk-2.0/*/engines/.debug" -FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la \ - ${libdir}/gtk-3.0/*/theming-engines/*.la" +FILES_${PN}-dev += " \ + ${libdir}/gtk-2.0/*/engines/*.la \ + ${libdir}/gtk-3.0/*/theming-engines/*.la \ +" RDEPENDS_${PN} += "${PN}-themes" RDEPENDS_gtk3-xfce-engine += "${PN}-themes" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb index 4843e0ee8..8a385baeb 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb @@ -4,15 +4,15 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" DEPENDS = "perl-native glib-2.0 gtk+ gtk+3 intltool-native libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice" -inherit xfce autotools gettext gtk-doc distro_features_check +inherit xfce autotools gettext gtk-doc gobject-introspection distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " \ file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ " -SRC_URI[md5sum] = "ea9fad7d059fe8f531fe8db42dabb5a9" -SRC_URI[sha256sum] = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43" +SRC_URI[md5sum] = "b407cdab73ebd5c33c90db6bdb3ec5ff" +SRC_URI[sha256sum] = "d63fcdb8e5acb6f0d26075ea17d320dbfbec2058567cd67cb99824c7402a1f79" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" @@ -24,9 +24,6 @@ PACKAGES =+ "${PN}-gtk2 ${PN}-gtk3" FILES_${PN}-gtk2 += "${libdir}/libxfce4ui-1.so.* ${libdir}/libxfce4kbd-private-2.so.*" FILES_${PN}-gtk3 += "${libdir}/libxfce4ui-2.so.* ${libdir}/libxfce4kbd-private-3.so.*" -FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug" -FILES_${PN}-dev += "${libdir}/glade3/modules/*.la \ - ${datadir}/glade3/catalogs/*.in" PACKAGES += "${PN}-glade" FILES_${PN}-glade = "${libdir}/glade3 \ ${datadir}/glade3" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.2.bb index d985a0024..21cc1dbfc 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.12.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.2.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" -inherit xfce gtk-doc +inherit xfce gtk-doc gobject-introspection -SRC_URI[md5sum] = "4eb012b6c1292ceedb3a83ebfc1ff08d" -SRC_URI[sha256sum] = "876bdefa2e13cbf68b626b2158892fb93e824e1ef59cf951123a96cefbc8881d" +SRC_URI[md5sum] = "e3e8b9dd7e12028d3e642345b85d6ef1" +SRC_URI[sha256sum] = "c58275ff650080369e742695862c811cb78402c85f243ea0b5aec186027be361" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index b73c9ee16..5f8c03cc5 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -56,6 +56,7 @@ RRECOMMENDS_${PN} = " \ xfce4-verve-plugin \ \ xfce-polkit \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "blueman", "", d)} \ \ thunar-media-tags-plugin \ thunar-archive-plugin \ @@ -67,4 +68,7 @@ RRECOMMENDS_${PN} = " \ ristretto \ xfce4-taskmanager \ gigolo \ + mousepad \ + catfish \ + xfce4-panel-profiles \ " diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch deleted file mode 100644 index 7233ea7ba..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2e295e9ce8f7f60a271adf004588b0d8db88db09 Mon Sep 17 00:00:00 2001 -From: Matt Thirtytwo <matt.59491@gmail.com> -Date: Sat, 7 Mar 2015 22:50:32 +0100 -Subject: [PATCH] Fix return with no value in function returning non-void (bug - #11656) - ---- - thunar-volman/tvm-block-device.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c -index da31efa..edb6cad 100644 ---- a/thunar-volman/tvm-block-device.c -+++ b/thunar-volman/tvm-block-device.c -@@ -714,7 +714,7 @@ tvm_block_device_mount (TvmContext *context) - GMountOperation *mount_operation; - GVolume *volume; - -- g_return_if_fail (context != NULL); -+ g_return_val_if_fail ((context != NULL), FALSE); - - /* determine the GVolume corresponding to the udev device */ - volume = --- -1.9.0 - diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.0.bb index c61d4512d..5a37b69bd 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.0.bb @@ -2,15 +2,14 @@ SUMMARY = "Automatic management of removable drives and media for thunar" SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo glib-2.0 gtk+ libxfce4ui libxfce4util xfconf libnotify libgudev" +DEPENDS = "exo glib-2.0 libxfce4ui libxfce4util xfconf libnotify libgudev" inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += "file://0001-Fix-return-with-no-value-in-function-returning-non-v.patch" -SRC_URI[md5sum] = "65ab6e05b2e808d1dcc8d36683a59b7e" -SRC_URI[sha256sum] = "5a08bb5ce32c296a64dfbdb2406d4e45a208b2c91e4efa831dc28f1d6c2ac2bd" +SRC_URI[md5sum] = "3b403a4f846927391ea4bee765a055df" +SRC_URI[sha256sum] = "e4bffcfee15530e277fa80865eb1de31e63c7effaf8835c9fa7c71e5a0076b2e" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.2.bb index 170e25070..d2a0e30c5 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.2.bb @@ -2,15 +2,15 @@ SUMMARY = "File manager for the Xfce Desktop Environment" SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo glib-2.0 gtk+ gdk-pixbuf libxfce4util libxfce4ui xfconf libsm dbus-glib startup-notification libnotify xfce4-panel udev" +DEPENDS = "exo glib-2.0 gtk+3 gdk-pixbuf libxfce4util libxfce4ui xfconf libsm dbus-glib startup-notification libnotify xfce4-panel udev" -inherit xfce distro_features_check +inherit xfce gobject-introspection distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" -SRC_URI[md5sum] = "8fea2af69c3acbb273fd1a177d3d8e47" -SRC_URI[sha256sum] = "e81291a8519f495e0a059ff1f2d29608bc6d37c0be83b1f38f3c9aa25f8d252d" +SRC_URI[md5sum] = "51a0988625a7e2c944377e75d3effc71" +SRC_URI[sha256sum] = "75f91045541eb5983e772a564d97f23e5995256bfb9863e0f4a015393421d428" S = "${WORKDIR}/Thunar-${PV}/" @@ -18,18 +18,15 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" FILES_${PN} += " \ - ${libdir}/thunarx-2/* \ + ${libdir}/thunarx-3/* \ ${libdir}/xfce4/panel/plugins/* \ ${libdir}/Thunar/[Tt]hunar* \ - ${datadir}/appdata \ + ${systemd_user_unitdir} \ ${datadir}/dbus-1 \ + ${datadir}/metainfo \ ${datadir}/polkit-1 \ ${datadir}/Thunar \ ${datadir}/xfce4/panel/plugins/* \ " -FILES_${PN}-dbg += "${libdir}/thunarx-2/.debug/ \ - ${libdir}/xfce4/panel/plugins/.debug/ \ - ${libdir}/Thunar/.debug/" - RRECOMMENDS_${PN} = "gvfs gvfsd-trash" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb index 7e0c555a4..9d2669475 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb @@ -28,8 +28,5 @@ FILES_${PN} += "${datadir}/dbus-1/services \ " FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ - ${libdir}/tumbler-1/plugins/cache/*.la" -FILES_${PN}-dbg += "${libdir}/tumbler-1/.debug \ - ${libdir}/tumbler-1/plugins/.debug \ - ${libdir}/tumbler-1/plugins/cache/.debug \ + ${libdir}/tumbler-1/plugins/cache/*.la \ " diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.1.bb index 7e7391167..0336f54ba 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.1.bb @@ -8,7 +8,7 @@ inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "6b6cf080c891f7945953f8084a901552" -SRC_URI[sha256sum] = "c0eb3b29eba3cfa9175ed35174e83a21faa2a2423ddb79501fe8846cc430e3ae" +SRC_URI[md5sum] = "9e2a1f9b4ae3183c461b79891224c33f" +SRC_URI[sha256sum] = "5cabb27bbe0a0864b785e1a38535a91516763e38d6bff41a3915a61d28254b03" FILES_${PN} += "${datadir}/appdata" 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 9dca3ba57..000000000 --- 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?= <schnitzeltony@googlemail.com> -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 <schnitzeltony@googlemail.com> ---- - 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/0002-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 index b2d960c00..1adb14552 100644 --- 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/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch @@ -14,23 +14,23 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- - plugins/windowmenu/windowmenu.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + 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 c96123a..9404021 100644 +index f47e993e..061d6544 100644 --- a/plugins/windowmenu/windowmenu.c +++ b/plugins/windowmenu/windowmenu.c -@@ -256,7 +256,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) +@@ -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 = xfce_panel_image_new_from_source ("user-desktop"); -+ plugin->icon = xfce_panel_image_new_from_source (NULL); +- 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); } -@@ -634,7 +634,7 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, +@@ -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) @@ -39,22 +39,22 @@ index c96123a..9404021 100644 /* 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, +@@ -660,12 +660,12 @@ 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"); + /* 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")); -+ /* 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 +2.14.3 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.13.3.bb index 9cc9a4bbc..f1abf6675 100644 --- 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.13.3.bb @@ -2,21 +2,18 @@ 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" +DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ gtk+3 dbus cairo virtual/libx11 libxml2 libwnck3 vala-native" -inherit xfce gtk-doc distro_features_check gtk-icon-cache +inherit xfce gtk-doc gobject-introspection distro_features_check gtk-icon-cache remove-libtool REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "803c9aabc2925dc97f96de125c52ba2e" -SRC_URI[sha256sum] = "42058abb81b8f87691d3999627447de71c3285bcf055f308aab5cefab2de0ce9" +SRC_URI[md5sum] = "0ccb448e3792949eb0ae9db8dc22789b" +SRC_URI[sha256sum] = "b467feb7ee9797ad12f56a152570e42a96b94ad63580d45536aabee282440ce8" 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 \ + file://0001-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') @@ -35,10 +32,9 @@ 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 \ " -FILES_${PN}-dbg += " \ - ${libdir}/xfce4/panel/plugins/.debug \ -" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb index a24720603..b11aaa4fe 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb @@ -2,18 +2,18 @@ SUMMARY = "xfce4-session is a session manager for Xfce 4 Desktop Environment" SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" -DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf polkit" +DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck3 dbus dbus-glib xfconf polkit" RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth upower" inherit xfce update-alternatives distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "f4921fb2e606e74643daf1212263076c" -SRC_URI[sha256sum] = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd" SRC_URI += " \ file://0001-configure.in-hard-code-path-to-iceauth.patch \ " +SRC_URI[md5sum] = "a47988a2c871a411c19e3af1eefe591e" +SRC_URI[sha256sum] = "c789f0f8234e06f5266f0c6ccdbdcc3c085e8d9eea06a0eafe8f7cfc4fe23af4" ALTERNATIVE_${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" @@ -27,6 +27,8 @@ FILES_${PN} += " \ ${datadir}/polkit-1 \ " -FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug" +FILES_${PN} += " \ + ${libdir}/xfce4/session/splash-engines/*.la \ +" RDEPENDS_${PN} += "machine-host" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch new file mode 100644 index 000000000..109b7b145 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch @@ -0,0 +1,41 @@ +From b6e46e6a84e45f7bd954687be703987825a54c1e Mon Sep 17 00:00:00 2001 +From: Eric Koegel <eric.koegel@gmail.com> +Date: Sun, 11 Jun 2017 11:38:26 +0300 +Subject: [PATCH] Fix linking to dbus-glib (bug #13633) + +With xfconf moving to GDBus nothing provides the libs for dbus-glib +that xfce4-settings requires. This patch adds the libs back in until +settings can be ported to GDBus. + +Signed-off-by: Sean Davis <smd.seandavis@gmail.com> + +Upstream-Status: Backport +--- + xfce4-settings-editor/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/xfce4-settings-editor/Makefile.am b/xfce4-settings-editor/Makefile.am +index 5964366..c2c7c4b 100644 +--- a/xfce4-settings-editor/Makefile.am ++++ b/xfce4-settings-editor/Makefile.am +@@ -28,6 +28,7 @@ xfce4_settings_editor_CFLAGS = \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ + $(XFCONF_CFLAGS) \ ++ $(DBUS_GLIB_CFLAGS) \ + $(PLATFORM_CFLAGS) + + xfce4_settings_editor_LDFLAGS = \ +@@ -39,7 +40,8 @@ xfce4_settings_editor_LDADD = \ + $(DBUS_GLIB_LIBS) \ + $(LIBXFCE4UTIL_LIBS) \ + $(LIBXFCE4UI_LIBS) \ +- $(XFCONF_LIBS) ++ $(XFCONF_LIBS) \ ++ $(DBUS_GLIB_LIBS) + + desktopdir = $(datadir)/applications + desktop_in_files = xfce4-settings-editor.desktop.in +-- +2.14.3 + diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb index bf9bd3102..a4685aed3 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb @@ -13,12 +13,13 @@ REQUIRED_DISTRO_FEATURES = "x11" # + minor bugfixes - sent mainline but no response # + option to hide mousepointer for a specific (touch) input device - sent mainline but no response SRC_URI = " \ - git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.3 \ + git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.4 \ file://0001-xsettings.xml-Set-default-themes.patch \ + file://0002-Fix-linking-to-dbus-glib-bug-13633.patch \ " -SRCREV = "b701ac8b66b83c17469dd5009da51eeb59eba442" +SRCREV = "75d7c9b15e5ccce12b0864d3659ae9b6de96e245" S = "${WORKDIR}/git" -PV = "4.12.3+git${SRCPV}" +PV = "4.12.4+git${SRCPV}" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb index a42426fa1..2667ff947 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.12.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb @@ -8,8 +8,11 @@ inherit xfce gtk-doc EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" -SRC_URI[md5sum] = "20dc8d2bfd80ba136bf4964021b32757" -SRC_URI[sha256sum] = "35f48564e5694faa54fdc180cd3268e16fc2352946a89a3c2fc12cbe400ada36" +SRC_URI[md5sum] = "da19df12dbc494c8a4da3974e376d639" +SRC_URI[sha256sum] = "d1a3d442dae188b5a7380b5815377e5488578cdafb03ae363e9426e3b01185df" FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ + ${libdir}/gio/modules/libxfconfgsettingsbackend.so \ ${datadir}/dbus-1/services/org.xfce.Xfconf.service" + +FILES_${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.2.bb index d9cbe7196..85696a193 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.4.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.2.bb @@ -2,14 +2,14 @@ SUMMARY = "Xfce4 Desktop Manager" SECTION = "x11/base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "glib-2.0 gtk+ libxfce4util libxfce4ui libwnck xfconf dbus-glib dbus-glib-native thunar garcon exo" +DEPENDS = "libxfce4util libxfce4ui libwnck xfconf dbus-glib dbus-glib-native thunar garcon exo" inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "7571889368be72df185ce2d470f37198" -SRC_URI[sha256sum] = "098a35510562907e1431d5adbfa8307484a235c1dec6a43e2d58d2ac4241f1cb" +SRC_URI[md5sum] = "c05569c1c39ccd314fb5da20d5086909" +SRC_URI[sha256sum] = "387f43d8a4615f44060c019cad212ac12df62c58eea2605813743116f71ad3bd" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.1.bb index 2aa68e3fd..64ad9f64e 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.1.bb @@ -2,14 +2,24 @@ DESCRIPTION="Xfce4 Window Manager" SECTION = "x11/wm" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification exo-native" +DEPENDS = "virtual/libx11 libxfce4util libxfce4ui xfconf libwnck3 dbus-glib libxinerama exo-native" inherit xfce update-alternatives distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "3ec136efc5387fd3b53cd66b684f52d7" -SRC_URI[sha256sum] = "fa74048a75649a6e92df763a3cfb706d3fed1e1a6adf567f6693325a5a6efb36" +SRC_URI[md5sum] = "1a78bcc2100c03f6fea0dbce0ca813cf" +SRC_URI[sha256sum] = "75ebc20d313cff4905e76fc320254c30461dbfa985461b8e75dca04770cedf12" + +PACKAGECONFIG ?= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ + xpresent \ + startup-notification \ +" + +PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy" +PACKAGECONFIG[xpresent] = "--enable-xpresent,--disable-xpresent,libxpresent" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" python populate_packages_prepend () { themedir = d.expand('${datadir}/themes') @@ -26,5 +36,3 @@ RDEPENDS_${PN} = "xfwm4-theme-default" FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ ${datadir}/xfwm4/defaults \ " -FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" - |