[gnome-build-meta/abderrahim/remove-clutter: 14/14] sdk: move clutter and friends to core-deps
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/remove-clutter: 14/14] sdk: move clutter and friends to core-deps
- Date: Wed, 14 Apr 2021 15:43:57 +0000 (UTC)
commit 479fbe83e40b9cb319f3cbabf0c33766a298415b
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Tue Apr 6 15:20:41 2021 +0100
sdk: move clutter and friends to core-deps
Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1092>
elements/core-deps.bst | 4 ++++
elements/{sdk => core-deps}/clutter-gst.bst | 4 ++--
elements/{sdk => core-deps}/clutter-gtk.bst | 2 +-
elements/{sdk => core-deps}/clutter.bst | 2 +-
elements/{sdk => core-deps}/cogl.bst | 0
elements/core-deps/libchamplain.bst | 4 ++--
elements/core/cheese.bst | 4 ++--
elements/core/gnome-maps.bst | 2 +-
elements/core/sushi.bst | 3 +++
elements/core/totem.bst | 6 +++---
elements/sdk-platform.bst | 4 ----
elements/world/bijiben.bst | 2 +-
elements/world/gnome-internet-radio-locator.bst | 4 ++--
elements/world/gnome-nibbles.bst | 4 ++--
elements/world/lightsoff.bst | 4 ++--
elements/world/quadrapassel.bst | 4 ++--
elements/world/retro-gtk.bst | 2 +-
elements/world/swell-foop.bst | 4 ++--
18 files changed, 31 insertions(+), 28 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index f2e36cf0..369cce03 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -13,6 +13,10 @@ depends:
- core-deps/berkeleydb.bst
- core-deps/boost.bst
- core-deps/cairomm-1.0.bst
+- core-deps/clutter-gst.bst
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
+- core-deps/cogl.bst
- core-deps/colord-gtk.bst
- core-deps/colord.bst
- core-deps/cups-pk-helper.bst
diff --git a/elements/sdk/clutter-gst.bst b/elements/core-deps/clutter-gst.bst
similarity index 91%
rename from elements/sdk/clutter-gst.bst
rename to elements/core-deps/clutter-gst.bst
index 412d20dd..c5e0c9ca 100644
--- a/elements/sdk/clutter-gst.bst
+++ b/elements/core-deps/clutter-gst.bst
@@ -7,8 +7,8 @@ build-depends:
- sdk/gtk-doc.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
-- sdk/clutter.bst
-- sdk/cogl.bst
+- core-deps/clutter.bst
+- core-deps/cogl.bst
- sdk/gdk-pixbuf.bst
- sdk/gst-plugins-base.bst
- freedesktop-sdk.bst:components/gstreamer.bst
diff --git a/elements/sdk/clutter-gtk.bst b/elements/core-deps/clutter-gtk.bst
similarity index 94%
rename from elements/sdk/clutter-gtk.bst
rename to elements/core-deps/clutter-gtk.bst
index cb6b9d9a..5d0f8a02 100644
--- a/elements/sdk/clutter-gtk.bst
+++ b/elements/core-deps/clutter-gtk.bst
@@ -9,7 +9,7 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
-- sdk/clutter.bst
+- core-deps/clutter.bst
- sdk/gtk+-3.bst
- freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/sdk/clutter.bst b/elements/core-deps/clutter.bst
similarity index 97%
rename from elements/sdk/clutter.bst
rename to elements/core-deps/clutter.bst
index 0657d3b2..b12639db 100644
--- a/elements/sdk/clutter.bst
+++ b/elements/core-deps/clutter.bst
@@ -8,7 +8,7 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- sdk/atk.bst
-- sdk/cogl.bst
+- core-deps/cogl.bst
- sdk/gdk-pixbuf.bst
- sdk/glib.bst
- sdk/gtk+-3.bst
diff --git a/elements/sdk/cogl.bst b/elements/core-deps/cogl.bst
similarity index 100%
rename from elements/sdk/cogl.bst
rename to elements/core-deps/cogl.bst
diff --git a/elements/core-deps/libchamplain.bst b/elements/core-deps/libchamplain.bst
index 17a559bb..d88b5e91 100644
--- a/elements/core-deps/libchamplain.bst
+++ b/elements/core-deps/libchamplain.bst
@@ -12,8 +12,8 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
-- sdk/clutter-gtk.bst
-- sdk/clutter.bst
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
- sdk/glib.bst
- sdk/gtk+-3.bst
- sdk/libsoup-2.4.bst
diff --git a/elements/core/cheese.bst b/elements/core/cheese.bst
index bca47a3a..7baef4c1 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -14,12 +14,12 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
+- core-deps/clutter-gst.bst
+- core-deps/clutter-gtk.bst
- core-deps/gnome-video-effects.bst
- core-deps/libcanberra.bst
- core/gnome-desktop.bst
- sdk/adwaita-icon-theme.bst
-- sdk/clutter-gst.bst
-- sdk/clutter-gtk.bst
- sdk/glib.bst
- sdk/gst-plugins-bad.bst
- sdk/gst-plugins-base.bst
diff --git a/elements/core/gnome-maps.bst b/elements/core/gnome-maps.bst
index 385f7271..c149b5f9 100644
--- a/elements/core/gnome-maps.bst
+++ b/elements/core/gnome-maps.bst
@@ -6,6 +6,7 @@ sources:
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
+- core-deps/clutter-gtk.bst
- core-deps/folks.bst
- core-deps/geocode-glib.bst
- core-deps/gfbgraph.bst
@@ -13,7 +14,6 @@ depends:
- core-deps/libchamplain.bst
- core/gnome-desktop.bst
- sdk/adwaita-icon-theme.bst
-- sdk/clutter-gtk.bst
- sdk/geoclue.bst
- sdk/gjs.bst
- sdk/glib-networking.bst
diff --git a/elements/core/sushi.bst b/elements/core/sushi.bst
index 5cc6687f..24d364e7 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -6,6 +6,9 @@ sources:
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
+- core-deps/clutter-gst.bst
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
- core-deps/libmusicbrainz.bst
- core/evince.bst
- sdk/gjs.bst
diff --git a/elements/core/totem.bst b/elements/core/totem.bst
index 8e60db69..34059b5e 100644
--- a/elements/core/totem.bst
+++ b/elements/core/totem.bst
@@ -15,15 +15,15 @@ build-depends:
- freedesktop-sdk.bst:components/itstool.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
+- core-deps/clutter-gst.bst
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
- core-deps/grilo-plugins.bst
- core-deps/grilo.bst
- core-deps/libpeas.bst
- core-deps/totem-pl-parser.bst
- core/gnome-desktop.bst
- sdk/adwaita-icon-theme.bst
-- sdk/clutter-gst.bst
-- sdk/clutter-gtk.bst
-- sdk/clutter.bst
- sdk/gdk-pixbuf.bst
- sdk/glib.bst
- sdk/gsettings-desktop-schemas.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 20674d8a..28ccecc4 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -7,10 +7,6 @@ depends:
- sdk/at-spi2-core.bst
- sdk/atk.bst
- sdk/cantarell-fonts.bst
-- sdk/clutter-gst.bst
-- sdk/clutter-gtk.bst
-- sdk/clutter.bst
-- sdk/cogl.bst
- sdk/enchant-2.bst
- sdk/fcitx.bst
- sdk/gcab.bst
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index 00530acb..c335e6ff 100644
--- a/elements/world/bijiben.bst
+++ b/elements/world/bijiben.bst
@@ -14,8 +14,8 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
+- core-deps/clutter-gtk.bst
- core-deps/evolution-data-server.bst
-- sdk/clutter-gtk.bst
- sdk/glib.bst
- sdk/gtk+-3.bst
- sdk/tracker.bst
diff --git a/elements/world/gnome-internet-radio-locator.bst b/elements/world/gnome-internet-radio-locator.bst
index a6868464..167c8455 100644
--- a/elements/world/gnome-internet-radio-locator.bst
+++ b/elements/world/gnome-internet-radio-locator.bst
@@ -6,11 +6,11 @@ sources:
build-depends:
- sdk/gtk-doc.bst
depends:
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
- core-deps/geocode-glib.bst
- core-deps/libchamplain.bst
- core/gnome-maps.bst
-- sdk/clutter-gtk.bst
-- sdk/clutter.bst
- sdk/glib.bst
- sdk/gst-plugins-bad.bst
- sdk/gst-plugins-base.bst
diff --git a/elements/world/gnome-nibbles.bst b/elements/world/gnome-nibbles.bst
index bbd5ab15..b51d6c38 100644
--- a/elements/world/gnome-nibbles.bst
+++ b/elements/world/gnome-nibbles.bst
@@ -11,9 +11,9 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
- core-deps/gsound.bst
-- sdk/clutter-gtk.bst
-- sdk/clutter.bst
- sdk/gtk+-3.bst
- sdk/libgee.bst
- sdk/librsvg.bst
diff --git a/elements/world/lightsoff.bst b/elements/world/lightsoff.bst
index 228e0a9c..f845b01b 100644
--- a/elements/world/lightsoff.bst
+++ b/elements/world/lightsoff.bst
@@ -11,8 +11,8 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
-- sdk/clutter-gtk.bst
-- sdk/clutter.bst
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
- sdk/gtk+-3.bst
- sdk/librsvg.bst
- freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/quadrapassel.bst b/elements/world/quadrapassel.bst
index 0ac9b666..a8ce18c3 100644
--- a/elements/world/quadrapassel.bst
+++ b/elements/world/quadrapassel.bst
@@ -11,9 +11,9 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
- core-deps/gsound.bst
-- sdk/clutter-gtk.bst
-- sdk/clutter.bst
- sdk/gtk+-3.bst
- sdk/librsvg.bst
- world/libmanette.bst
diff --git a/elements/world/retro-gtk.bst b/elements/world/retro-gtk.bst
index ab829033..94e6af7a 100644
--- a/elements/world/retro-gtk.bst
+++ b/elements/world/retro-gtk.bst
@@ -9,7 +9,7 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
-- sdk/clutter-gtk.bst
+- core-deps/clutter-gtk.bst
- sdk/glib.bst
- sdk/gtk+-3.bst
- freedesktop-sdk.bst:components/libpulse.bst
diff --git a/elements/world/swell-foop.bst b/elements/world/swell-foop.bst
index f08f1b33..b58a95b9 100644
--- a/elements/world/swell-foop.bst
+++ b/elements/world/swell-foop.bst
@@ -11,7 +11,7 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
-- sdk/clutter-gtk.bst
-- sdk/clutter.bst
+- core-deps/clutter-gtk.bst
+- core-deps/clutter.bst
- sdk/gtk+-3.bst
- freedesktop-sdk.bst:bootstrap-import.bst
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]