[gnome-software/wip/mcrha/soup3-2nd] build: Turn 'soup3' option to 'soup2'

[Milan Crha <mcrha src gnome org>]

commit 6c68ad06046f4c297795d6ab57ca25b5a11d312b
Author: Milan Crha <mcrha redhat com>
Date:   Wed Nov 24 14:59:59 2021 +0100

    build: Turn 'soup3' option to 'soup2'
    
    This is to follow other projects, to build the libsoup3 version by default
    and add an option to build libsoup2 version as an opt-in. That helps to
    not carry the 'soup3' option once the libsoup2 support is removed.

 .gitlab-ci.yml    | 2 +-
 meson.build       | 8 ++++----
 meson_options.txt | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6bb605101..27ae1d95e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ cache:
 variables:
   MESON_TEST_TIMEOUT_MULTIPLIER: 4
   G_MESSAGES_DEBUG: all
-  MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --prefix /usr"
+  MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --prefix /usr -Dsoup2=true"
   BUNDLE: "gnome-software-dev.flatpak"
 
 .build:
diff --git a/meson.build b/meson.build
index 4c81ca601..d20133234 100644
--- a/meson.build
+++ b/meson.build
@@ -129,13 +129,13 @@ gtk = dependency('gtk4', version : '>= 4.2')
 glib = dependency('glib-2.0', version : '>= 2.66.0')
 json_glib = dependency('json-glib-1.0', version : '>= 1.2.0')
 libm = cc.find_library('m', required: false)
-if get_option('soup3')
-  libsoup = dependency('libsoup-3.0', version : '>= 3.0')
-  libsoupapiversion = '3.0'
-else
+if get_option('soup2')
   libsoup = dependency('libsoup-2.4', version : '>= 2.52.0')
   libsoupapiversion = '2.4'
   conf.set('SOUP_HTTP_URI_FLAGS', '(G_URI_FLAGS_HAS_PASSWORD | G_URI_FLAGS_ENCODED_PATH | 
G_URI_FLAGS_ENCODED_QUERY | G_URI_FLAGS_ENCODED_FRAGMENT | G_URI_FLAGS_SCHEME_NORMALIZE)')
+else
+  libsoup = dependency('libsoup-3.0', version : '>= 3.0')
+  libsoupapiversion = '3.0'
 endif
 libadwaita = dependency('libadwaita-1',
   version: '>=1.0.0.alpha.3',
diff --git a/meson_options.txt b/meson_options.txt
index 07cac95e2..70f62c52b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -20,4 +20,4 @@ option('default_featured_apps', type : 'boolean', value : true, description : 'e
 option('mogwai', type : 'boolean', value : false, description : 'enable metered data support using Mogwai')
 option('sysprof', type : 'feature', value : 'auto', description : 'enable sysprof-capture support for 
profiling')
 option('profile', type : 'string', value : '', description : 'Build with specified application ID')
-option('soup3', type : 'boolean', value : false, description : 'build with libsoup3')
+option('soup2', type : 'boolean', value : false, description : 'build with libsoup2')