[gnome-build-meta/alatiera/move-canberra: 21/21] Move libcanberra from sdk to core-deps



commit a2fdde51f096ffa4ef8f7e4289636ca957449640
Author: Jordan Petridis <jordan centricular com>
Date:   Wed Mar 25 13:43:54 2020 +0200

    Move libcanberra from sdk to core-deps
    
    Nothing in the runtime depends on it, and its an old and deprecated
    project we dont really support anymore.

 elements/core-deps.bst                       | 1 +
 elements/core-deps/evolution-data-server.bst | 2 +-
 elements/core-deps/gsound.bst                | 2 +-
 elements/{sdk => core-deps}/libcanberra.bst  | 0
 elements/core/cheese.bst                     | 2 +-
 elements/core/gdm.bst                        | 2 +-
 elements/core/gnome-bluetooth.bst            | 2 +-
 elements/core/gnome-color-manager.bst        | 2 +-
 elements/core/gnome-screenshot.bst           | 2 +-
 elements/core/gnome-settings-daemon.bst      | 2 +-
 elements/sdk-platform.bst                    | 1 -
 elements/world/gnome-multi-writer.bst        | 2 +-
 12 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 0667ce2d..f3a311f2 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -49,6 +49,7 @@ depends:
 - core-deps/json-c.bst
 - core-deps/libatasmart.bst
 - core-deps/libbytesize.bst
+- core-deps/libcanberra.bst
 - core-deps/libchamplain.bst
 - core-deps/libcue.bst
 - core-deps/libdaemon.bst
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index 1bf7b279..cbe5c31a 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -9,6 +9,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 depends:
 - core-deps/gnome-online-accounts.bst
+- core-deps/libcanberra.bst
 - core-deps/libgdata.bst
 - core-deps/libgweather.bst
 - core-deps/libical.bst
@@ -16,7 +17,6 @@ depends:
 - sdk/WebKitGTK.bst
 - sdk/gcr.bst
 - sdk/gtk+-3.bst
-- sdk/libcanberra.bst
 - sdk/libsecret.bst
 - sdk/libsoup.bst
 - sdk/vala.bst
diff --git a/elements/core-deps/gsound.bst b/elements/core-deps/gsound.bst
index 0f9e8836..1d31eee5 100644
--- a/elements/core-deps/gsound.bst
+++ b/elements/core-deps/gsound.bst
@@ -10,7 +10,7 @@ build-depends:
 depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
-- sdk/libcanberra.bst
+- core-deps/libcanberra.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/libcanberra.bst b/elements/core-deps/libcanberra.bst
similarity index 100%
rename from elements/sdk/libcanberra.bst
rename to elements/core-deps/libcanberra.bst
diff --git a/elements/core/cheese.bst b/elements/core/cheese.bst
index 303bc0e5..a7be8412 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -10,6 +10,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/gnome-video-effects.bst
+- core-deps/libcanberra.bst
 - core-deps/libgudev.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
@@ -21,7 +22,6 @@ depends:
 - sdk/gst-plugins-base.bst
 - sdk/gst-plugins-good.bst
 - sdk/gtk+-3.bst
-- sdk/libcanberra.bst
 - sdk/librsvg.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gdm.bst b/elements/core/gdm.bst
index dd696723..6c5297e3 100644
--- a/elements/core/gdm.bst
+++ b/elements/core/gdm.bst
@@ -12,10 +12,10 @@ depends:
 - core-deps/accountsservice.bst
 - core-deps/upower.bst
 - core-deps/plymouth.bst
+- core-deps/libcanberra.bst
 - sdk/dconf.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/libcanberra.bst
 - sdk/yelp-tools.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
diff --git a/elements/core/gnome-bluetooth.bst b/elements/core/gnome-bluetooth.bst
index e03ac548..298b0cef 100644
--- a/elements/core/gnome-bluetooth.bst
+++ b/elements/core/gnome-bluetooth.bst
@@ -11,9 +11,9 @@ build-depends:
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
+- core-deps/libcanberra.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/libcanberra.bst
 - sdk/libnotify.bst
 - freedesktop-sdk.bst:components/systemd.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-color-manager.bst b/elements/core/gnome-color-manager.bst
index c53d5f54..e619d90d 100644
--- a/elements/core/gnome-color-manager.bst
+++ b/elements/core/gnome-color-manager.bst
@@ -9,12 +9,12 @@ depends:
 - core-deps/colord-gtk.bst
 - core-deps/exiv2.bst
 - core-deps/vte.bst
+- core-deps/libcanberra.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/libcanberra.bst
 - freedesktop-sdk.bst:components/itstools.bst
 - freedesktop-sdk.bst:components/libexif.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-screenshot.bst b/elements/core/gnome-screenshot.bst
index ca37949c..f385cdb5 100644
--- a/elements/core/gnome-screenshot.bst
+++ b/elements/core/gnome-screenshot.bst
@@ -6,9 +6,9 @@ sources:
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
+- core-deps/libcanberra.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/libcanberra.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-settings-daemon.bst b/elements/core/gnome-settings-daemon.bst
index 3a5c618c..48494168 100644
--- a/elements/core/gnome-settings-daemon.bst
+++ b/elements/core/gnome-settings-daemon.bst
@@ -16,6 +16,7 @@ depends:
 - core-deps/NetworkManager.bst
 - core-deps/colord.bst
 - core-deps/geocode-glib.bst
+- core-deps/libcanberra.bst
 - core-deps/libgudev.bst
 - core-deps/libgweather.bst
 - core-deps/libwacom.bst
@@ -27,7 +28,6 @@ depends:
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
 - sdk/ibus.bst
-- sdk/libcanberra.bst
 - sdk/libnotify.bst
 - freedesktop-sdk.bst:components/alsa-lib.bst
 - freedesktop-sdk.bst:components/cups.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index bda95fe7..ed367a54 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -36,7 +36,6 @@ depends:
 - sdk/ibus.bst
 - sdk/json-glib.bst
 - sdk/krb5.bst
-- sdk/libcanberra.bst
 - sdk/libgee.bst
 - sdk/libnotify.bst
 - sdk/librsvg.bst
diff --git a/elements/world/gnome-multi-writer.bst b/elements/world/gnome-multi-writer.bst
index 7d2689cc..cd9fde9c 100644
--- a/elements/world/gnome-multi-writer.bst
+++ b/elements/world/gnome-multi-writer.bst
@@ -10,8 +10,8 @@ build-depends:
 depends:
 - core-deps/libgusb.bst
 - core-deps/udisks2.bst
+- core-deps/libcanberra.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
-- sdk/libcanberra.bst
 - freedesktop-sdk.bst:bootstrap-import.bst


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