[gnome-build-meta] Rejigger how we handle glib-networking

[Michael Catanzaro <mcatanzaro src gnome org>]

commit d0325f10a3b2403ff458ea3d6b26e24c312fc46c
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Feb 12 17:24:55 2018 -0600

    Rejigger how we handle glib-networking
    
    Let's disable GNOME proxy support, so that we can remove the dependency
    on gsettings-desktop-schemas, move it to core-deps, and make libsoup
    depend on it. Otherwise TLS is not going to be available in core-deps,
    and that won't be fun.

 elements/core-deps.bst                           | 1 +
 elements/{core => core-deps}/glib-networking.bst | 3 +--
 elements/core-deps/libsoup.bst                   | 3 +--
 elements/core.bst                                | 1 -
 elements/core/gnome-maps.bst                     | 2 +-
 elements/core/meta-gnome-core-shell.bst          | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 346b627..74bdc9d 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -36,6 +36,7 @@ depends:
 - core-deps/glib.bst
 - core-deps/glibmm-2.4.bst
 - core-deps/glibmm.bst
+- core-deps/glib-networking.bst
 - core-deps/gmime3.bst
 - core-deps/gnome-autoar.bst
 - core-deps/gnome-common.bst
diff --git a/elements/core/glib-networking.bst b/elements/core-deps/glib-networking.bst
similarity index 68%
rename from elements/core/glib-networking.bst
rename to elements/core-deps/glib-networking.bst
index befd9a4..980f63a 100644
--- a/elements/core/glib-networking.bst
+++ b/elements/core-deps/glib-networking.bst
@@ -6,7 +6,6 @@ sources:
 depends:
 - core-deps/glib.bst
 - core-deps/meson.bst
-- core/gsettings-desktop-schemas.bst
 - base.bst
 variables:
-  meson-local: -Dinstalled_tests=true
+  meson-local: -Dinstalled_tests=true -Dgnome_proxy_support=false
diff --git a/elements/core-deps/libsoup.bst b/elements/core-deps/libsoup.bst
index 7538984..fa826e2 100644
--- a/elements/core-deps/libsoup.bst
+++ b/elements/core-deps/libsoup.bst
@@ -5,9 +5,8 @@ sources:
   track: master
 depends:
 - core-deps/glib.bst
+- core-deps/glib-networking.bst
 - core-deps/gobject-introspection.bst
 - core-deps/m4-common.bst
 - core-deps/vala.bst
 - base.bst
-variables:
-  conf-local: --disable-tls-check
diff --git a/elements/core.bst b/elements/core.bst
index f520f3e..ac62ef5 100644
--- a/elements/core.bst
+++ b/elements/core.bst
@@ -9,7 +9,6 @@ depends:
 - core/file-roller.bst
 - core/gdm.bst
 - core/gedit.bst
-- core/glib-networking.bst
 - core/gnome-backgrounds.bst
 - core/gnome-bluetooth.bst
 - core/gnome-boxes.bst
diff --git a/elements/core/gnome-maps.bst b/elements/core/gnome-maps.bst
index 65beef2..479b12f 100644
--- a/elements/core/gnome-maps.bst
+++ b/elements/core/gnome-maps.bst
@@ -10,6 +10,7 @@ depends:
 - core-deps/geocode-glib.bst
 - core-deps/gjs.bst
 - core-deps/glib.bst
+- core-deps/glib-networking.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/gobject-introspection.bst
 - core-deps/gtk+-3.bst
@@ -17,6 +18,5 @@ depends:
 - core-deps/libgee.bst
 - core-deps/libgfbgraph.bst
 - core-deps/librsvg.bst
-- core/glib-networking.bst
 - core/gnome-desktop.bst
 - base.bst
diff --git a/elements/core/meta-gnome-core-shell.bst b/elements/core/meta-gnome-core-shell.bst
index a6dd660..5568cd2 100644
--- a/elements/core/meta-gnome-core-shell.bst
+++ b/elements/core/meta-gnome-core-shell.bst
@@ -1,10 +1,10 @@
 kind: stack
 depends:
 - core-deps/dconf.bst
+- core-deps/glib-networking.bst
 - core-deps/librsvg.bst
 - core/adwaita-icon-theme.bst
 - core/gdm.bst
-- core/glib-networking.bst
 - core/gnome-backgrounds.bst
 - core/gnome-color-manager.bst
 - core/gnome-control-center.bst