[epiphany/mcatanzaro/libsoup3] Switch to libsoup3 by default

[Marge Bot <marge-bot src gnome org>]

commit 62e0c334db51caab901b30d9656182770a694e0f
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Fri May 14 16:02:12 2021 -0500

    Switch to libsoup3 by default
    
    Our CI is not yet ready, though. We have to fix gnome-build-meta#378
    first.
    
    Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/964>

 .gitlab-ci.yml    | 7 ++++---
 meson_options.txt | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dbb56c28..fa72b20c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,7 @@ variables:
   FLATPAK_MODULE: 'epiphany'
   APP_ID: 'org.gnome.Epiphany.Devel'
   ESLINT_LOG: "eslint-report.txt"
+  CONFIG_OPTS: '-Dsoup2=enabled'
 
 stages:
   - test
@@ -29,21 +30,21 @@ check-code-style:
 flatpak:
   extends: '.flatpak'
   variables:
-    CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror -Dgsb_api_key=${GSB_API_KEY} 
-Denable_gsb=true'
+    CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror -Dgsb_api_key=${GSB_API_KEY} 
-Denable_gsb=true -Dsoup2=enabled'
   except:
     - master
 
 flatpak master:
   extends: '.flatpak'
   variables:
-    CONFIG_OPTS: '-Dtech_preview=true -Dprofile=Devel -Dunit_tests=enabled -Dgsb_api_key=${GSB_API_KEY} 
-Denable_gsb=true'
+    CONFIG_OPTS: '-Dtech_preview=true -Dprofile=Devel -Dunit_tests=enabled -Dgsb_api_key=${GSB_API_KEY} 
-Denable_gsb=true -Dsoup2=enabled'
   only:
     - master
 
 scanbuild:
   extends: '.flatpak'
   variables:
-    CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror'
+    CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled -Dsoup2=enabled --werror'
   script:
     - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH}
     - flatpak build flatpak_app meson --prefix=/app ${CONFIG_OPTS} _build
diff --git a/meson_options.txt b/meson_options.txt
index 87586e78b..96bdd73a7 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -42,6 +42,6 @@ option('gsb_api_key',
 
 option('soup2',
   type: 'feature',
-  value: 'enabled',
-  description: 'Use libsoup2'
+  value: 'disabled',
+  description: 'Use libsoup2 instead of libsoup3'
 )