[gnome-build-meta/abderrahim/misc] misc fixes to dependencies




commit 27f506e57531d4273e5368c7581fdef4b96e755b
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Wed Mar 10 17:09:48 2021 +0100

    misc fixes to dependencies
    
    - make various build tools build dependencies
    - remove git-minimal as it's now part of buildsystem-meson
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1060>

 elements/core-deps/NetworkManager.bst        | 10 +++++-----
 elements/core-deps/accountsservice.bst       |  2 +-
 elements/core-deps/babl.bst                  |  1 -
 elements/core-deps/colord-gtk.bst            |  2 +-
 elements/core-deps/evolution-data-server.bst |  2 +-
 elements/core-deps/folks.bst                 |  4 ++--
 elements/core-deps/fwupd.bst                 | 20 ++++++++++----------
 elements/core-deps/gegl.bst                  |  4 ++--
 elements/core-deps/gnome-autoar.bst          |  2 +-
 elements/core-deps/grilo.bst                 |  4 ++--
 elements/core-deps/gsound.bst                |  4 ++--
 elements/core-deps/gssdp.bst                 |  2 +-
 elements/core-deps/gst-editing-services.bst  |  2 --
 elements/core-deps/gtk-vnc.bst               |  2 +-
 elements/core-deps/gupnp-av.bst              |  1 +
 elements/core-deps/gupnp.bst                 |  1 +
 elements/core-deps/jsonrpc-glib.bst          |  4 ++--
 elements/core-deps/libdazzle.bst             |  4 ++--
 elements/core-deps/libgit2-glib.bst          |  4 ++--
 elements/core-deps/libgusb.bst               |  4 ++--
 elements/core-deps/libnma.bst                |  3 ++-
 elements/core-deps/libosinfo.bst             |  4 ++--
 elements/core-deps/libpeas.bst               |  2 +-
 elements/core-deps/libvirt-glib.bst          |  4 ++--
 elements/core-deps/malcontent.bst            |  3 +--
 elements/core-deps/mogwai.bst                |  2 --
 elements/core-deps/phodav.bst                |  3 +--
 elements/core-deps/template-glib.bst         |  4 ++--
 elements/core/baobab.bst                     |  4 ++--
 elements/core/cheese.bst                     |  2 +-
 elements/core/dconf-editor.bst               |  4 ++--
 elements/core/devhelp.bst                    |  4 ++--
 elements/core/epiphany.bst                   |  4 ++--
 elements/core/gdm.bst                        |  2 +-
 elements/core/gedit.bst                      |  3 +--
 elements/core/gnome-calculator.bst           |  6 +++---
 elements/core/gnome-calendar.bst             |  2 +-
 elements/core/gnome-characters.bst           |  2 +-
 elements/core/gnome-clocks.bst               |  4 ++--
 elements/core/gnome-color-manager.bst        |  4 ++--
 elements/core/gnome-contacts.bst             |  3 ++-
 elements/core/gnome-disk-utility.bst         |  2 +-
 elements/core/gnome-logs.bst                 |  2 +-
 elements/core/gnome-photos.bst               |  1 -
 elements/core/gnome-screenshot.bst           |  2 +-
 elements/core/gnome-user-docs.bst            |  2 +-
 elements/core/gnome-weather.bst              |  2 +-
 elements/core/rygel.bst                      | 10 +++++-----
 elements/core/simple-scan.bst                |  4 ++--
 elements/core/sysprof.bst                    |  1 -
 elements/core/totem.bst                      |  2 +-
 elements/sdk/at-spi2-core.bst                |  4 ++--
 elements/sdk/atk.bst                         |  2 +-
 elements/sdk/clutter-gst.bst                 |  2 +-
 elements/sdk/clutter.bst                     |  2 +-
 elements/sdk/cogl.bst                        |  2 +-
 elements/sdk/gcab.bst                        |  3 +--
 elements/sdk/gtk+-3.bst                      |  2 +-
 elements/sdk/gtk.bst                         | 12 ++++++------
 elements/sdk/libgee.bst                      |  2 +-
 elements/sdk/libhandy.bst                    |  2 +-
 elements/sdk/libnotify.bst                   |  2 +-
 elements/sdk/librsvg.bst                     |  2 +-
 elements/sdk/libsecret.bst                   |  2 +-
 elements/sdk/pango.bst                       |  2 +-
 elements/sdk/tracker.bst                     |  4 ++--
 elements/sdk/yelp.bst                        |  2 +-
 elements/sdk/zenity.bst                      |  2 +-
 elements/vm/toolbox.bst                      |  3 +--
 elements/world.bst                           | 18 +++++++-----------
 elements/world/accerciser.bst                |  6 +++---
 elements/world/bijiben.bst                   |  6 +++---
 elements/world/evolution.bst                 |  3 ++-
 elements/world/five-or-more.bst              |  4 ++--
 elements/world/four-in-a-row.bst             |  4 ++--
 elements/world/geary.bst                     |  2 +-
 elements/world/gitg.bst                      | 10 +++++++---
 elements/world/gnome-chess.bst               |  6 +++---
 elements/world/gnome-devel-docs.bst          |  2 +-
 elements/world/gnome-documents.bst           |  1 -
 elements/world/gnome-klotski.bst             |  2 +-
 elements/world/gnome-mahjongg.bst            |  6 +++---
 elements/world/gnome-mines.bst               |  6 +++---
 elements/world/gnome-nibbles.bst             |  6 +++---
 elements/world/gnome-robots.bst              |  4 ++--
 elements/world/gnome-sudoku.bst              |  6 +++---
 elements/world/gnome-taquin.bst              |  7 ++++---
 elements/world/gnome-todo.bst                |  2 +-
 elements/world/hitori.bst                    |  4 ++--
 elements/world/iagno.bst                     |  6 +++---
 elements/world/libhandy-0.bst                |  2 +-
 elements/world/libmanette.bst                |  4 ++--
 elements/world/lightsoff.bst                 |  6 +++---
 elements/world/pinhole.bst                   |  1 -
 elements/world/polari.bst                    | 10 +++++++---
 elements/world/quadrapassel.bst              |  6 +++---
 elements/world/retro-gtk.bst                 |  2 +-
 elements/world/seahorse.bst                  |  6 +++---
 elements/world/swell-foop.bst                |  6 +++---
 elements/world/telepathy-glib.bst            |  6 +++---
 100 files changed, 192 insertions(+), 196 deletions(-)
---
diff --git a/elements/core-deps/NetworkManager.bst b/elements/core-deps/NetworkManager.bst
index 732e0fcb..f12439cc 100644
--- a/elements/core-deps/NetworkManager.bst
+++ b/elements/core-deps/NetworkManager.bst
@@ -4,19 +4,19 @@ sources:
   url: gnome_downloads:NetworkManager/1.30/NetworkManager-1.30.0.tar.xz
 build-depends:
 - core-deps/intltool.bst
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 - freedesktop-sdk.bst:components/systemd.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
-- core-deps/glibmm-2.4.bst
 - core-deps/ModemManager.bst
