[meta-gnome][PATCH 0/2] gnome-disk-utility: remove blacklist caused by avahi-ui

[meta-gnome][PATCH 0/2] gnome-disk-utility: remove blacklist caused by avahi-ui

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

gnome-disk-utility seems old and was only used by gvfs-gdu-volume-monitor which
has been removed by:

commit 52d0cb4348c2518af40d9019413ae046b9eb971b
Author: Andreas Müller <schnitzeltony@googlemail.com>
Date:   Sat Jan 9 22:47:20 2016 +0100

    gvfs: update to 1.24.2 to make access to windows shares work again

    * Our very old and heavily patched version was broken for windows shares by
      the update of samba to 4.x
    * Update to latest gvfs version (1.26.2 currently) is not possible due to
    | configure: error: Package requirements (glib-2.0 >= 2.45.7 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0) were not met:
    |
    | Requested 'glib-2.0 >= 2.45.7' but version of GLib is 2.44.1
    * Licence checksum changed by updating the address of the FSF [1]
    * obexftp support was removed in [2]
    * the gdu/circular dependency hack using very old gnome-disk-utility was solved
      by using udisk2 volume monitor
    * systemd-login detection was fixed
    * some more PACKAGECONFIGs disabled by default (all set -except 'cdda'- was
      build tested)

    [1] https://git.gnome.org/browse/gvfs/commit/?id=1e9c89eafaac6b3a759115df9981526fe9083461
    [2] https://git.gnome.org/browse/gvfs/commit/?id=606ef241fb8677528bd5d5526854658f0f298a2c

    Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>


This can fix the failure and return gnome-disk-utility back from blacklist,
but if there is any plan to remove it or upgrade it to 3.x, please ignore.

Thanks,
Jackie

--
The following changes since commit df5141af8dfd19c2b2dbfb65f58eda7a509fafd8:

  libssh2: upgrade to 1.7.0 (2016-07-29 11:01:02 +0200)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib.git jhuang0/d_gnome-disk-utility_160803_0
  http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_gnome-disk-utility_160803_0

Jackie Huang (2):
  meta-gnome/layer.conf: enable gtk for avahi-ui
  Revert "gnome-disk-utility: blacklist because of avahi-ui"

 meta-gnome/conf/layer.conf                                             | 2 ++
 .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb      | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

-- 
2.8.1

[meta-gnome][PATCH 1/2] meta-gnome/layer.conf: enable gtk for avahi-ui

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

avahi-ui enables gtk3 be default, but gnome-disk-utility
in meta-gnome needs gtk, so add gtk here.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta-gnome/conf/layer.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
index 58e12a9..fce5627 100644
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@@ -13,3 +13,5 @@ BBFILE_PRIORITY_gnome-layer = "7"
 LAYERVERSION_gnome-layer = "1"
 
 LAYERDEPENDS_gnome-layer = "core openembedded-layer"
+
+AVAHI_GTK_pn-avahi-ui = "gtk gtk3"
-- 
2.8.1

[meta-gnome][PATCH 2/2] Revert "gnome-disk-utility: blacklist because of avahi-ui"

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

This reverts commit 5cdb839fa676ccc738c749e9f4c7679080ee9f2d.

The issue is fixed by the following commits:
in oe-core: "71b3516 avahi-ui: use PACKAGECONFIG for gtk features"
in meta-gnome: "0e19635 meta-gnome/layer.conf: enable gtk for avahi-ui"

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
index b90fc3e..2f427e7 100644
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
@@ -35,6 +35,3 @@ FILES_${PN}-libs += "${libdir}/libgdu*.so.*"
 FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la"
 FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a"
 FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug"
-
-# http://errors.yoctoproject.org/Errors/Details/69555/
-PNBLACKLIST[gnome-disk-utility] ?= "BROKEN: fails to find avahi-ui even when it's in depends"
-- 
2.8.1