[gnome-build-meta/tchaik/avahi-0.8: 2/2] core-deps/avahi.bst: Prefer the Freedesktop SDK build

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 99a073aaea76989e539c0583c42d93c586edae5a
Author: Martin Blanchard <tchaik gmx com>
Date:   Tue Feb 18 21:13:11 2020 +0100

    core-deps/avahi.bst: Prefer the Freedesktop SDK build

 elements/boards/pinebook-pro/deps.bst |  2 +-
 elements/core-deps.bst                |  2 --
 elements/core-deps/avahi.bst          | 31 -------------------------------
 elements/core-deps/eos-updater.bst    |  2 +-
 elements/core-deps/libdaemon.bst      |  8 --------
 elements/core-deps/libostree.bst      |  2 +-
 elements/core-deps/phodav.bst         |  4 +++-
 elements/world/seahorse.bst           |  2 +-
 elements/world/telepathy-glib.bst     |  2 +-
 files/avahi/avahi.conf                |  1 -
 junction.refs                         |  2 +-
 11 files changed, 9 insertions(+), 49 deletions(-)
---
diff --git a/elements/boards/pinebook-pro/deps.bst b/elements/boards/pinebook-pro/deps.bst
index 22c1a5c2..48417be8 100644
--- a/elements/boards/pinebook-pro/deps.bst
+++ b/elements/boards/pinebook-pro/deps.bst
@@ -1,6 +1,7 @@
 kind: stack
 
 runtime-depends:
+- freedesktop-sdk.bst:components/avahi.bst
 - freedesktop-sdk.bst:components/util-linux.bst
 - freedesktop-sdk.bst:components/tzdata.bst
 - freedesktop-sdk.bst:components/systemd.bst
@@ -10,7 +11,6 @@ runtime-depends:
 
 - core-deps/flatpak.bst
 - vm/ostree-config.bst
-- core-deps/avahi.bst
 - core-deps/eos-updater.bst
 
 - vm/plymouth-gnome-theme.bst
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 599ee15f..10521719 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -9,7 +9,6 @@ depends:
 - core-deps/accountsservice.bst
 - core-deps/amtk.bst
 - core-deps/atkmm-1.6.bst
-- core-deps/avahi.bst
 - core-deps/babl.bst
 - core-deps/berkeleydb.bst
 - core-deps/blockdev.bst
@@ -56,7 +55,6 @@ depends:
 - core-deps/libcanberra.bst
 - core-deps/libchamplain.bst
 - core-deps/libcue.bst
-- core-deps/libdaemon.bst
 - core-deps/libdazzle.bst
 - core-deps/libgit2.bst
 - core-deps/libgit2-glib.bst
diff --git a/elements/core-deps/eos-updater.bst b/elements/core-deps/eos-updater.bst
index 1286d76d..403c9cef 100644
--- a/elements/core-deps/eos-updater.bst
+++ b/elements/core-deps/eos-updater.bst
@@ -6,11 +6,11 @@ sources:
 
 depends:
 - core-deps/NetworkManager.bst
-- core-deps/avahi.bst
 - core-deps/flatpak.bst
 - core-deps/mogwai.bst
 - core-deps/libostree.bst
 - sdk/gobject-introspection.bst
+- freedesktop-sdk.bst:components/avahi.bst
 - freedesktop-sdk.bst:components/gnupg.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
diff --git a/elements/core-deps/libostree.bst b/elements/core-deps/libostree.bst
index 3e782b96..39c7ac17 100644
--- a/elements/core-deps/libostree.bst
+++ b/elements/core-deps/libostree.bst
@@ -13,9 +13,9 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 
 depends:
-- core-deps/avahi.bst
 - sdk/glib.bst
 - sdk/libsoup.bst
+- freedesktop-sdk.bst:components/avahi.bst
 - freedesktop-sdk.bst:components/e2fsprogs.bst
 - freedesktop-sdk.bst:components/fuse.bst
 - freedesktop-sdk.bst:components/gpgme.bst
diff --git a/elements/core-deps/phodav.bst b/elements/core-deps/phodav.bst
index bd832940..18cbe932 100644
--- a/elements/core-deps/phodav.bst
+++ b/elements/core-deps/phodav.bst
@@ -9,9 +9,11 @@ build-depends:
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
-- core-deps/avahi.bst
 - sdk/glib.bst
 - sdk/libsoup.bst
 - freedesktop-sdk.bst:components/libgudev.bst
 - freedesktop-sdk.bst:components/systemd.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+variables:
+  meson-local: >-
+    -Davahi=disabled
diff --git a/elements/world/seahorse.bst b/elements/world/seahorse.bst
index ad1a72ee..dafa09ef 100644
--- a/elements/world/seahorse.bst
+++ b/elements/world/seahorse.bst
@@ -10,7 +10,6 @@ sources:
 runtime-depends:
 - sdk/adwaita-icon-theme.bst
 depends:
-- core-deps/avahi.bst
 - core-deps/libhandy.bst
 - core-deps/openldap.bst
 - sdk/gcr.bst
@@ -22,6 +21,7 @@ depends:
 - sdk/libsecret.bst
 - sdk/libsoup.bst
 - sdk/vala.bst
+- freedesktop-sdk.bst:components/avahi.bst
 - freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:components/pwquality.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/telepathy-glib.bst b/elements/world/telepathy-glib.bst
index 0144176d..cc380d79 100644
--- a/elements/world/telepathy-glib.bst
+++ b/elements/world/telepathy-glib.bst
@@ -7,11 +7,11 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 - sdk/gtk-doc.bst
 depends:
-- core-deps/avahi.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - sdk/vala.bst
 - world/dbus-glib.bst
+- freedesktop-sdk.bst:components/avahi.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   conf-local: >-
diff --git a/junction.refs b/junction.refs
index c5cca116..150d02bb 100644
--- a/junction.refs
+++ b/junction.refs
@@ -1,6 +1,6 @@
 projects:
   gnome:
     freedesktop-sdk.bst:
-    - ref: freedesktop-sdk-19.08beta.9-786-gd2831a6a14d9a4f7c4cce46d2e8f6e4db9420281
+    - ref: freedesktop-sdk-19.08beta.9-789-g8b8e2b3b280b01d79dc4aa1217b227cbaa464583
     openh264-extension.bst:
     - ref: openh264-2.0.0-3-32-gf855a9e434f18734cdb3bb8143d97f61de8e6add