+- core-deps/glibmm-2.4.bst
 - core-deps/mobile-broadband-provider-info.bst
 - core-deps/ppp.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/pygobject.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:components/curl.bst
 - freedesktop-sdk.bst:components/dbus.bst
 - freedesktop-sdk.bst:components/gnutls.bst
@@ -24,8 +24,8 @@ depends:
 - freedesktop-sdk.bst:components/libgudev.bst
 - freedesktop-sdk.bst:components/libndp.bst
 - freedesktop-sdk.bst:components/libpsl.bst
-- freedesktop-sdk.bst:components/polkit.bst
 - freedesktop-sdk.bst:components/nss.bst
+- freedesktop-sdk.bst:components/polkit.bst
 - freedesktop-sdk.bst:components/systemd-libs.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
diff --git a/elements/core-deps/accountsservice.bst b/elements/core-deps/accountsservice.bst
index e2d59441..548be401 100644
--- a/elements/core-deps/accountsservice.bst
+++ b/elements/core-deps/accountsservice.bst
@@ -3,11 +3,11 @@ sources:
 - kind: tar
   url: https://www.freedesktop.org/software/accountsservice/accountsservice-0.6.55.tar.xz
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - freedesktop-sdk.bst:components/dbus.bst
 - freedesktop-sdk.bst:components/polkit.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/babl.bst b/elements/core-deps/babl.bst
index 977d8548..19b0caca 100644
--- a/elements/core-deps/babl.bst
+++ b/elements/core-deps/babl.bst
@@ -7,7 +7,6 @@ sources:
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/vala.bst
-- freedesktop-sdk.bst:components/git-minimal.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
diff --git a/elements/core-deps/colord-gtk.bst b/elements/core-deps/colord-gtk.bst
index e50144a7..90adbe6c 100644
--- a/elements/core-deps/colord-gtk.bst
+++ b/elements/core-deps/colord-gtk.bst
@@ -4,13 +4,13 @@ sources:
   url: https://www.freedesktop.org/software/colord/releases/colord-gtk-0.2.0.tar.xz
 build-depends:
 - sdk/gtk-doc.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/colord.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index 4c20f8b1..e6e1614d 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -7,6 +7,7 @@ sources:
 
 build-depends:
 - core-deps/intltool.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:components/gperf.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 
@@ -20,7 +21,6 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libsecret.bst
 - sdk/libsoup-2.4.bst
-- sdk/vala.bst
 - sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/libical.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/folks.bst b/elements/core-deps/folks.bst
index 28b911b3..dd53d17b 100644
--- a/elements/core-deps/folks.bst
+++ b/elements/core-deps/folks.bst
@@ -6,14 +6,14 @@ sources:
   track: master
 
 build-depends:
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:components/python3-dbusmock.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/evolution-data-server.bst
-- sdk/gobject-introspection.bst
 - sdk/libgee.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
 variables:
diff --git a/elements/core-deps/fwupd.bst b/elements/core-deps/fwupd.bst
index a144e6d8..964e15a8 100644
--- a/elements/core-deps/fwupd.bst
+++ b/elements/core-deps/fwupd.bst
@@ -5,24 +5,23 @@ sources:
   url: github_com:fwupd/fwupd/archive/1.4.4.tar.gz
 
 build-depends:
-- sdk/gtk-doc.bst
 - sdk/gobject-introspection.bst
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
-- freedesktop-sdk.bst:components/systemd.bst
-- freedesktop-sdk.bst:components/git-minimal.bst
+- sdk/gtk-doc.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:components/cmake.bst
-- freedesktop-sdk.bst:components/polkit.bst
 - freedesktop-sdk.bst:components/help2man.bst
 - freedesktop-sdk.bst:components/liberation-fonts.bst
+- freedesktop-sdk.bst:components/systemd.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- sdk/pygobject.bst
-- sdk/libsoup-2.4.bst
-- sdk/glib.bst
-- sdk/pango.bst
-- sdk/gcab.bst
 - core-deps/libjcat.bst
 - core-deps/xmlb.bst
+- sdk/gcab.bst
+- sdk/glib.bst
+- sdk/libsoup-2.4.bst
+- sdk/pango.bst
+- sdk/pygobject.bst
 - freedesktop-sdk.bst:components/cairo.bst
 - freedesktop-sdk.bst:components/efivar.bst
 - freedesktop-sdk.bst:components/genpeimg.bst
@@ -30,6 +29,7 @@ depends:
 - freedesktop-sdk.bst:components/libarchive.bst
 - freedesktop-sdk.bst:components/libgudev.bst
 - freedesktop-sdk.bst:components/libsmbios-maybe.bst
+- freedesktop-sdk.bst:components/polkit.bst
 - freedesktop-sdk.bst:components/pycairo.bst
 - freedesktop-sdk.bst:components/python3-pil.bst
 - freedesktop-sdk.bst:components/tpm2-tss.bst
diff --git a/elements/core-deps/gegl.bst b/elements/core-deps/gegl.bst
index 9da75847..13be7559 100644
--- a/elements/core-deps/gegl.bst
+++ b/elements/core-deps/gegl.bst
@@ -5,17 +5,17 @@ sources:
   url: https://download.gimp.org/pub/gegl/0.4/gegl-0.4.28.tar.xz
 
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
+- core-deps/LibRaw.bst
 - core-deps/babl.bst
 - core-deps/gexiv2.bst
-- core-deps/LibRaw.bst
 - core-deps/graphviz.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/json-glib.bst
 - sdk/librsvg.bst
 - sdk/pango.bst
diff --git a/elements/core-deps/gnome-autoar.bst b/elements/core-deps/gnome-autoar.bst
index aa24c485..4d774bfa 100644
--- a/elements/core-deps/gnome-autoar.bst
+++ b/elements/core-deps/gnome-autoar.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-autoar.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - freedesktop-sdk.bst:components/libarchive.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/grilo.bst b/elements/core-deps/grilo.bst
index d5e9f598..e2c32d1f 100644
--- a/elements/core-deps/grilo.bst
+++ b/elements/core-deps/grilo.bst
@@ -4,13 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/grilo.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/totem-pl-parser.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - sdk/libsoup-2.4.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/gsound.bst b/elements/core-deps/gsound.bst
index 1d31eee5..958b87e4 100644
--- a/elements/core-deps/gsound.bst
+++ b/elements/core-deps/gsound.bst
@@ -4,13 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/gsound.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
 - core-deps/libcanberra.bst
