[gnome-initial-setup/wip/port-to-gtk4: 92/110] build: Drop soup2 build option

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit e0679414d9926c82681e59b5ed455f4922668c92
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Jul 5 11:05:03 2022 -0300

    build: Drop soup2 build option
    
    webkit2gtk-5.0 depends exclusively on soup3, and our dependencies
    are generally capable of dealing with soup3 now.
    
    Remove the build option to build with soup2.

 .gitlab-ci.yml                  |  1 -
 gnome-initial-setup/meson.build | 50 ++++-------------------------------------
 meson_options.txt               |  6 -----
 3 files changed, 4 insertions(+), 53 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index adbaedaf..2cbf256b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,7 +82,6 @@ build.container.fedora@x86_64:
     # answer to sharing that code (#68), make those warnings non-fatal.
     - meson setup
         -Dsystemd=${EXPLICIT_FEATURES}
-        -Dsoup2=true
         --auto-features ${AUTO_FEATURES}
         ${OPTIONS}
         -Dwerror=true -Dc_args=-Wno-error=deprecated-declarations
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index 62b7fd1f..d075d50a 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -27,53 +27,12 @@ sources += [
     'gis-keyring.h'
 ]
 
-if get_option('soup2')
-  libsoup_api_version = '2.4'
-  webkitgtk_dep = dependency ('webkit2gtk-4.0')
-else
-  libsoup_api_version = '3.0'
-  webkitgtk_dep = dependency ('webkit2gtk-4.1')
-endif
-
-if get_option('soup2')
-  geocode_glib_dep = dependency ('geocode-glib-1.0')
-else
-  geocode_glib_dep = dependency ('geocode-glib-2.0')
-endif
-geocode_soup_version = geocode_glib_dep.get_variable(
-    pkgconfig: 'soupapiversion',
-    default_value: '2.4', # Pre libsoup3 support
-)
-if geocode_soup_version != libsoup_api_version
-  error('geocode-glib was built against a different API of libsoup. @0@ instead of 
@1@.'.format(geocode_soup_version, libsoup_api_version))
-endif
-
-gweather_dep = dependency('gweather4')
-gweather_soup_version = gweather_dep.get_variable(
-    pkgconfig: 'soupapiversion',
-    default_value: '2.4', # Pre libsoup3 support
-)
-if gweather_soup_version != libsoup_api_version
-  error('libgweather was built against a different API of libsoup. @0@ instead of 
@1@.'.format(gweather_soup_version, libsoup_api_version))
-endif
-
-librest_dep = dependency('rest-1.0', required: false)
-if not librest_dep.found()
-  librest_dep = dependency('rest-0.7')
-endif
-librest_soup_version = librest_dep.get_variable(
-    pkgconfig: 'soupapiversion',
-    default_value: '2.4', # Pre libsoup3 support
-)
-if librest_soup_version != libsoup_api_version
-  error('librest was built against a different API of libsoup. @0@ instead of 
@1@.'.format(librest_soup_version, libsoup_api_version))
-endif
-
 dependencies = [
     dependency ('libnm', version: '>= 1.2'),
     dependency ('libnma', version: '>= 1.0'),
     dependency ('polkit-gobject-1', version: '>= 0.103'),
     dependency ('accountsservice'),
+    dependency ('geocode-glib-2.0'),
     dependency ('gnome-desktop-4'),
     dependency ('gsettings-desktop-schemas', version: '>= 3.37.1'),
     dependency ('fontconfig'),
@@ -83,6 +42,7 @@ dependencies = [
     dependency ('glib-2.0', version: '>= 2.63.1'),
     dependency ('gio-unix-2.0', version: '>= 2.53.0'),
     dependency ('gdm', version: '>= 3.8.3'),
+    dependency ('gweather4'),
     dependency ('libgeoclue-2.0', version: '>= 2.3.1'),
     dependency ('libhandy-1', version: '>= 1.5.90'),
     cc.find_library('m', required: false),
@@ -91,15 +51,13 @@ dependencies = [
     dependency ('krb5'),
     dependency ('libsecret-1', version: '>= 0.18.8'),
     dependency ('pwquality'),
+    dependency ('rest-1.0'),
+    dependency ('webkit2gtk-4.1'),
     cheese_dep,
     cheese_gtk_dep,
-    geocode_glib_dep,
-    gweather_dep,
     ibus_dep,
     libmalcontent_dep,
     libmalcontent_ui_dep,
-    librest_dep,
-    webkitgtk_dep
 ]
 
 executable(
diff --git a/meson_options.txt b/meson_options.txt
index 9341909f..be386b59 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -26,9 +26,3 @@ option('parental_controls',
   value: 'auto',
   description: 'Enable parental controls pages',
 )
-
-option('soup2',
-  type: 'boolean',
-  value: false,
-  description: 'Use libsoup 2 instead of libsoup 3'
-)