[gnome-build-meta/abderrahim/remove-dconf: 4/4] remove dconf from the flatpak runtimes

[Abderrahim Kitouni <akitouni src gnome org>]

commit 3b8d10255e0789fe6511b5e09e146932758d5996
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Wed Jul 15 09:22:54 2020 +0100

    remove dconf from the flatpak runtimes
    
    Also drop the override patch, it's only useful inside flatpak

 elements/{sdk => core-deps}/dconf.bst   |  7 +++++--
 elements/core-deps/tracker-2.bst        |  2 +-
 elements/core-deps/tracker-miners-2.bst |  2 +-
 elements/core-deps/tracker-miners.bst   |  2 +-
 elements/core/dconf-editor.bst          |  2 +-
 elements/core/gdm.bst                   |  6 +++---
 elements/core/gnome-shell.bst           |  2 +-
 elements/core/gnome-terminal.bst        |  2 +-
 elements/sdk-deps/ibus.bst              |  2 +-
 elements/sdk-platform.bst               |  3 +--
 files/dconf/dconf-override.patch        | 23 -----------------------
 11 files changed, 16 insertions(+), 37 deletions(-)
---
diff --git a/elements/sdk/dconf.bst b/elements/core-deps/dconf.bst
similarity index 90%
rename from elements/sdk/dconf.bst
rename to elements/core-deps/dconf.bst
index 5a68eeeb..ce7ca304 100644
--- a/elements/sdk/dconf.bst
+++ b/elements/core-deps/dconf.bst
@@ -1,22 +1,25 @@
 kind: meson
+
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/dconf.git
   track: master
-- kind: patch
-  path: files/dconf/dconf-override.patch
+
 build-depends:
 - sdk/vala.bst
 - freedesktop-sdk.bst:components/dbus.bst
 - freedesktop-sdk.bst:components/docbook-xsl.bst
 - freedesktop-sdk.bst:components/libxslt.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
 depends:
 - sdk/glib.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+
 variables:
   meson-local: >-
     -Dbash_completion=false
+
 public:
   bst:
     split-rules:
diff --git a/elements/core-deps/tracker-2.bst b/elements/core-deps/tracker-2.bst
index 18f25479..e582dce1 100644
--- a/elements/core-deps/tracker-2.bst
+++ b/elements/core-deps/tracker-2.bst
@@ -9,8 +9,8 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/NetworkManager.bst
+- core-deps/dconf.bst
 - core-deps/upower.bst
-- sdk/dconf.bst
 - sdk/glib.bst
 - sdk/json-glib.bst
 - sdk/libsoup.bst
diff --git a/elements/core-deps/tracker-miners-2.bst b/elements/core-deps/tracker-miners-2.bst
index e8512030..445991e4 100644
--- a/elements/core-deps/tracker-miners-2.bst
+++ b/elements/core-deps/tracker-miners-2.bst
@@ -8,6 +8,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/NetworkManager.bst
+- core-deps/dconf.bst
 - core-deps/gexiv2.bst
 - core-deps/libcue.bst
 - core-deps/libgsf.bst
@@ -15,7 +16,6 @@ depends:
 - core-deps/libosinfo.bst
 - core-deps/totem-pl-parser.bst
 - core-deps/tracker-2.bst
-- sdk/dconf.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gst-plugins-base.bst
diff --git a/elements/core-deps/tracker-miners.bst b/elements/core-deps/tracker-miners.bst
index 3050857a..17a5c6bc 100644
--- a/elements/core-deps/tracker-miners.bst
+++ b/elements/core-deps/tracker-miners.bst
@@ -9,6 +9,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/NetworkManager.bst
+- core-deps/dconf.bst
 - core-deps/gexiv2.bst
 - core-deps/libcue.bst
 - core-deps/libgsf.bst
@@ -16,7 +17,6 @@ depends:
 - core-deps/libosinfo.bst
 - core-deps/totem-pl-parser.bst
 - core-deps/upower.bst
-- sdk/dconf.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gst-plugins-base.bst
diff --git a/elements/core/dconf-editor.bst b/elements/core/dconf-editor.bst
index b00a5e8e..a896afdd 100644
--- a/elements/core/dconf-editor.bst
+++ b/elements/core/dconf-editor.bst
@@ -8,8 +8,8 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
+- core-deps/dconf.bst
 - sdk/appstream-glib.bst
-- sdk/dconf.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/vala.bst
diff --git a/elements/core/gdm.bst b/elements/core/gdm.bst
index b857b3ea..daea00a0 100644
--- a/elements/core/gdm.bst
+++ b/elements/core/gdm.bst
@@ -10,10 +10,10 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/accountsservice.bst
-- core-deps/upower.bst
-- core-deps/plymouth.bst
+- core-deps/dconf.bst
 - core-deps/libcanberra.bst
-- sdk/dconf.bst
+- core-deps/plymouth.bst
+- core-deps/upower.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/yelp-tools.bst
diff --git a/elements/core/gnome-shell.bst b/elements/core/gnome-shell.bst
index af10bdc6..6c2608fa 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -22,6 +22,7 @@ runtime-depends:
 depends:
 - core-deps/NetworkManager.bst
 - core-deps/accountsservice.bst
+- core-deps/dconf.bst
 - core-deps/evolution-data-server.bst
 - core-deps/gnome-autoar.bst
 - core-deps/startup-notification.bst
@@ -32,7 +33,6 @@ depends:
 - core/gnome-settings-daemon.bst
 - core/mutter.bst
 - sdk/adwaita-icon-theme.bst
-- sdk/dconf.bst
 - sdk/gcr.bst
 - sdk/gjs.bst
 - sdk/glib.bst
diff --git a/elements/core/gnome-terminal.bst b/elements/core/gnome-terminal.bst
index b29c3d29..9568de62 100644
--- a/elements/core/gnome-terminal.bst
+++ b/elements/core/gnome-terminal.bst
@@ -6,12 +6,12 @@ sources:
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
+- core-deps/dconf.bst
 - core-deps/vte.bst
 - core/gnome-shell.bst
 - core/nautilus.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/appstream-glib.bst
-- sdk/dconf.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
diff --git a/elements/sdk-deps/ibus.bst b/elements/sdk-deps/ibus.bst
index 1145c20a..6b8bfb65 100644
--- a/elements/sdk-deps/ibus.bst
+++ b/elements/sdk-deps/ibus.bst
@@ -7,7 +7,7 @@ build-depends:
 - freedesktop-sdk.bst:components/iso-codes.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
-- sdk/dconf.bst
+- core-deps/dconf.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index eb988ce8..0f9af58a 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -11,7 +11,6 @@ depends:
 - sdk/clutter-gtk.bst
 - sdk/clutter.bst
 - sdk/cogl.bst
-- sdk/dconf.bst
 - sdk/enchant-2.bst
 - sdk/fcitx.bst
 - sdk/gcab.bst
@@ -59,7 +58,7 @@ depends:
 # update our reference to add any new elements.
 
 # Currently, the elements we want to build ourselves, and not use from freedesktop-sdk are:
-# appstream-glib, at-spi2-*, atk, dconf, fcitx, gcab, gdk-pixbuf, geoclue2, glib-networking,
+# appstream-glib, at-spi2-*, atk, fcitx, gcab, gdk-pixbuf, geoclue2, glib-networking,
 # gobject-introspection, gstreamer-*, gtk3, ibus, json-glib, librsvg,
 # libsoup, os-release, pango pipewire and zenity.