+- sdk/glib.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/gssdp.bst b/elements/core-deps/gssdp.bst
index 90b153e8..294da34e 100644
--- a/elements/core-deps/gssdp.bst
+++ b/elements/core-deps/gssdp.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/gssdp.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/libsoup-2.4.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
diff --git a/elements/core-deps/gst-editing-services.bst b/elements/core-deps/gst-editing-services.bst
index a7be5e5c..12ac630c 100644
--- a/elements/core-deps/gst-editing-services.bst
+++ b/elements/core-deps/gst-editing-services.bst
@@ -6,9 +6,7 @@ sources:
 
 build-depends:
 - sdk/gtk-doc.bst
-- freedesktop-sdk.bst:components/m4.bst # dependency of flex
 - freedesktop-sdk.bst:components/flex.bst
-- freedesktop-sdk.bst:components/git-minimal.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
diff --git a/elements/core-deps/gtk-vnc.bst b/elements/core-deps/gtk-vnc.bst
index e09feded..0bf8bf15 100644
--- a/elements/core-deps/gtk-vnc.bst
+++ b/elements/core-deps/gtk-vnc.bst
@@ -8,6 +8,7 @@ sources:
       checkout: true
       url: gitlab_com:keycodemap/keycodemapdb.git
 build-depends:
+- sdk/vala.bst
 - freedesktop-sdk.bst:components/gnutls.bst
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
@@ -15,7 +16,6 @@ depends:
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:components/cyrus-sasl.bst
 - freedesktop-sdk.bst:components/libpulse.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/gupnp-av.bst b/elements/core-deps/gupnp-av.bst
index e159cca2..b6f55e4c 100644
--- a/elements/core-deps/gupnp-av.bst
+++ b/elements/core-deps/gupnp-av.bst
@@ -5,6 +5,7 @@ sources:
   track: master
 build-depends:
 - sdk/gtk-doc.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - core-deps/gupnp.bst
diff --git a/elements/core-deps/gupnp.bst b/elements/core-deps/gupnp.bst
index a77690eb..e7d362fc 100644
--- a/elements/core-deps/gupnp.bst
+++ b/elements/core-deps/gupnp.bst
@@ -5,6 +5,7 @@ sources:
   track: master
 build-depends:
 - sdk/gtk-doc.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/NetworkManager.bst
diff --git a/elements/core-deps/jsonrpc-glib.bst b/elements/core-deps/jsonrpc-glib.bst
index 83380e1d..5b955650 100644
--- a/elements/core-deps/jsonrpc-glib.bst
+++ b/elements/core-deps/jsonrpc-glib.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/jsonrpc-glib.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/json-glib.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/libdazzle.bst b/elements/core-deps/libdazzle.bst
index ecab7ed2..4c5e5844 100644
--- a/elements/core-deps/libdazzle.bst
+++ b/elements/core-deps/libdazzle.bst
@@ -4,10 +4,10 @@ sources:
   url: gitlab_gnome_org:GNOME/libdazzle.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/libgit2-glib.bst b/elements/core-deps/libgit2-glib.bst
index 0e549954..2a4a3612 100644
--- a/elements/core-deps/libgit2-glib.bst
+++ b/elements/core-deps/libgit2-glib.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/libgit2-glib.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/libgit2.bst
 - core-deps/libssh2.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/pygobject.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/libgusb.bst b/elements/core-deps/libgusb.bst
index af06a6bf..dbb2bd44 100644
--- a/elements/core-deps/libgusb.bst
+++ b/elements/core-deps/libgusb.bst
@@ -3,11 +3,11 @@ sources:
 - kind: tar
   url: people_freedesktop_org:~hughsient/releases/libgusb-0.3.5.tar.xz
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:components/libusb.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/libnma.bst b/elements/core-deps/libnma.bst
index 1909c7d6..9ae8a5f3 100644
--- a/elements/core-deps/libnma.bst
+++ b/elements/core-deps/libnma.bst
@@ -5,14 +5,15 @@ sources:
   track: master
 build-depends:
 - sdk/gtk-doc.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/NetworkManager.bst
 - core-deps/mobile-broadband-provider-info.bst
 - sdk/adwaita-icon-theme.bst
+- sdk/gcr.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
-- sdk/gcr.bst
 - freedesktop-sdk.bst:components/iso-codes.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/libosinfo.bst b/elements/core-deps/libosinfo.bst
index c1a42f18..8ca1a127 100644
--- a/elements/core-deps/libosinfo.bst
+++ b/elements/core-deps/libosinfo.bst
@@ -7,15 +7,15 @@ sources:
 - kind: local
   path: files/libosinfo/usb.ids
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/osinfo-db-tools.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/libsoup-2.4.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/libpeas.bst b/elements/core-deps/libpeas.bst
index f4258f4a..def4671d 100644
--- a/elements/core-deps/libpeas.bst
+++ b/elements/core-deps/libpeas.bst
@@ -4,13 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/libpeas.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - sdk/pygobject.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/libvirt-glib.bst b/elements/core-deps/libvirt-glib.bst
index c1103792..40f9b8a0 100644
--- a/elements/core-deps/libvirt-glib.bst
+++ b/elements/core-deps/libvirt-glib.bst
@@ -4,14 +4,14 @@ sources:
   url: https://libvirt.org/sources/glib/libvirt-glib-4.0.0.tar.xz
 build-depends:
 - core-deps/intltool.bst
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/libvirt.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/malcontent.bst b/elements/core-deps/malcontent.bst
index 7b826ab1..61d0f0ce 100644
--- a/elements/core-deps/malcontent.bst
+++ b/elements/core-deps/malcontent.bst
@@ -5,10 +5,9 @@ sources:
   url: https://tecnocode.co.uk/downloads/malcontent-0.9.0.tar.xz
 
 build-depends:
-- sdk/gtk-doc.bst
 - core-deps/glib-testing.bst
+- sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
-- freedesktop-sdk.bst:components/git-minimal.bst
 
 depends:
 - core-deps/accountsservice.bst
diff --git a/elements/core-deps/mogwai.bst b/elements/core-deps/mogwai.bst
index 37c4d456..de1ba4a4 100644
--- a/elements/core-deps/mogwai.bst
+++ b/elements/core-deps/mogwai.bst
@@ -5,8 +5,6 @@ sources:
   url: github_com:endlessm/mogwai/archive/Release_3.7.5.tar.gz
 
 build-depends:
-- freedesktop-sdk.bst:components/git-minimal.bst
-- freedesktop-sdk.bst:components/pkg-config.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
diff --git a/elements/core-deps/phodav.bst b/elements/core-deps/phodav.bst
index 16fe23e8..454b83cc 100644
--- a/elements/core-deps/phodav.bst
+++ b/elements/core-deps/phodav.bst
@@ -5,13 +5,12 @@ sources:
   track: master
 build-depends:
 - sdk/gtk-doc.bst
