From f8a4ef7cb005e1fdc3f5e1a31eb9137cf3b905ce Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Fri, 17 Jun 2022 17:57:30 -0500
Subject: Require libsoup 3

This ensures users benefit from HTTP/2 support.
---
 meson.build                       | 13 +++----------
 meson_options.txt                 |  6 ------
 org.gnome.Epiphany.Canary.json.in |  3 +--
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/meson.build b/meson.build
index 4d93ab82b..0f2db8e36 100644
--- a/meson.build
+++ b/meson.build
@@ -94,20 +94,13 @@ libarchive_dep = dependency('libarchive')
 libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.37.1')
 libhandy_dep = dependency('libhandy-1', version: '>= 1.5.0')
 libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0')
+libsoup_dep = dependency('libsoup-3.0', version: '>= 2.99.4')
 libxml_dep = dependency('libxml-2.0', version: '>= 2.6.12')
 nettle_dep = dependency('nettle', version: nettle_requirement)
 portal_dep = dependency('libportal-gtk3', version: '>= 0.6')
 sqlite3_dep = dependency('sqlite3', version: '>= 3.22')
-
-if get_option('soup2').enabled()
-  libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0')
-  webkit2gtk_dep = dependency('webkit2gtk-4.0', version: webkitgtk_requirement)
-  webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: webkitgtk_requirement)
-else
-  libsoup_dep = dependency('libsoup-3.0', version: '>= 2.99.4')
-  webkit2gtk_dep = dependency('webkit2gtk-4.1', version: webkitgtk_requirement)
-  webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.1', version: webkitgtk_requirement)
-endif
+webkit2gtk_dep = dependency('webkit2gtk-4.1', version: webkitgtk_requirement)
+webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.1', version: webkitgtk_requirement)
 
 webkit_revision = webkit2gtk_dep.get_variable(pkgconfig : 'revision', default_value : '')
 if webkit_revision == 'tarball'
diff --git a/meson_options.txt b/meson_options.txt
index 030cc9b9f..116ee41fd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -33,9 +33,3 @@ option('gsb_api_key',
   value: '',
   description: 'The API key used to access the Google Safe Browsing API v4'
 )
-
-option('soup2',
-  type: 'feature',
-  value: 'enabled',
-  description: 'Use libsoup2 instead of libsoup3'
-)
diff --git a/org.gnome.Epiphany.Canary.json.in b/org.gnome.Epiphany.Canary.json.in
index 5a3b9d553..7f8b48a03 100644
--- a/org.gnome.Epiphany.Canary.json.in
+++ b/org.gnome.Epiphany.Canary.json.in
@@ -111,8 +111,7 @@
             "name" : "epiphany",
             "buildsystem" : "meson",
             "config-opts" : [
-                "-Dprofile=Canary",
-                "-Dsoup2=disabled"
+                "-Dprofile=Canary"
             ],
             "sources" : [
                 {
-- 
cgit v1.2.1