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



commit eca38b0bb03ddf66ed5b12a229336adc88914cdf
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/core-deps.bst             |  1 -
 elements/core-deps/avahi.bst       | 30 ------------------------------
 elements/core-deps/eos-updater.bst |  2 +-
 elements/core-deps/ostree.bst      |  2 +-
 elements/core-deps/phodav.bst      |  2 +-
 elements/world/seahorse.bst        |  2 +-
 elements/world/telepathy-glib.bst  |  2 +-
 files/avahi/avahi.conf             |  1 -
 8 files changed, 5 insertions(+), 37 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 0667ce2d..6bf6fd46 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
diff --git a/elements/core-deps/eos-updater.bst b/elements/core-deps/eos-updater.bst
index 0638140a..3b573409 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/ostree.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/ostree.bst b/elements/core-deps/ostree.bst
index 56998d82..fa15ed23 100644
--- a/elements/core-deps/ostree.bst
+++ b/elements/core-deps/ostree.bst
@@ -14,9 +14,9 @@ build-depends:
 
 depends:
 - core-deps/fuse.bst
-- 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/gpgme.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/phodav.bst b/elements/core-deps/phodav.bst
index 0123108a..96f02838 100644
--- a/elements/core-deps/phodav.bst
+++ b/elements/core-deps/phodav.bst
@@ -9,9 +9,9 @@ build-depends:
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
-- core-deps/avahi.bst
 - core-deps/libgudev.bst
 - sdk/glib.bst
 - sdk/libsoup.bst
+- freedesktop-sdk.bst:components/avahi.bst
 - freedesktop-sdk.bst:components/systemd.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/seahorse.bst b/elements/world/seahorse.bst
index a665f732..ee2f90ab 100644
--- a/elements/world/seahorse.bst
+++ b/elements/world/seahorse.bst
@@ -11,7 +11,6 @@ runtime-depends:
 - sdk/adwaita-icon-theme.bst
 - sdk/cantarell-fonts.bst
 depends:
-- core-deps/avahi.bst
 - core-deps/libhandy.bst
 - core-deps/openldap.bst
 - sdk/gcr.bst
@@ -23,6 +22,7 @@ depends:
 - sdk/libsecret.bst
 - sdk/libsoup.bst
 - sdk/vala.bst
+- freedesktop-sdk.bst:components/avahi.bst
 - freedesktop-sdk.bst:components/itstools.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: >-


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]