-- freedesktop-sdk.bst:components/git-minimal.bst
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
+- core-deps/avahi-gobject.bst
 - sdk/glib.bst
 - sdk/libsoup-2.4.bst
-- core-deps/avahi-gobject.bst
 - freedesktop-sdk.bst:components/libgudev.bst
 - freedesktop-sdk.bst:components/systemd.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/template-glib.bst b/elements/core-deps/template-glib.bst
index d91185f6..6952a95d 100644
--- a/elements/core-deps/template-glib.bst
+++ b/elements/core-deps/template-glib.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/template-glib.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:components/bison.bst
 - freedesktop-sdk.bst:components/flex.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/baobab.bst b/elements/core/baobab.bst
index b7a06e00..6778273a 100644
--- a/elements/core/baobab.bst
+++ b/elements/core/baobab.bst
@@ -4,14 +4,14 @@ sources:
   url: gitlab_gnome_org:GNOME/baobab.git
   track: master
 build-depends:
+- sdk/appstream-glib.bst
 - sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
 - sdk/librsvg.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/cheese.bst b/elements/core/cheese.bst
index 6dcb810a..bea2c64a 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -6,6 +6,7 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
@@ -15,7 +16,6 @@ depends:
 - core-deps/libcanberra.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
 - sdk/clutter-gst.bst
 - sdk/clutter-gtk.bst
 - sdk/glib.bst
diff --git a/elements/core/dconf-editor.bst b/elements/core/dconf-editor.bst
index a896afdd..43b281b3 100644
--- a/elements/core/dconf-editor.bst
+++ b/elements/core/dconf-editor.bst
@@ -5,12 +5,12 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/dconf.bst
-- sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/devhelp.bst b/elements/core/devhelp.bst
index cc69f29f..0c6d5adb 100644
--- a/elements/core/devhelp.bst
+++ b/elements/core/devhelp.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/devhelp.git
   track: master
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/amtk.bst
-- sdk/appstream-glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
-- sdk/gtk-doc.bst
 - sdk/webkitgtk.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/epiphany.bst b/elements/core/epiphany.bst
index 26b685c5..9c761c0f 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -4,11 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/epiphany.git
   track: master
 build-depends:
+- sdk/appstream-glib.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/libdazzle.bst
 - sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
 - sdk/gcr.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib-networking.bst
@@ -21,6 +22,5 @@ depends:
 - sdk/libsoup-2.4.bst
 - sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/iso-codes.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:components/libportal.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gdm.bst b/elements/core/gdm.bst
index daea00a0..e3341320 100644
--- a/elements/core/gdm.bst
+++ b/elements/core/gdm.bst
@@ -7,6 +7,7 @@ sources:
   path: files/gdm
   directory: gdm-config
 build-depends:
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/accountsservice.bst
@@ -16,7 +17,6 @@ depends:
 - core-deps/upower.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   sysusersdir: '%{prefix}/lib/sysusers.d'
diff --git a/elements/core/gedit.bst b/elements/core/gedit.bst
index 5ce79201..60bd6281 100644
--- a/elements/core/gedit.bst
+++ b/elements/core/gedit.bst
@@ -12,7 +12,7 @@ sources:
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/vala.bst
-- freedesktop-sdk.bst:components/git-minimal.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:components/perl.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
@@ -25,5 +25,4 @@ depends:
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtksourceview.bst
 - sdk/libsoup-2.4.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-calculator.bst b/elements/core/gnome-calculator.bst
index 58f0ad88..4acc3c8a 100644
--- a/elements/core/gnome-calculator.bst
+++ b/elements/core/gnome-calculator.bst
@@ -4,17 +4,17 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-calculator.git
   track: master
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/mpc.bst
 - sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/gtksourceview.bst
 - sdk/libgee.bst
 - sdk/libhandy.bst
 - sdk/libsoup-2.4.bst
-- sdk/vala.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-calendar.bst b/elements/core/gnome-calendar.bst
index ef45b425..94ce356f 100644
--- a/elements/core/gnome-calendar.bst
+++ b/elements/core/gnome-calendar.bst
@@ -6,6 +6,7 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
@@ -13,7 +14,6 @@ depends:
 - core-deps/gnome-online-accounts.bst
 - core-deps/libdazzle.bst
 - sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
diff --git a/elements/core/gnome-characters.bst b/elements/core/gnome-characters.bst
index 4e36679b..c019c2b8 100644
--- a/elements/core/gnome-characters.bst
+++ b/elements/core/gnome-characters.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-characters.git
   track: master
 build-depends:
+- sdk/appstream-glib.bst
 - freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
 - sdk/gjs.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
diff --git a/elements/core/gnome-clocks.bst b/elements/core/gnome-clocks.bst
index 76b0e0bb..e47563cb 100644
--- a/elements/core/gnome-clocks.bst
+++ b/elements/core/gnome-clocks.bst
@@ -4,6 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-clocks.git
   track: master
 build-depends:
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/geocode-glib.bst
@@ -14,6 +16,4 @@ depends:
 - sdk/geoclue.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
-- sdk/vala.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-color-manager.bst b/elements/core/gnome-color-manager.bst
index 7d1bbe82..7e556ea6 100644
--- a/elements/core/gnome-color-manager.bst
+++ b/elements/core/gnome-color-manager.bst
@@ -4,17 +4,17 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-color-manager.git
   track: master
 build-depends:
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/colord-gtk.bst
 - core-deps/exiv2.bst
-- core-deps/vte.bst
 - core-deps/libcanberra.bst
+- core-deps/vte.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:components/libexif.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-contacts.bst b/elements/core/gnome-contacts.bst
index bf0f1e50..df27aac1 100644
--- a/elements/core/gnome-contacts.bst
+++ b/elements/core/gnome-contacts.bst
@@ -4,6 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-contacts.git
   track: master
 build-depends:
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/docbook-xsl.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/folks.bst
@@ -15,6 +17,5 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libgee.bst
 - sdk/libhandy.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-disk-utility.bst b/elements/core/gnome-disk-utility.bst
index e9a6f903..4a1169e6 100644
--- a/elements/core/gnome-disk-utility.bst
+++ b/elements/core/gnome-disk-utility.bst
@@ -4,13 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-disk-utility.git
   track: master
 build-depends:
+- sdk/appstream-glib.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/libdvdread.bst
 - core-deps/udisks2.bst
 - core/gnome-settings-daemon.bst
 - sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
diff --git a/elements/core/gnome-logs.bst b/elements/core/gnome-logs.bst
index d0334090..28beb5cb 100644
--- a/elements/core/gnome-logs.bst
+++ b/elements/core/gnome-logs.bst
@@ -4,6 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-logs.git
   track: master
 build-depends:
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/adwaita-icon-theme.bst
@@ -11,6 +12,5 @@ depends:
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:components/systemd.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-photos.bst b/elements/core/gnome-photos.bst
index 8e7c601d..fd31cb58 100644
--- a/elements/core/gnome-photos.bst
+++ b/elements/core/gnome-photos.bst
@@ -8,7 +8,6 @@ sources:
       checkout: true
       url: gitlab_gnome_org:GNOME/libgd.git
 build-depends:
