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

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 52901465d6da8e146c1586581ca330770d3a8cd0
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Tue Feb 13 09:35:55 2018 -0600

    Revert "Rejigger how we handle glib-networking"
    
    This reverts commit d0325f10a3b2403ff458ea3d6b26e24c312fc46c.
    
    This was a bad idea: it's making it too hard to release glib-networking.
    Modules in core-deps will have to make do without TLS support for now.
    We will improve this soon by culling most of core-deps and moving the
    remainder into core.

 elements/core-deps.bst                           | 1 -
 elements/core-deps/libsoup.bst                   | 3 ++-
 elements/core.bst                                | 1 +
 elements/{core-deps => core}/glib-networking.bst | 3 ++-
 elements/core/gnome-maps.bst                     | 2 +-
 elements/core/meta-gnome-core-shell.bst          | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index f2bca17..9203e04 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -37,7 +37,6 @@ 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-deps/libsoup.bst b/elements/core-deps/libsoup.bst
index fa826e2..7538984 100644
--- a/elements/core-deps/libsoup.bst
+++ b/elements/core-deps/libsoup.bst
@@ -5,8 +5,9 @@ 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 ac62ef5..f520f3e 100644
--- a/elements/core.bst
+++ b/elements/core.bst
@@ -9,6 +9,7 @@ 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-deps/glib-networking.bst b/elements/core/glib-networking.bst
similarity index 68%
rename from elements/core-deps/glib-networking.bst
rename to elements/core/glib-networking.bst
index 980f63a..befd9a4 100644
--- a/elements/core-deps/glib-networking.bst
+++ b/elements/core/glib-networking.bst
@@ -6,6 +6,7 @@ sources:
 depends:
 - core-deps/glib.bst
 - core-deps/meson.bst
+- core/gsettings-desktop-schemas.bst
 - base.bst
 variables:
-  meson-local: -Dinstalled_tests=true -Dgnome_proxy_support=false
+  meson-local: -Dinstalled_tests=true
diff --git a/elements/core/gnome-maps.bst b/elements/core/gnome-maps.bst
index 479b12f..65beef2 100644
--- a/elements/core/gnome-maps.bst
+++ b/elements/core/gnome-maps.bst
@@ -10,7 +10,6 @@ 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
@@ -18,5 +17,6 @@ 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 5568cd2..a6dd660 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