-- freedesktop-sdk.bst:components/git-minimal.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/babl.bst
diff --git a/elements/core/gnome-screenshot.bst b/elements/core/gnome-screenshot.bst
index 7da003bc..093ad7f0 100644
--- a/elements/core/gnome-screenshot.bst
+++ b/elements/core/gnome-screenshot.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-screenshot.git
   track: master
 build-depends:
+- sdk/appstream-glib.bst
 - 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/libhandy.bst
diff --git a/elements/core/gnome-user-docs.bst b/elements/core/gnome-user-docs.bst
index aae308dc..a937ff57 100644
--- a/elements/core/gnome-user-docs.bst
+++ b/elements/core/gnome-user-docs.bst
@@ -4,7 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-user-docs.git
   track: master
 build-depends:
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
-- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-weather.bst b/elements/core/gnome-weather.bst
index bdc76319..c8a991d8 100644
--- a/elements/core/gnome-weather.bst
+++ b/elements/core/gnome-weather.bst
@@ -4,6 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-weather.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/libgweather.bst
@@ -14,7 +15,6 @@ depends:
 - sdk/geoclue.bst
 - sdk/gjs.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/rygel.bst b/elements/core/rygel.bst
index 71cba9e0..965331b6 100644
--- a/elements/core/rygel.bst
+++ b/elements/core/rygel.bst
@@ -6,12 +6,9 @@ sources:
   track: master
 
 build-depends:
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
-variables:
-  meson-local: >-
-    -Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3
-
 depends:
 - core-deps/gssdp.bst
 - core-deps/gst-editing-services.bst
@@ -21,5 +18,8 @@ depends:
 - core-deps/libmediaart.bst
 - sdk/libgee.bst
 - sdk/tracker.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+  meson-local: >-
+    -Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3
diff --git a/elements/core/simple-scan.bst b/elements/core/simple-scan.bst
index 364278c0..03d4cc60 100644
--- a/elements/core/simple-scan.bst
+++ b/elements/core/simple-scan.bst
@@ -4,6 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/simple-scan.git
   track: master
 build-depends:
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/colord-gtk.bst
@@ -14,6 +16,4 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
-- sdk/vala.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/sysprof.bst b/elements/core/sysprof.bst
index d793da1c..717f0e74 100644
--- a/elements/core/sysprof.bst
+++ b/elements/core/sysprof.bst
@@ -6,7 +6,6 @@ sources:
   track: master
 
 build-depends:
-- freedesktop-sdk.bst:components/git-minimal.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 runtime-depends:
diff --git a/elements/core/totem.bst b/elements/core/totem.bst
index 3ad3b581..204e1e95 100644
--- a/elements/core/totem.bst
+++ b/elements/core/totem.bst
@@ -11,6 +11,7 @@ sources:
       checkout: false
       url: github_com:flathub/shared-modules.git
 build-depends:
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/grilo-plugins.bst
@@ -31,7 +32,6 @@ depends:
 - sdk/gst-plugins-good.bst
 - sdk/gtk+-3.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
diff --git a/elements/sdk/at-spi2-core.bst b/elements/sdk/at-spi2-core.bst
index b5c83143..f7279096 100644
--- a/elements/sdk/at-spi2-core.bst
+++ b/elements/sdk/at-spi2-core.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/at-spi2-core.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/gtk-doc.bst
 - freedesktop-sdk.bst:components/dbus.bst
 - freedesktop-sdk.bst:components/xorg-lib-xtst.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/sdk/atk.bst b/elements/sdk/atk.bst
index 75234d3a..d99da025 100644
--- a/elements/sdk/atk.bst
+++ b/elements/sdk/atk.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/atk.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 public:
   bst:
diff --git a/elements/sdk/clutter-gst.bst b/elements/sdk/clutter-gst.bst
index 6de1a9b0..412d20dd 100644
--- a/elements/sdk/clutter-gst.bst
+++ b/elements/sdk/clutter-gst.bst
@@ -3,13 +3,13 @@ sources:
 - kind: tar
   url: gnome_downloads:clutter-gst/3.0/clutter-gst-3.0.27.tar.xz
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - sdk/clutter.bst
 - sdk/cogl.bst
 - sdk/gdk-pixbuf.bst
-- sdk/gobject-introspection.bst
 - sdk/gst-plugins-base.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/sdk/clutter.bst b/elements/sdk/clutter.bst
index bf322377..0657d3b2 100644
--- a/elements/sdk/clutter.bst
+++ b/elements/sdk/clutter.bst
@@ -3,6 +3,7 @@ sources:
 - kind: tar
   url: gnome_downloads:clutter/1.26/clutter-1.26.4.tar.xz
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
@@ -10,7 +11,6 @@ depends:
 - sdk/cogl.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - sdk/json-glib.bst
 - freedesktop-sdk.bst:components/libxkbcommon.bst
diff --git a/elements/sdk/cogl.bst b/elements/sdk/cogl.bst
index 0be7d595..1ca6d1b0 100644
--- a/elements/sdk/cogl.bst
+++ b/elements/sdk/cogl.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/cogl.git
   track: cogl-1.22
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gst-plugins-base.bst
 - sdk/pango.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
diff --git a/elements/sdk/gcab.bst b/elements/sdk/gcab.bst
index d3c556af..db67d407 100644
--- a/elements/sdk/gcab.bst
+++ b/elements/sdk/gcab.bst
@@ -4,13 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/gcab.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
-- freedesktop-sdk.bst:components/git-minimal.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 public:
   bst:
diff --git a/elements/sdk/gtk+-3.bst b/elements/sdk/gtk+-3.bst
index 46ff2b05..e0dddebd 100644
--- a/elements/sdk/gtk+-3.bst
+++ b/elements/sdk/gtk+-3.bst
@@ -6,6 +6,7 @@ sources:
   track: gtk-3-24
 
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
@@ -17,7 +18,6 @@ depends:
 - sdk/atk.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/pango.bst
 - sdk/tracker.bst
 - freedesktop-sdk.bst:components/cairo.bst
diff --git a/elements/sdk/gtk.bst b/elements/sdk/gtk.bst
index d80de677..6733837a 100644
--- a/elements/sdk/gtk.bst
+++ b/elements/sdk/gtk.bst
@@ -7,6 +7,7 @@ sources:
 
 build-depends:
 - sdk-deps/sassc.bst
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
@@ -15,7 +16,6 @@ depends:
 - sdk/atk.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/graphene.bst
 - sdk/gst-plugins-bad.bst
 - sdk/gst-plugins-base.bst
@@ -40,8 +40,8 @@ public:
     split-rules:
       devel:
         (>):
-          - "%{libdir}/libgtk-4.so"
-          - "%{datadir}/applications/org.gtk.Demo4.desktop"
-          - "%{datadir}/applications/org.gtk.IconBrowser4.desktop"
-          - "%{datadir}/applications/org.gtk.PrintEditor4.desktop"
-          - "%{datadir}/applications/org.gtk.WidgetFactory4.desktop"
+        - '%{libdir}/libgtk-4.so'
+        - '%{datadir}/applications/org.gtk.Demo4.desktop'
+        - '%{datadir}/applications/org.gtk.IconBrowser4.desktop'
+        - '%{datadir}/applications/org.gtk.PrintEditor4.desktop'
+        - '%{datadir}/applications/org.gtk.WidgetFactory4.desktop'
diff --git a/elements/sdk/libgee.bst b/elements/sdk/libgee.bst
index 4ffb39ef..04a65e85 100644
--- a/elements/sdk/libgee.bst
+++ b/elements/sdk/libgee.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/libgee.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 public:
   bst:
diff --git a/elements/sdk/libhandy.bst b/elements/sdk/libhandy.bst
index 47b7e8fc..a6ee525c 100644
--- a/elements/sdk/libhandy.bst
+++ b/elements/sdk/libhandy.bst
@@ -4,13 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/libhandy.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:components/docbook-xsl.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
diff --git a/elements/sdk/libnotify.bst b/elements/sdk/libnotify.bst
index dac6fd6e..d535a60f 100644
--- a/elements/sdk/libnotify.bst
+++ b/elements/sdk/libnotify.bst
@@ -6,12 +6,12 @@ sources:
   track: master
 
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
diff --git a/elements/sdk/librsvg.bst b/elements/sdk/librsvg.bst
index f8dcbf32..d8ab7b31 100644
--- a/elements/sdk/librsvg.bst
+++ b/elements/sdk/librsvg.bst
@@ -5,6 +5,7 @@ sources:
   track: master
 - kind: cargo
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:extensions/rust/rust.bst
@@ -12,7 +13,6 @@ build-depends:
 depends:
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/pango.bst
 - freedesktop-sdk.bst:components/cairo.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/sdk/libsecret.bst b/elements/sdk/libsecret.bst
index e7cf649e..7e5ee804 100644
--- a/elements/sdk/libsecret.bst
+++ b/elements/sdk/libsecret.bst
@@ -4,13 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/libsecret.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:components/valgrind.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - freedesktop-sdk.bst:components/libgcrypt.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
diff --git a/elements/sdk/pango.bst b/elements/sdk/pango.bst
index 897fec25..69d6ccd4 100644
--- a/elements/sdk/pango.bst
+++ b/elements/sdk/pango.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/pango.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - freedesktop-sdk.bst:components/cairo.bst
 - freedesktop-sdk.bst:components/fontconfig.bst
 - freedesktop-sdk.bst:components/fribidi.bst
diff --git a/elements/sdk/tracker.bst b/elements/sdk/tracker.bst
index 9b5681a0..267a29f8 100644
--- a/elements/sdk/tracker.bst
+++ b/elements/sdk/tracker.bst
@@ -4,6 +4,7 @@ sources:
   url: gitlab_gnome_org:GNOME/tracker.git
   track: master
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:components/asciidoc.bst
@@ -11,12 +12,11 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/json-glib.bst
 - sdk/libsoup-2.4.bst
-- freedesktop-sdk.bst:bootstrap-import.bst
 - freedesktop-sdk.bst:components/dbus.bst
 - freedesktop-sdk.bst:components/icu.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
     -Ddocs=false
diff --git a/elements/sdk/yelp.bst b/elements/sdk/yelp.bst
index d0a29f5e..0f4a5840 100644
--- a/elements/sdk/yelp.bst
+++ b/elements/sdk/yelp.bst
@@ -4,11 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/yelp.git
   track: master
 build-depends:
+- sdk/appstream-glib.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - sdk/adwaita-icon-theme.bst
-- sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
diff --git a/elements/sdk/zenity.bst b/elements/sdk/zenity.bst
index bd3d554b..be87c9d0 100644
--- a/elements/sdk/zenity.bst
+++ b/elements/sdk/zenity.bst
@@ -4,8 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/zenity.git
   track: master
 build-depends:
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - sdk/gtk+-3.bst
-- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/vm/toolbox.bst b/elements/vm/toolbox.bst
index 0d3d3708..b327f8f9 100644
--- a/elements/vm/toolbox.bst
+++ b/elements/vm/toolbox.bst
@@ -80,13 +80,12 @@ sources:
   directory: 'src/vendor/golang.org/x/sys'
 
 build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 - freedesktop-sdk.bst:components/systemd.bst
 - freedesktop-sdk.bst:components/ca-certificates.bst
 - freedesktop-sdk.bst:components/go.bst
 - freedesktop-sdk.bst:components/go-md2man.bst
 - freedesktop-sdk.bst:components/strace.bst
-- freedesktop-sdk.bst:components/git-minimal.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - freedesktop-sdk.bst:components/podman.bst
diff --git a/elements/world.bst b/elements/world.bst
index 8ebffccf..62da6d8c 100644
--- a/elements/world.bst
+++ b/elements/world.bst
@@ -9,15 +9,16 @@ depends:
 - world/atkmm.bst
 - world/bijiben.bst
 - world/cairomm.bst
+- world/connections.bst
 - world/dbus-glib.bst
 - world/evolution.bst
 - world/five-or-more.bst
 - world/four-in-a-row.bst
+- world/geary.bst
 - world/ghex.bst
 - world/gitg.bst
 - world/glade.bst
 - world/glibmm.bst
-- world/geary.bst
 - world/gnome-chess.bst
 - world/gnome-code-assistance.bst
 - world/gnome-devel-docs.bst
@@ -37,6 +38,7 @@ depends:
 - world/gnome-sudoku.bst
 - world/gnome-taquin.bst
 - world/gnome-tetravex.bst
+- world/gnome-themes-extra.bst
 - world/gnome-todo.bst
 - world/gnome-tweaks.bst
 - world/gtkmm.bst
@@ -48,26 +50,20 @@ depends:
 - world/ibus-hangul.bst
 - world/ibus-libpinyin.bst
 - world/kyotocabinet.bst
-- world/libbluray.bst
-- world/libcdio.bst
-- world/libcdio-paranoia.bst
+- world/libaperture.bst
 - world/libgepub.bst
 - world/libgnome-games-support.bst
-- world/libgphoto2.bst
 - world/libgrss.bst
-- world/libhangul.bst
 - world/libhandy-0.bst
-- world/libimobiledevice.bst
+- world/libhangul.bst
 - world/libmanette.bst
-- world/libmtp.bst
-- world/libnfs.bst
 - world/libpinyin.bst
+- world/libshumate.bst
 - world/libsigcplusplus.bst
-- world/libusbmuxd.bst
 - world/lightsoff.bst
 - world/network-manager-applet.bst
 - world/pangomm.bst
-- world/plist.bst
+- world/pinhole.bst
 - world/polari.bst
 - world/qqwing.bst
 - world/quadrapassel.bst
diff --git a/elements/world/accerciser.bst b/elements/world/accerciser.bst
index 6a6041a1..d79c204a 100644
--- a/elements/world/accerciser.bst
+++ b/elements/world/accerciser.bst
@@ -5,14 +5,14 @@ sources:
   track: master
 
 build-depends:
-  - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+- sdk/appstream-glib.bst
+- sdk/yelp-tools.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 
 depends:
 - core-deps/pyatspi.bst
-- sdk/appstream-glib.bst
 - sdk/at-spi2-atk.bst
 - sdk/gtk+-3.bst
 - sdk/pygobject.bst
-- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:components/pycairo.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index 1cae8768..00530acb 100644
--- a/elements/world/bijiben.bst
+++ b/elements/world/bijiben.bst
@@ -9,16 +9,16 @@ sources:
       url: gitlab_gnome_org:GNOME/libgd.git
 
 build-depends:
+- sdk/appstream-glib.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/evolution-data-server.bst
-- world/libhandy-0.bst
-- sdk/appstream-glib.bst
 - sdk/clutter-gtk.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/tracker.bst
 - sdk/webkitgtk.bst
-- freedesktop-sdk.bst:components/itstool.bst
+- world/libhandy-0.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index e4a846e2..035ec688 100644
--- a/elements/world/evolution.bst
+++ b/elements/world/evolution.bst
@@ -6,6 +6,7 @@ sources:
 
 build-depends:
 - core-deps/intltool.bst
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 
 depends:
@@ -27,10 +28,10 @@ depends:
 - sdk/libnotify.bst
 - sdk/libsoup-2.4.bst
 - sdk/webkitgtk.bst
-- sdk/yelp-tools.bst
 - world/gtkspell.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+
 variables:
   cmake-local: >-
     -DENABLE_LIBCRYPTUI=OFF
diff --git a/elements/world/five-or-more.bst b/elements/world/five-or-more.bst
index 22221a2f..d77582ad 100644
--- a/elements/world/five-or-more.bst
+++ b/elements/world/five-or-more.bst
@@ -5,12 +5,12 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- sdk/appstream-glib.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
 - world/libgnome-games-support.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/four-in-a-row.bst b/elements/world/four-in-a-row.bst
index df76caf6..35c1b853 100644
--- a/elements/world/four-in-a-row.bst
+++ b/elements/world/four-in-a-row.bst
@@ -4,12 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/four-in-a-row.git
   track: master
 build-depends:
+- sdk/appstream-glib.bst
 - sdk/vala.bst
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/gsound.bst
-- sdk/appstream-glib.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/geary.bst b/elements/world/geary.bst
index b6e68334..45c039c8 100644
--- a/elements/world/geary.bst
+++ b/elements/world/geary.bst
@@ -5,6 +5,7 @@ sources:
   track: master
 
 build-depends:
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
@@ -27,7 +28,6 @@ depends:
 - sdk/libhandy.bst
 - sdk/libsecret.bst
 - sdk/libsoup-2.4.bst
-- sdk/vala.bst
 - sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/iso-codes.bst
 - freedesktop-sdk.bst:components/libxml2.bst
diff --git a/elements/world/gitg.bst b/elements/world/gitg.bst
index e4e254b6..003b42be 100644
--- a/elements/world/gitg.bst
+++ b/elements/world/gitg.bst
@@ -1,15 +1,21 @@
 kind: meson
+
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gitg.git
   track: master
+
+build-depends:
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
 depends:
 - core-deps/gspell.bst
 - core-deps/libdazzle.bst
 - core-deps/libgit2-glib.bst
 - core-deps/libpeas.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
 - sdk/gtksourceview.bst
@@ -18,6 +24,4 @@ depends:
 - sdk/libsecret.bst
 - sdk/libsoup-2.4.bst
 - sdk/pygobject.bst
-- sdk/vala.bst
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/gnome-chess.bst b/elements/world/gnome-chess.bst
index 4383bd77..cae313ad 100644
--- a/elements/world/gnome-chess.bst
+++ b/elements/world/gnome-chess.bst
@@ -5,12 +5,12 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- sdk/appstream-glib.bst
 - sdk/gtk.bst
 - sdk/librsvg.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/gnome-devel-docs.bst b/elements/world/gnome-devel-docs.bst
index 378aac66..4147a484 100644
--- a/elements/world/gnome-devel-docs.bst
+++ b/elements/world/gnome-devel-docs.bst
@@ -5,8 +5,8 @@ sources:
   track: master
 
 build-depends:
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 
 depends:
-- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/gnome-documents.bst b/elements/world/gnome-documents.bst
index 4997c6cc..8d94d15c 100644
--- a/elements/world/gnome-documents.bst
+++ b/elements/world/gnome-documents.bst
@@ -9,7 +9,6 @@ sources:
       url: gitlab_gnome_org:GNOME/libgd.git
 build-depends:
 - freedesktop-sdk.bst:components/docbook-xsl.bst
-- freedesktop-sdk.bst:components/git-minimal.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/gnome-online-accounts.bst
diff --git a/elements/world/gnome-klotski.bst b/elements/world/gnome-klotski.bst
index f7808418..894e9fe4 100644
--- a/elements/world/gnome-klotski.bst
+++ b/elements/world/gnome-klotski.bst
@@ -5,6 +5,7 @@ sources:
   track: master
 
 build-depends:
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
@@ -12,5 +13,4 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
 - world/libgnome-games-support.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/gnome-mahjongg.bst b/elements/world/gnome-mahjongg.bst
index d1661daf..80086c17 100644
--- a/elements/world/gnome-mahjongg.bst
+++ b/elements/world/gnome-mahjongg.bst
@@ -5,12 +5,12 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- sdk/appstream-glib.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- sdk/vala.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/gnome-mines.bst b/elements/world/gnome-mines.bst
index cbffb2a2..c9715a21 100644
--- a/elements/world/gnome-mines.bst
+++ b/elements/world/gnome-mines.bst
@@ -5,13 +5,13 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- sdk/appstream-glib.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- sdk/vala.bst
 - world/libgnome-games-support.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/gnome-nibbles.bst b/elements/world/gnome-nibbles.bst
index 4e9759e6..bbd5ab15 100644
--- a/elements/world/gnome-nibbles.bst
+++ b/elements/world/gnome-nibbles.bst
@@ -5,17 +5,17 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/gsound.bst
-- sdk/appstream-glib.bst
 - sdk/clutter-gtk.bst
 - sdk/clutter.bst
 - sdk/gtk+-3.bst
 - sdk/libgee.bst
 - sdk/librsvg.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
 - world/libgnome-games-support.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/gnome-robots.bst b/elements/world/gnome-robots.bst
index 018ec4a3..5d6e3c3d 100644
--- a/elements/world/gnome-robots.bst
+++ b/elements/world/gnome-robots.bst
@@ -5,13 +5,13 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/gsound.bst
-- sdk/appstream-glib.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- sdk/yelp-tools.bst
 - world/libgnome-games-support.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/gnome-sudoku.bst b/elements/world/gnome-sudoku.bst
index 77d76d42..03dfdaf9 100644
--- a/elements/world/gnome-sudoku.bst
+++ b/elements/world/gnome-sudoku.bst
@@ -5,15 +5,15 @@ sources:
   track: master
 
 build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+- sdk/appstream-glib.bst
 - sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/json-glib.bst
 - sdk/libgee.bst
 - world/qqwing.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/gnome-taquin.bst b/elements/world/gnome-taquin.bst
index e7da766f..87f6be3d 100644
--- a/elements/world/gnome-taquin.bst
+++ b/elements/world/gnome-taquin.bst
@@ -1,17 +1,18 @@
 kind: meson
+
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gnome-taquin.git
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/gsound.bst
-- sdk/appstream-glib.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/gnome-todo.bst b/elements/world/gnome-todo.bst
index 4326eb99..a85cf3c0 100644
--- a/elements/world/gnome-todo.bst
+++ b/elements/world/gnome-todo.bst
@@ -5,13 +5,13 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/evolution-data-server.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/libpeas.bst
-- sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/hitori.bst b/elements/world/hitori.bst
index af307dc9..38bf9f61 100644
--- a/elements/world/hitori.bst
+++ b/elements/world/hitori.bst
@@ -5,11 +5,11 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/iagno.bst b/elements/world/iagno.bst
index bf6698a9..b51b0485 100644
--- a/elements/world/iagno.bst
+++ b/elements/world/iagno.bst
@@ -5,13 +5,13 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/vala.bst
+- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/gsound.bst
-- sdk/appstream-glib.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- sdk/vala.bst
-- sdk/yelp-tools.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/libhandy-0.bst b/elements/world/libhandy-0.bst
index 1a001516..e44ff65c 100644
--- a/elements/world/libhandy-0.bst
+++ b/elements/world/libhandy-0.bst
@@ -3,13 +3,13 @@ sources:
 - kind: tar
   url: https://source.puri.sm/Librem5/libhandy/-/archive/v0.0.13/libhandy-v0.0.13.tar.bz2
 build-depends:
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:components/docbook-xsl.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
diff --git a/elements/world/libmanette.bst b/elements/world/libmanette.bst
index a798d533..7a7755d6 100644
--- a/elements/world/libmanette.bst
+++ b/elements/world/libmanette.bst
@@ -5,12 +5,12 @@ sources:
   track: master
 
 build-depends:
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:components/libevdev.bst
 - freedesktop-sdk.bst:components/libgudev.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/lightsoff.bst b/elements/world/lightsoff.bst
index efd81208..228e0a9c 100644
--- a/elements/world/lightsoff.bst
+++ b/elements/world/lightsoff.bst
@@ -5,14 +5,14 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- sdk/appstream-glib.bst
 - sdk/clutter-gtk.bst
 - sdk/clutter.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- sdk/vala.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/pinhole.bst b/elements/world/pinhole.bst
index 10fbe7fa..d88fb0ba 100644
--- a/elements/world/pinhole.bst
+++ b/elements/world/pinhole.bst
@@ -7,7 +7,6 @@ sources:
 
 build-depends:
 - sdk/vala.bst
-- freedesktop-sdk.bst:components/git-minimal.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
diff --git a/elements/world/polari.bst b/elements/world/polari.bst
index 9a0bf92e..74c5b195 100644
--- a/elements/world/polari.bst
+++ b/elements/world/polari.bst
@@ -3,13 +3,17 @@ sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/polari.git
   track: master
+
+build-depends:
+- sdk/appstream-glib.bst
+- sdk/gobject-introspection.bst
+- freedesktop-sdk.bst:components/itstool.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
 depends:
 - core-deps/gspell.bst
-- sdk/appstream-glib.bst
 - sdk/gjs.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - world/telepathy-glib.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/quadrapassel.bst b/elements/world/quadrapassel.bst
index 20750766..0ac9b666 100644
--- a/elements/world/quadrapassel.bst
+++ b/elements/world/quadrapassel.bst
@@ -5,16 +5,16 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/gsound.bst
-- sdk/appstream-glib.bst
 - sdk/clutter-gtk.bst
 - sdk/clutter.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- sdk/vala.bst
 - world/libmanette.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/retro-gtk.bst b/elements/world/retro-gtk.bst
index 271e4bbe..ab829033 100644
--- a/elements/world/retro-gtk.bst
+++ b/elements/world/retro-gtk.bst
@@ -5,12 +5,12 @@ sources:
   track: master
 
 build-depends:
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - sdk/clutter-gtk.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/vala.bst
 - freedesktop-sdk.bst:components/libpulse.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/seahorse.bst b/elements/world/seahorse.bst
index 985cc58d..46818753 100644
--- a/elements/world/seahorse.bst
+++ b/elements/world/seahorse.bst
@@ -9,6 +9,9 @@ sources:
       url: purism:Librem5/libhandy.git
 
 build-depends:
+- sdk/gobject-introspection.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 runtime-depends:
 - sdk/adwaita-icon-theme.bst
@@ -16,15 +19,12 @@ depends:
 - core-deps/openldap.bst
 - sdk/gcr.bst
 - sdk/glib.bst
-- sdk/gobject-introspection.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
 - sdk/libgee.bst
 - sdk/libhandy.bst
 - sdk/libsecret.bst
 - sdk/libsoup-2.4.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/swell-foop.bst b/elements/world/swell-foop.bst
index 9a1333ef..f08f1b33 100644
--- a/elements/world/swell-foop.bst
+++ b/elements/world/swell-foop.bst
@@ -5,13 +5,13 @@ sources:
   track: master
 
 build-depends:
+- sdk/appstream-glib.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- sdk/appstream-glib.bst
 - sdk/clutter-gtk.bst
 - sdk/clutter.bst
 - sdk/gtk+-3.bst
-- sdk/vala.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/telepathy-glib.bst b/elements/world/telepathy-glib.bst
index cc380d79..c6f543a4 100644
--- a/elements/world/telepathy-glib.bst
+++ b/elements/world/telepathy-glib.bst
@@ -4,12 +4,12 @@ sources:
   url: github_com:TelepathyIM/telepathy-glib.git
   track: master
 build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+- sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - 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


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